From 0a993b56d1fa5f7762700dad2af6e4e5f74853e4 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Mon, 31 Dec 2018 08:08:32 -0500 Subject: [PATCH 1/2] Fixed imagefap getAlbumTitle --- .../ripme/ripper/rippers/ImagefapRipper.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java index 07a6e529..f097e667 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java @@ -145,15 +145,13 @@ public class ImagefapRipper extends AbstractHTMLRipper { try { // Attempt to use album title as GID String title = getFirstPage().title(); - Pattern p = Pattern.compile("^Porn pics of (.*) \\(Page 1\\)$"); - Matcher m = p.matcher(title); - if (m.matches()) { - return getHost() + "_" + m.group(1) + "_" + getGID(url); - } + title = title.replace("Porn Pics & Porn GIFs", ""); + title = title.replace(" ", "_"); + String toReturn = getHost() + "_" + title + "_" + getGID(url); + return toReturn.replaceAll("__", "_"); } catch (IOException e) { - // Fall back to default album naming convention + return super.getAlbumTitle(url); } - return super.getAlbumTitle(url); } private String getFullSizedImage(String pageURL) { From e909793dccef6a05a0a114017e7a147d3a5ee5c2 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Mon, 31 Dec 2018 08:09:04 -0500 Subject: [PATCH 2/2] Added unit test for getAlbumTitle --- .../ripme/tst/ripper/rippers/ImagefapRipperTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagefapRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagefapRipperTest.java index 95649015..b64952cc 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagefapRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagefapRipperTest.java @@ -24,4 +24,9 @@ public class ImagefapRipperTest extends RippersTest { testRipper(ripper); } } + public void testImagefapGetAlbumTitle() throws IOException { + URL url = new URL("https://www.imagefap.com/gallery.php?gid=7789753"); + ImagefapRipper ripper = new ImagefapRipper(url); + assertEquals("imagefap_Red.Heels.Lover.In.Love_7789753", ripper.getAlbumTitle(url)); + } }