From f3dc4b4c95595ebccfb804f4276675be107453bd Mon Sep 17 00:00:00 2001 From: Tushar Date: Tue, 18 Dec 2018 00:05:58 +0530 Subject: [PATCH] Fixed EromeRipper and added new test to EromerRipperTest. --- .../ripme/ripper/rippers/EromeRipper.java | 19 +++--- .../tst/ripper/rippers/EromeRipperTest.java | 59 +++++++++++-------- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java index a6eada03..39098f98 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java @@ -124,13 +124,18 @@ public class EromeRipper extends AbstractHTMLRipper { private List getMediaFromPage(Document doc) { List results = new ArrayList<>(); for (Element el : doc.select("img.img-front")) { - if (el.attr("src").startsWith("https:")) { - results.add(el.attr("src")); - } - else { - results.add("https:" + el.attr("src")); - } - } + if (el.hasAttr("src")) { + if (el.attr("src").startsWith("https:")) { + results.add(el.attr("src")); + } else { + results.add("https:" + el.attr("src")); + } + } else if (el.hasAttr("data-src")) { + //to add images that are not loaded( as all images are lasyloaded as we scroll). + results.add(el.attr("data-src")); + } + + } for (Element el : doc.select("source[label=HD]")) { if (el.attr("src").startsWith("https:")) { results.add(el.attr("src")); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java index c99aa415..38fb43e6 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EromeRipperTest.java @@ -1,40 +1,47 @@ package com.rarchives.ripme.tst.ripper.rippers; import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.EromeRipper; public class EromeRipperTest extends RippersTest { - public void testGetGIDProfilePage() throws IOException { - URL url = new URL("https://www.erome.com/Jay-Jenna"); - EromeRipper ripper = new EromeRipper(url); - assertEquals("Jay-Jenna", ripper.getGID(url)); - } + public void testGetGIDProfilePage() throws IOException { + URL url = new URL("https://www.erome.com/Jay-Jenna"); + EromeRipper ripper = new EromeRipper(url); + assertEquals("Jay-Jenna", ripper.getGID(url)); + } - public void testGetGIDAlbum() throws IOException { - URL url = new URL("https://www.erome.com/a/KbDAM1XT"); - EromeRipper ripper = new EromeRipper(url); - assertEquals("KbDAM1XT", ripper.getGID(url)); - } + public void testGetGIDAlbum() throws IOException { + URL url = new URL("https://www.erome.com/a/KbDAM1XT"); + EromeRipper ripper = new EromeRipper(url); + assertEquals("KbDAM1XT", ripper.getGID(url)); + } - public void testGetAlbumsToQueue() throws IOException { - URL url = new URL("https://www.erome.com/Jay-Jenna"); - EromeRipper ripper = new EromeRipper(url); - assert(2 >= ripper.getAlbumsToQueue(ripper.getFirstPage()).size()); - } + public void testGetAlbumsToQueue() throws IOException { + URL url = new URL("https://www.erome.com/Jay-Jenna"); + EromeRipper ripper = new EromeRipper(url); + assert (2 >= ripper.getAlbumsToQueue(ripper.getFirstPage()).size()); + } - public void testPageContainsAlbums() throws IOException { - URL url = new URL("https://www.erome.com/Jay-Jenna"); - EromeRipper ripper = new EromeRipper(url); - assert(ripper.pageContainsAlbums(url)); - assert(!ripper.pageContainsAlbums(new URL("https://www.erome.com/a/KbDAM1XT"))); - } + public void testPageContainsAlbums() throws IOException { + URL url = new URL("https://www.erome.com/Jay-Jenna"); + EromeRipper ripper = new EromeRipper(url); + assert (ripper.pageContainsAlbums(url)); + assert (!ripper.pageContainsAlbums(new URL("https://www.erome.com/a/KbDAM1XT"))); + } - public void testRip() throws IOException { - URL url = new URL("https://www.erome.com/a/vlefBdsg"); - EromeRipper ripper = new EromeRipper(url); - testRipper(ripper); - } + public void testRip() throws IOException { + URL url = new URL("https://www.erome.com/a/vlefBdsg"); + EromeRipper ripper = new EromeRipper(url); + testRipper(ripper); + } + + public void testGetURLsFromPage() throws IOException { + URL url = new URL("https://www.erome.com/a/Tak8F2h6"); + EromeRipper ripper = new EromeRipper(url); + assert (35 == ripper.getURLsFromPage(ripper.getFirstPage()).size()); + } }