From 1bd9885fbaaa594844b883ef0d4d5f10eb3a1281 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 13 Apr 2018 18:33:31 -0400 Subject: [PATCH 1/8] Added ripper for Blackbrickroadofoz.com --- .../ripper/rippers/Blackbrickroadofoz.java | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java b/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java new file mode 100644 index 00000000..c290170f --- /dev/null +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java @@ -0,0 +1,80 @@ +package com.rarchives.ripme.ripper.rippers; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; + +import com.rarchives.ripme.ripper.AbstractHTMLRipper; +import com.rarchives.ripme.utils.Http; + +public class Blackbrickroadofoz extends AbstractHTMLRipper { + + public Blackbrickroadofoz(URL url) throws IOException { + super(url); + } + + @Override + public String getHost() { + return "cfake"; + } + + @Override + public String getDomain() { + return "cfake.com"; + } + + @Override + public String getGID(URL url) throws MalformedURLException { + Pattern p = Pattern.compile("https?://www.blackbrickroadofoz.com/comic/([a-zA-Z0-9_-]*)/?$"); + Matcher m = p.matcher(url.toExternalForm()); + if (m.matches()) { + return m.group(1); + } + throw new MalformedURLException("Expected blackbrickroadofoz URL format: " + + "www.blackbrickroadofoz.com/comic/PAGE - got " + url + " instead"); + } + + @Override + public Document getFirstPage() throws IOException { + // "url" is an instance field of the superclass + return Http.url(url).get(); + } + + @Override + public Document getNextPage(Document doc) throws IOException { + Element elem = doc.select("nav.cc-nav > a.cc-next").first(); + if (elem == null) { + throw new IOException("No more pages"); + } + String nextPage = elem.attr("href"); + // Some times this returns a empty string + // This for stops that + if (nextPage == "") { + throw new IOException("No more pages"); + } + else { + return Http.url(nextPage).get(); + } + } + + @Override + public List getURLsFromPage(Document doc) { + List result = new ArrayList<>(); + Element elem = doc.select("img[id=cc-comic]").first(); + result.add(elem.attr("src")); + + return result; + } + + @Override + public void downloadURL(URL url, int index) { + addURLToDownload(url, getPrefix(index)); + } +} From d8254b6e03c84551e6de206bcb3ef52bac601505 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 13 Apr 2018 18:52:38 -0400 Subject: [PATCH 2/8] Fixed url encoding error with Blackbrickroadofoz --- .../ripme/ripper/rippers/Blackbrickroadofoz.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java b/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java index c290170f..2c9b14eb 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java @@ -22,12 +22,12 @@ public class Blackbrickroadofoz extends AbstractHTMLRipper { @Override public String getHost() { - return "cfake"; + return "blackbrickroadofoz"; } @Override public String getDomain() { - return "cfake.com"; + return "blackbrickroadofoz.com"; } @Override @@ -49,7 +49,8 @@ public class Blackbrickroadofoz extends AbstractHTMLRipper { @Override public Document getNextPage(Document doc) throws IOException { - Element elem = doc.select("nav.cc-nav > a.cc-next").first(); + sleep(1000); + Element elem = doc.select("div[id=topnav] > nav.cc-nav > a.cc-next").first(); if (elem == null) { throw new IOException("No more pages"); } @@ -67,8 +68,9 @@ public class Blackbrickroadofoz extends AbstractHTMLRipper { @Override public List getURLsFromPage(Document doc) { List result = new ArrayList<>(); - Element elem = doc.select("img[id=cc-comic]").first(); - result.add(elem.attr("src")); + Element elem = doc.select("div[id=cc-comicbody] > a > img[id=cc-comic]").first(); + // The site doesn't return properly encoded urls we replace all spaces ( ) with %20 + result.add(elem.attr("src").replaceAll(" ", "%20")); return result; } From 8cd3f5d77a22c880f23a3d4c9b734db8bb796b95 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 13 Apr 2018 18:54:27 -0400 Subject: [PATCH 3/8] Renamed misnamed file --- ...{Blackbrickroadofoz.java => BlackbrickroadofozRipper.java} | 0 .../tst/ripper/rippers/BlackbrickroadofozRipperTest.java | 4 ++++ 2 files changed, 4 insertions(+) rename src/main/java/com/rarchives/ripme/ripper/rippers/{Blackbrickroadofoz.java => BlackbrickroadofozRipper.java} (100%) create mode 100644 src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java b/src/main/java/com/rarchives/ripme/ripper/rippers/BlackbrickroadofozRipper.java similarity index 100% rename from src/main/java/com/rarchives/ripme/ripper/rippers/Blackbrickroadofoz.java rename to src/main/java/com/rarchives/ripme/ripper/rippers/BlackbrickroadofozRipper.java diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java new file mode 100644 index 00000000..2c479c36 --- /dev/null +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java @@ -0,0 +1,4 @@ +package com.rarchives.ripme.tst.ripper.rippers; + +public class BlackbrickroadofozRipperTest { +} From d16424d936b12e0b49fe7919ef40a94e3a7702de Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 13 Apr 2018 18:55:19 -0400 Subject: [PATCH 4/8] Renamed misnamed class --- .../ripme/ripper/rippers/BlackbrickroadofozRipper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/BlackbrickroadofozRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/BlackbrickroadofozRipper.java index 2c9b14eb..76340cf9 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/BlackbrickroadofozRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/BlackbrickroadofozRipper.java @@ -14,9 +14,9 @@ import org.jsoup.nodes.Element; import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.utils.Http; -public class Blackbrickroadofoz extends AbstractHTMLRipper { +public class BlackbrickroadofozRipper extends AbstractHTMLRipper { - public Blackbrickroadofoz(URL url) throws IOException { + public BlackbrickroadofozRipper(URL url) throws IOException { super(url); } From cbc286170e4f78a793a4351657ea888683574feb Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 13 Apr 2018 18:57:57 -0400 Subject: [PATCH 5/8] Added unit test for Blackbrickroadofoz Ripper --- .../ripper/rippers/BlackbrickroadofozRipperTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java index 2c479c36..a3c7d862 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/BlackbrickroadofozRipperTest.java @@ -1,4 +1,13 @@ package com.rarchives.ripme.tst.ripper.rippers; -public class BlackbrickroadofozRipperTest { +import com.rarchives.ripme.ripper.rippers.BlackbrickroadofozRipper; + +import java.io.IOException; +import java.net.URL; + +public class BlackbrickroadofozRipperTest extends RippersTest { + public void testRip() throws IOException { + BlackbrickroadofozRipper ripper = new BlackbrickroadofozRipper(new URL("http://www.blackbrickroadofoz.com/comic/beginning")); + testRipper(ripper); + } } From dc9604b1155bf58f8c0b91854a37b59d6dc1aae6 Mon Sep 17 00:00:00 2001 From: Kevin Jiang Date: Sat, 14 Apr 2018 18:21:29 -0400 Subject: [PATCH 6/8] Update README.md Fix #454 Remove link to ded website --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e56276c1..66ef3428 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,6 @@ For information about running the `.jar` file, see [the How To Run wiki](https:/ ## [Changelog](https://github.com/ripmeapp/ripme/blob/master/ripme.json) (ripme.json) -## [Website](http://rip.rarchives.com/) - # Features * Quickly downloads all images in an online album (see supported sites below) From d02080cd3dc7e01d459630e72fc4c859a2eda478 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 15 Apr 2018 05:22:56 -0400 Subject: [PATCH 7/8] Fix webtoons canRip regex --- .../com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java index df373689..de785a44 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java @@ -36,7 +36,7 @@ public class WebtoonsRipper extends AbstractHTMLRipper { @Override public boolean canRip(URL url) { - Pattern pat = Pattern.compile("https?://www.webtoons.com/[a-zA-Z]+/[a-zA-Z]+/([a-zA-Z0-9_-]*)/[a-zA-Z0-9_-]+/\\S*"); + Pattern pat = Pattern.compile("https?://www.webtoons.com/[a-zA-Z-_]+/[a-zA-Z_-]+/([a-zA-Z0-9_-]*)/[a-zA-Z0-9_-]+/\\S*"); Matcher mat = pat.matcher(url.toExternalForm()); if (mat.matches()) { return true; @@ -47,7 +47,7 @@ public class WebtoonsRipper extends AbstractHTMLRipper { @Override public String getAlbumTitle(URL url) throws MalformedURLException { - Pattern pat = Pattern.compile("https?://www.webtoons.com/[a-zA-Z]+/[a-zA-Z]+/([a-zA-Z0-9_-]*)/[a-zA-Z0-9_-]+/\\S*"); + Pattern pat = Pattern.compile("https?://www.webtoons.com/[a-zA-Z-_]+/[a-zA-Z_-]+/([a-zA-Z0-9_-]*)/[a-zA-Z0-9_-]+/\\S*"); Matcher mat = pat.matcher(url.toExternalForm()); if (mat.matches()) { return getHost() + "_" + mat.group(1); From 5206f1d30e36e42cf575559cf5e33e887e5617b5 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 15 Apr 2018 05:45:41 -0400 Subject: [PATCH 8/8] 1.7.34: Added Blackbrickroadofoz Ripper; Fixed webtoons regex --- pom.xml | 2 +- ripme.json | 3 ++- src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6b7084c8..8ce4b5ae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rarchives.ripme ripme jar - 1.7.33 + 1.7.34 ripme http://rip.rarchives.com diff --git a/ripme.json b/ripme.json index 8dc6e2cf..3a07f1b7 100644 --- a/ripme.json +++ b/ripme.json @@ -1,6 +1,7 @@ { - "latestVersion": "1.7.33", + "latestVersion": "1.7.34", "changeList": [ + "1.7.34: Added Blackbrickroadofoz Ripper; Fixed webtoons regex", "1.7.33: Instagram ripper no longer errors out when downloading from more than 1 page", "1.7.32: Instagram ripper update to use new enpoints", "1.7.31: InstaGram ripper no longer errors out when getting next page", diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java index e1d579a4..01b6c7eb 100644 --- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java +++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java @@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils; public class UpdateUtils { private static final Logger logger = Logger.getLogger(UpdateUtils.class); - private static final String DEFAULT_VERSION = "1.7.33"; + private static final String DEFAULT_VERSION = "1.7.34"; private static final String REPO_NAME = "ripmeapp/ripme"; private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json"; private static final String mainFileName = "ripme.jar";