From 4016f35ab48966862028b79ea2d8b71623c6ee6a Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Tue, 14 Nov 2017 13:22:20 -0500 Subject: [PATCH 1/2] Ripper now falls back to getHost() and getGID(), not page title --- .../java/com/rarchives/ripme/ripper/rippers/ChanRipper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java index d986d655..297f135a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java @@ -70,12 +70,12 @@ public class ChanRipper extends AbstractHTMLRipper { } catch (NullPointerException e) { logger.warn("Failed to get thread title from " + url); } - return doc.select("title").first().text(); } catch (Exception e) { // Fall back to default album naming convention logger.warn("Failed to get album title from " + url, e); } - return super.getAlbumTitle(url); + // Fall back on the GID + return getHost() + "_" + getGID(url); } @Override @@ -211,6 +211,6 @@ public class ChanRipper extends AbstractHTMLRipper { @Override public void downloadURL(URL url, int index) { - addURLToDownload(url, getPrefix(index), "", this.url.toString(), null); + addURLToDownload(url, getPrefix(index)); } } From 669a78434cf99d3f2c273c3ee8b165d0628262be Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Tue, 14 Nov 2017 13:39:38 -0500 Subject: [PATCH 2/2] Added regex for xchan --- .../java/com/rarchives/ripme/ripper/rippers/ChanRipper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java index 297f135a..ace305c1 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java @@ -117,6 +117,12 @@ public class ChanRipper extends AbstractHTMLRipper { if (m.matches()) { return m.group(1); } + // xchan + p = Pattern.compile("^.*\\.[a-z]{1,3}/board/[a-zA-Z0-9]+/thread/([0-9]+)/?.*$"); + m = p.matcher(u); + if (m.matches()) { + return m.group(1); + } } throw new MalformedURLException(