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

Fixed ripme erroring out when the rip finished

Browse Source
This commit is contained in:
cyian-1756 2017-06-25 12:42:12 -04:00
parent 7610ae89a7
commit de4dac516b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import com.rarchives.ripme.utils.Http;
public class EightmusesRipper extends AbstractHTMLRipper { public class EightmusesRipper extends AbstractHTMLRipper {
private Document albumDoc = null; private Document albumDoc = null;
private Boolean rippingSubAlbums = false;
private Map<String,String> cookies = new HashMap<String,String>(); private Map<String,String> cookies = new HashMap<String,String>();
public EightmusesRipper(URL url) throws IOException { public EightmusesRipper(URL url) throws IOException {
@ -83,6 +84,7 @@ public class EightmusesRipper extends AbstractHTMLRipper {
Pattern p = Pattern.compile("/comix/[a-zA-Z0-9\\-_/]*/\\d+"); Pattern p = Pattern.compile("/comix/[a-zA-Z0-9\\-_/]*/\\d+");
Matcher m = p.matcher(firstImageLink); Matcher m = p.matcher(firstImageLink);
if (!m.matches()) { if (!m.matches()) {
rippingSubAlbums = true;
logger.info("Ripping subalbums"); logger.info("Ripping subalbums");
// Page contains subalbums (not images) // Page contains subalbums (not images)
Elements albumElements = page.select(".page-gallery > div > div > div.gallery > a.t-hover"); Elements albumElements = page.select(".page-gallery > div > div > div.gallery > a.t-hover");
@ -114,14 +116,18 @@ public class EightmusesRipper extends AbstractHTMLRipper {
albumTitle = albumTitle.replaceAll(" ", "_"); albumTitle = albumTitle.replaceAll(" ", "_");
albumTitle = albumTitle.replaceAll("___", "_"); albumTitle = albumTitle.replaceAll("___", "_");
albumTitle = albumTitle.replaceAll("__", "_"); albumTitle = albumTitle.replaceAll("__", "_");
// This is here to remove the trailing __ from folder names
albumTitle = albumTitle.replaceAll("__", "");
logger.info("Found " + subalbumImages.size() + " images in subalbum"); logger.info("Found " + subalbumImages.size() + " images in subalbum");
imageURLs.addAll(subalbumImages);
int x = 1; 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 image_url = new URL(image);
addURLToDownload(image_url, Integer.toString(x) + "_", albumTitle, this.url.toExternalForm(), cookies); addURLToDownload(image_url, Integer.toString(x) + "_", albumTitle, this.url.toExternalForm(), cookies);
x = x + 1; x = x + 1;
} }
// This is a hackish workaround so ripme doesn't throw a "no images found at"
imageURLs.add("http://");
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while loading subalbum " + subUrl, e); logger.warn("Error while loading subalbum " + subUrl, e);
continue; continue;
@ -173,8 +179,10 @@ public class EightmusesRipper extends AbstractHTMLRipper {
@Override @Override
public void downloadURL(URL url, int index) { public void downloadURL(URL url, int index) {
if (!rippingSubAlbums) {
addURLToDownload(url, getPrefix(index), "", this.url.toExternalForm(), cookies); addURLToDownload(url, getPrefix(index), "", this.url.toExternalForm(), cookies);
} }
}
@Override @Override
public String getPrefix(int index) { public String getPrefix(int index) {