mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-27 07:44:20 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1100 from cyian-1756/tumblrLikeOrder

Browse Source 
Tumblr ripper now puts date in name of files when ripping from tags
This commit is contained in:
cyian-1756
2018-12-13 05:05:36 -05:00
committed by GitHub
parent fdfe8021db 6999795b0a
commit c21a64bd1e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java
View File

@@ -250,6 +250,7 @@ public class TumblrRipper extends AlbumRipper {
for (int i = 0; i < posts.length(); i++) { for (int i = 0; i < posts.length(); i++) {
post = posts.getJSONObject(i); post = posts.getJSONObject(i);
String date = post.getString("date");
if (post.has("photos")) { if (post.has("photos")) {
photos = post.getJSONArray("photos"); photos = post.getJSONArray("photos");
for (int j = 0; j < photos.length(); j++) { for (int j = 0; j < photos.length(); j++) {
@@ -259,10 +260,10 @@ public class TumblrRipper extends AlbumRipper {
m = p.matcher(fileURL.toString()); m = p.matcher(fileURL.toString());
if (m.matches()) { if (m.matches()) {
downloadURL(fileURL); downloadURL(fileURL, date);
} else { } else {
URL redirectedURL = Http.url(fileURL).ignoreContentType().response().url(); URL redirectedURL = Http.url(fileURL).ignoreContentType().response().url();
downloadURL(redirectedURL); downloadURL(redirectedURL, date);
} }
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("[!] Error while parsing photo in " + photo, e); LOGGER.error("[!] Error while parsing photo in " + photo, e);
@@ -271,7 +272,7 @@ public class TumblrRipper extends AlbumRipper {
} else if (post.has("video_url")) { } else if (post.has("video_url")) {
try { try {
fileURL = new URL(post.getString("video_url").replaceAll("http:", "https:")); fileURL = new URL(post.getString("video_url").replaceAll("http:", "https:"));
downloadURL(fileURL); downloadURL(fileURL, date);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("[!] Error while parsing video in " + post, e); LOGGER.error("[!] Error while parsing video in " + post, e);
return true; return true;
@@ -280,7 +281,7 @@ public class TumblrRipper extends AlbumRipper {
Document d = Jsoup.parse(post.getString("body")); Document d = Jsoup.parse(post.getString("body"));
if (!d.select("img").attr("src").isEmpty()) { if (!d.select("img").attr("src").isEmpty()) {
try { try {
downloadURL(new URL(d.select("img").attr("src"))); downloadURL(new URL(d.select("img").attr("src")), date);
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
LOGGER.error("[!] Error while getting embedded image at " + post, e); LOGGER.error("[!] Error while getting embedded image at " + post, e);
return true; return true;
@@ -399,7 +400,11 @@ public class TumblrRipper extends AlbumRipper {
return prefix; return prefix;
} }
public void downloadURL(URL url) { public void downloadURL(URL url, String date) {
LOGGER.info(albumType);
if (albumType == ALBUM_TYPE.TAG) {
addURLToDownload(url, date + " ");
}
addURLToDownload(url, getPrefix(index)); addURLToDownload(url, getPrefix(index));
index++; index++;
} }