Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed hackish workaround

Browse Source
This commit is contained in:
cyian-1756 2017-06-28 13:12:14 -04:00
parent 09c9d2817a
commit 9d66de15e9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
View File

@ -24,6 +24,11 @@ public class EightmusesRipper extends AbstractHTMLRipper {
private Document albumDoc = null; private Document albumDoc = null;
private Map<String,String> cookies = new HashMap<String,String>(); private Map<String,String> cookies = new HashMap<String,String>();
// TODO put up a wiki page on using maps to store titles
// the map for storing the title of each album when downloading sub albums
private Map<URL,String> urlTitles = new HashMap<URL,String>();
private Boolean rippingSubalbums = false;
public EightmusesRipper(URL url) throws IOException { public EightmusesRipper(URL url) throws IOException {
super(url); super(url);
@ -117,15 +122,12 @@ public class EightmusesRipper extends AbstractHTMLRipper {
// This is here to remove the trailing __ from folder names // This is here to remove the trailing __ from folder names
albumTitle = albumTitle.replaceAll("__", ""); albumTitle = albumTitle.replaceAll("__", "");
logger.info("Found " + subalbumImages.size() + " images in subalbum"); logger.info("Found " + subalbumImages.size() + " images in subalbum");
int x = 1;
// Use the addURLToDownload here so we download each sub-album to its own folder
for (String image : subalbumImages) { for (String image : subalbumImages) {
URL image_url = new URL(image); URL imageUrl = new URL(image);
addURLToDownload(image_url, Integer.toString(x) + "_", albumTitle, this.url.toExternalForm(), cookies); urlTitles.put(imageUrl, albumTitle);
x = x + 1;
} }
// This is a hackish workaround so ripme doesn't throw a "no images found at" rippingSubalbums = true;
imageURLs.add("http://DONTDOWNLOAD"); imageURLs.addAll(subalbumImages);
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while loading subalbum " + subUrl, e); logger.warn("Error while loading subalbum " + subUrl, e);
continue; continue;
@ -177,7 +179,9 @@ public class EightmusesRipper extends AbstractHTMLRipper {
@Override @Override
public void downloadURL(URL url, int index) { public void downloadURL(URL url, int index) {
if (!url.equals("http://DONTDOWNLOAD")) { if (rippingSubalbums) {
addURLToDownload(url, getPrefix(index), urlTitles.get(url), this.url.toExternalForm(), cookies);
} else {
addURLToDownload(url, getPrefix(index), "", this.url.toExternalForm(), cookies); addURLToDownload(url, getPrefix(index), "", this.url.toExternalForm(), cookies);
} }
} }