From 9d66de15e9c4a118b9af1c322e58b439c47a606b Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Wed, 28 Jun 2017 13:12:14 -0400 Subject: [PATCH] Removed hackish workaround --- .../ripper/rippers/EightmusesRipper.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java index 9af3cc21..7a8af377 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java @@ -24,6 +24,11 @@ public class EightmusesRipper extends AbstractHTMLRipper { private Document albumDoc = null; private Map cookies = new HashMap(); + // 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 urlTitles = new HashMap(); + + private Boolean rippingSubalbums = false; public EightmusesRipper(URL url) throws IOException { super(url); @@ -117,15 +122,12 @@ public class EightmusesRipper extends AbstractHTMLRipper { // This is here to remove the trailing __ from folder names albumTitle = albumTitle.replaceAll("__", ""); 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) { - URL image_url = new URL(image); - addURLToDownload(image_url, Integer.toString(x) + "_", albumTitle, this.url.toExternalForm(), cookies); - x = x + 1; + URL imageUrl = new URL(image); + urlTitles.put(imageUrl, albumTitle); } - // This is a hackish workaround so ripme doesn't throw a "no images found at" - imageURLs.add("http://DONTDOWNLOAD"); + rippingSubalbums = true; + imageURLs.addAll(subalbumImages); } catch (IOException e) { logger.warn("Error while loading subalbum " + subUrl, e); continue; @@ -177,7 +179,9 @@ public class EightmusesRipper extends AbstractHTMLRipper { @Override 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); } }