mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-24 14:33:17 +02:00
Code Issues Releases Wiki Activity

Added non-capturing groups and simplified replacements

Browse Source
This commit is contained in:
buzzlightmonth
2019-01-19 20:41:23 +01:00
parent 8f3100df0a
commit 197a741136
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ public class TumblrRipper extends AlbumRipper {
private static final String DOMAIN = "tumblr.com", private static final String DOMAIN = "tumblr.com",
HOST = "tumblr", HOST = "tumblr",
IMAGE_PATTERN = "([^\\s]+(\\.(?i)(jpg|png|gif|bmp))$)"; IMAGE_PATTERN = "([^\\s]+(\\.(?i)(?:jpg|png|gif|bmp))$)";
private enum ALBUM_TYPE { private enum ALBUM_TYPE {
SUBDOMAIN, SUBDOMAIN,
@@ -262,9 +262,7 @@ public class TumblrRipper extends AlbumRipper {
try { try {
fileLocation = photo.getJSONObject("original_size").getString("url").replaceAll("http:", "https:"); fileLocation = photo.getJSONObject("original_size").getString("url").replaceAll("http:", "https:");
qualM = qualP.matcher(fileLocation); qualM = qualP.matcher(fileLocation);
if (qualM.matches()) { fileLocation = qualM.replaceFirst("_1280.$1");
fileLocation = fileLocation.replaceFirst("_[0-9]+\\.(jpg|png|gif|bmp)$", "_1280." + qualM.group(1));
}
fileURL = new URL(fileLocation); fileURL = new URL(fileLocation);
m = p.matcher(fileURL.toString()); m = p.matcher(fileURL.toString());
@@ -294,9 +292,7 @@ public class TumblrRipper extends AlbumRipper {
// Set maximum quality, tumblr doesn't go any further // Set maximum quality, tumblr doesn't go any further
// If the image is any smaller, it will still get the largest available size // If the image is any smaller, it will still get the largest available size
qualM = qualP.matcher(imgSrc); qualM = qualP.matcher(imgSrc);
if (qualM.matches()) { imgSrc = qualM.replaceFirst("_1280.$1");
imgSrc = imgSrc.replaceFirst("_[0-9]+\\.(jpg|png|gif|bmp)$", "_1280." + qualM.group(1));
}
downloadURL(new URL(imgSrc), date); downloadURL(new URL(imgSrc), 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);