Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #839 from jooxxxoooo/imgurAlbums

Browse Source 
Added possibility to save reddit posts with multiple images in separat…
This commit is contained in:
cyian-1756 2018-08-04 13:00:28 -04:00 committed by GitHub
commit 559e0860dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
View File

@ -255,6 +255,7 @@ public abstract class AbstractRipper
File saveFileAs; File saveFileAs;
try { try {
if (!subdirectory.equals("")) { if (!subdirectory.equals("")) {
subdirectory = Utils.filesystemSafe(subdirectory);
subdirectory = File.separator + subdirectory; subdirectory = File.separator + subdirectory;
} }
prefix = Utils.filesystemSanitized(prefix); prefix = Utils.filesystemSanitized(prefix);

30
src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java
View File

@ -158,16 +158,16 @@ public class RedditRipper extends AlbumRipper {
JSONObject data = child.getJSONObject("data"); JSONObject data = child.getJSONObject("data");
if (kind.equals("t1")) { if (kind.equals("t1")) {
// Comment // Comment
handleBody(data.getString("body"), data.getString("id")); handleBody(data.getString("body"), data.getString("id"), "");
} }
else if (kind.equals("t3")) { else if (kind.equals("t3")) {
// post // post
if (data.getBoolean("is_self")) { if (data.getBoolean("is_self")) {
// TODO Parse self text // TODO Parse self text
handleBody(data.getString("selftext"), data.getString("id")); handleBody(data.getString("selftext"), data.getString("id"), data.getString("title"));
} else { } else {
// Get link // Get link
handleURL(data.getString("url"), data.getString("id")); handleURL(data.getString("url"), data.getString("id"), data.getString("title"));
} }
if (data.has("replies") && data.get("replies") instanceof JSONObject) { if (data.has("replies") && data.get("replies") instanceof JSONObject) {
JSONArray replies = data.getJSONObject("replies") JSONArray replies = data.getJSONObject("replies")
@ -180,7 +180,7 @@ public class RedditRipper extends AlbumRipper {
} }
} }
private void handleBody(String body, String id) { private void handleBody(String body, String id, String title) {
Pattern p = RipUtils.getURLRegex(); Pattern p = RipUtils.getURLRegex();
Matcher m = p.matcher(body); Matcher m = p.matcher(body);
while (m.find()) { while (m.find()) {
@ -188,7 +188,7 @@ public class RedditRipper extends AlbumRipper {
while (url.endsWith(")")) { while (url.endsWith(")")) {
url = url.substring(0, url.length() - 1); url = url.substring(0, url.length() - 1);
} }
handleURL(url, id); handleURL(url, id, title);
} }
} }
@ -218,7 +218,7 @@ public class RedditRipper extends AlbumRipper {
} }
private void handleURL(String theUrl, String id) { private void handleURL(String theUrl, String id, String title) {
URL originalURL; URL originalURL;
try { try {
originalURL = new URL(theUrl); originalURL = new URL(theUrl);
@ -226,6 +226,14 @@ public class RedditRipper extends AlbumRipper {
return; return;
} }
String subdirectory = "";
if (Utils.getConfigBoolean("album_titles.save", true)) {
subdirectory = title;
title = "-" + title + "-";
} else {
title = "";
}
List<URL> urls = RipUtils.getFilesFromURL(originalURL); List<URL> urls = RipUtils.getFilesFromURL(originalURL);
if (urls.size() == 1) { if (urls.size() == 1) {
String url = urls.get(0).toExternalForm(); String url = urls.get(0).toExternalForm();
@ -234,24 +242,24 @@ public class RedditRipper extends AlbumRipper {
if (m.matches()) { if (m.matches()) {
// It's from reddituploads. Assume .jpg extension. // It's from reddituploads. Assume .jpg extension.
String savePath = this.workingDir + File.separator; String savePath = this.workingDir + File.separator;
savePath += id + "-" + m.group(1) + ".jpg"; savePath += id + "-" + m.group(1) + title + ".jpg";
addURLToDownload(urls.get(0), new File(savePath)); addURLToDownload(urls.get(0), new File(savePath));
} }
if (url.contains("v.redd.it")) { if (url.contains("v.redd.it")) {
String savePath = this.workingDir + File.separator; String savePath = this.workingDir + File.separator;
savePath += id + "-" + url.split("/")[3] + ".mp4"; savePath += id + "-" + url.split("/")[3] + title + ".mp4";
addURLToDownload(parseRedditVideoMPD(urls.get(0).toExternalForm()), new File(savePath)); addURLToDownload(parseRedditVideoMPD(urls.get(0).toExternalForm()), new File(savePath));
} }
else { else {
addURLToDownload(urls.get(0), id + "-", "", theUrl, null); addURLToDownload(urls.get(0), id + title, "", theUrl, null);
} }
} else if (urls.size() > 1) { } else if (urls.size() > 1) {
for (int i = 0; i < urls.size(); i++) { for (int i = 0; i < urls.size(); i++) {
String prefix = id + "-"; String prefix = id + "";
if (Utils.getConfigBoolean("download.save_order", true)) { if (Utils.getConfigBoolean("download.save_order", true)) {
prefix += String.format("%03d-", i + 1); prefix += String.format("%03d-", i + 1);
} }
addURLToDownload(urls.get(i), prefix, "", theUrl, null); addURLToDownload(urls.get(i), prefix, subdirectory, theUrl, null);
} }
} }
} }