Skip to content

Fix TsuminoRipper and update EhentaiRipper unit test #1464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyian-1756 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix TsuminoRipper and update EhentaiRipper unit test #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd66be
Fixed eheanti unit test
Oct 22, 2019
5df6720
Fixed tsumino.com ripper
Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/main/java/com/rarchives/ripme/ripper/rippers/TsuminoRipper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
import com.rarchives.ripme.utils.RipUtils;
import com.rarchives.ripme.utils.Utils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.jsoup.Connection;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;


Expand All @@ -42,22 +40,27 @@ public List<String> getTags(Document doc) {
return tags;
}

private JSONArray getPageUrls() {
String postURL = "http://www.tsumino.com/Read/Load";
private ArrayList<String> getPageUrls(int numPages) {
// Get the api access token from the index page
ArrayList<String> urlsToReturn = new ArrayList<String>();

try {
// This sessionId will expire and need to be replaced
LOGGER.debug("Getting index");
cookies.put("ASP.NET_SessionId","c4rbzccf0dvy3e0cloolmlkq");
Document doc = Jsoup.connect(postURL).data("q", getAlbumID()).userAgent(USER_AGENT).cookies(cookies).referrer("http://www.tsumino.com/Read/View/" + getAlbumID()).get();
String jsonInfo = doc.html().replaceAll("<html>","").replaceAll("<head></head>", "").replaceAll("<body>", "").replaceAll("</body>", "")
.replaceAll("</html>", "").replaceAll("\n", "");
JSONObject json = new JSONObject(jsonInfo);
return json.getJSONArray("reader_page_urls");
// IMPORTANT NOTE: If you request "https://www.tsumino.com/Read/Index/" + getAlbumID() the server was temp ban you! Always request /Read/Index/ID?page=1 like the web ui does
Document page = Http.url(new URL("https://www.tsumino.com/Read/Index/" + getAlbumID() + "?page=1")).referrer("https://www.tsumino.com/Read/Index/" + getAlbumID()).cookies(cookies).get();
LOGGER.info(page);
String endPoint = page.select("div#image-container").attr("data-cdn");
for (int i = 1; i <= numPages; i++) {
urlsToReturn.add(endPoint.replaceAll("\\[PAGE\\]", String.valueOf(i)));
}
} catch (IOException e) {
LOGGER.info(e);
sendUpdate(RipStatusMessage.STATUS.DOWNLOAD_ERRORED, "Unable to download album, please compete the captcha at http://www.tsumino.com/Read/Auth/"
+ getAlbumID() + " and try again");
return null;
}
return urlsToReturn;
}

@Override
Expand All @@ -82,8 +85,13 @@ public String getGID(URL url) throws MalformedURLException {
if (m.matches()) {
return m.group(1);
}
p = Pattern.compile("https?://www.tsumino.com/entry/([0-9]+)/?");
m = p.matcher(url.toExternalForm());
if (m.matches()) {
return m.group(1);
}
throw new MalformedURLException("Expected tsumino URL format: " +
"tsumino.com/Book/Info/ID/TITLE - got " + url + " instead");
"tsumino.com/entry/ID - got " + url + " instead");
}

private String getAlbumID() {
Expand All @@ -92,6 +100,11 @@ private String getAlbumID() {
if (m.matches()) {
return m.group(1);
}
p = Pattern.compile("https?://www.tsumino.com/entry/([0-9]+)/?");
m = p.matcher(url.toExternalForm());
if (m.matches()) {
return m.group(1);
}
return null;
}

Expand All @@ -111,13 +124,8 @@ public Document getFirstPage() throws IOException {

@Override
public List<String> getURLsFromPage(Document doc) {
JSONArray imageIds = getPageUrls();
List<String> result = new ArrayList<>();
for (int i = 0; i < imageIds.length(); i++) {
result.add("http://www.tsumino.com/Image/Object?name=" + URLEncoder.encode(imageIds.getString(i)));
}

return result;
return getPageUrls(Integer.parseInt(doc.select("div#Pages").text()));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/rarchives/ripme/tst/ripper/rippers/EhentaiRipperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ public void testTagBlackList() throws IOException {
EHentaiRipper ripper = new EHentaiRipper(url);
List<String> tagsOnPage = ripper.getTags(ripper.getFirstPage());
// Test multiple blacklisted tags
String[] tags = {"test", "one", "yuri"};
String[] tags = {"test", "one", "yuri | lesbians"};
String blacklistedTag = RipUtils.checkTags(tags, tagsOnPage);
assertEquals("yuri", blacklistedTag);
assertEquals("yuri | lesbians", blacklistedTag);

// test tags with spaces in them
String[] tags2 = {"test", "one", "midnight on mars"};
Expand Down