From ef1bf79dddfe009f00f80669cefe680e626eb26d Mon Sep 17 00:00:00 2001 From: EgorGornak Date: Mon, 27 Nov 2017 17:37:04 +0300 Subject: [PATCH 1/5] Change folder name in imagearn --- .../ripme/ripper/rippers/ImagearnRipper.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java index 475817c9..1bae88c2 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java @@ -29,6 +29,20 @@ public class ImagearnRipper extends AbstractHTMLRipper { return "imagearn.com"; } + @Override + public String getAlbumTitle(URL url) throws MalformedURLException { + try { + Document doc = getFirstPage(); + String title = doc.select("h3 > strong").first().text(); // profile name + logger.error(title); + return getHost() + "_" + title; + } catch (Exception e) { + // Fall back to default album naming convention + logger.warn("Failed to get album title from " + url, e); + } + return super.getAlbumTitle(url); + } + @Override public String getGID(URL url) throws MalformedURLException { Pattern p = Pattern.compile("^.*imagearn.com/+gallery.php\\?id=([0-9]+).*$"); From bc2e099093f3d6714ecf47e3f213d1b1ce434f1c Mon Sep 17 00:00:00 2001 From: EgorGornak Date: Mon, 27 Nov 2017 23:36:32 +0300 Subject: [PATCH 2/5] Change folder name --- .../ripme/ripper/rippers/ImagearnRipper.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java index 1bae88c2..27a8de00 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java @@ -29,20 +29,6 @@ public class ImagearnRipper extends AbstractHTMLRipper { return "imagearn.com"; } - @Override - public String getAlbumTitle(URL url) throws MalformedURLException { - try { - Document doc = getFirstPage(); - String title = doc.select("h3 > strong").first().text(); // profile name - logger.error(title); - return getHost() + "_" + title; - } catch (Exception e) { - // Fall back to default album naming convention - logger.warn("Failed to get album title from " + url, e); - } - return super.getAlbumTitle(url); - } - @Override public String getGID(URL url) throws MalformedURLException { Pattern p = Pattern.compile("^.*imagearn.com/+gallery.php\\?id=([0-9]+).*$"); @@ -89,6 +75,19 @@ public class ImagearnRipper extends AbstractHTMLRipper { return Http.url(url).get(); } + @Override + public String getAlbumTitle(URL url) throws MalformedURLException { + try { + Document doc = getFirstPage(); + String title = doc.select("h3 > strong").first().text(); // profile name + return getHost() + "_" + title; + } catch (Exception e) { + // Fall back to default album naming convention + logger.warn("Failed to get album title from " + url, e); + } + return super.getAlbumTitle(url); + } + @Override public List getURLsFromPage(Document doc) { List imageURLs = new ArrayList<>(); From bf746aadbcc140f0a6ea20f29650f1c6922356ee Mon Sep 17 00:00:00 2001 From: EgorGornak <31937056+EgorGornak@users.noreply.github.com> Date: Tue, 28 Nov 2017 01:03:19 +0300 Subject: [PATCH 3/5] Update ImagearnRipper.java --- .../java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java index 27a8de00..bff45d30 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java @@ -80,7 +80,7 @@ public class ImagearnRipper extends AbstractHTMLRipper { try { Document doc = getFirstPage(); String title = doc.select("h3 > strong").first().text(); // profile name - return getHost() + "_" + title; + return getHost() + "_" + title + getGID();; } catch (Exception e) { // Fall back to default album naming convention logger.warn("Failed to get album title from " + url, e); From dc66b03c16d9e9c6654efb4dec0242aa25462989 Mon Sep 17 00:00:00 2001 From: EgorGornak <31937056+EgorGornak@users.noreply.github.com> Date: Tue, 28 Nov 2017 01:06:38 +0300 Subject: [PATCH 4/5] Added getGID() --- .../java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java index bff45d30..ac1fb19e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java @@ -80,7 +80,7 @@ public class ImagearnRipper extends AbstractHTMLRipper { try { Document doc = getFirstPage(); String title = doc.select("h3 > strong").first().text(); // profile name - return getHost() + "_" + title + getGID();; + return getHost() + "_" + title + "_" + getGID(); } catch (Exception e) { // Fall back to default album naming convention logger.warn("Failed to get album title from " + url, e); From bd6359babd3d346a4ba9ed22c5da333d5830448f Mon Sep 17 00:00:00 2001 From: EgorGornak <31937056+EgorGornak@users.noreply.github.com> Date: Tue, 28 Nov 2017 01:11:03 +0300 Subject: [PATCH 5/5] Add getGid() --- .../java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java index ac1fb19e..39fdaeba 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java @@ -80,7 +80,7 @@ public class ImagearnRipper extends AbstractHTMLRipper { try { Document doc = getFirstPage(); String title = doc.select("h3 > strong").first().text(); // profile name - return getHost() + "_" + title + "_" + getGID(); + return getHost() + "_" + title + "_" + getGID(url); } catch (Exception e) { // Fall back to default album naming convention logger.warn("Failed to get album title from " + url, e);