diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java index f27dd2f5..0c561d77 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java @@ -29,7 +29,7 @@ public class TumblrRipper extends AlbumRipper { private static final String DOMAIN = "tumblr.com", HOST = "tumblr", - IMAGE_PATTERN = "([^\\s]+(\\.(?i)(jpg|png|gif|bmp))$)"; + IMAGE_PATTERN = "([^\\s]+(\\.(?i)(?:jpg|png|gif|bmp))$)"; private enum ALBUM_TYPE { SUBDOMAIN, @@ -236,8 +236,12 @@ public class TumblrRipper extends AlbumRipper { Matcher m; p = Pattern.compile(IMAGE_PATTERN); + String fileLocation; URL fileURL; + Pattern qualP = Pattern.compile("_[0-9]+\\.(jpg|png|gif|bmp)$"); + Matcher qualM; + if (albumType == ALBUM_TYPE.LIKED) { posts = json.getJSONObject("response").getJSONArray("liked_posts"); } else { @@ -256,7 +260,10 @@ public class TumblrRipper extends AlbumRipper { for (int j = 0; j < photos.length(); j++) { photo = photos.getJSONObject(j); try { - fileURL = new URL(photo.getJSONObject("original_size").getString("url").replaceAll("http:", "https:")); + fileLocation = photo.getJSONObject("original_size").getString("url").replaceAll("http:", "https:"); + qualM = qualP.matcher(fileLocation); + fileLocation = qualM.replaceFirst("_1280.$1"); + fileURL = new URL(fileLocation); m = p.matcher(fileURL.toString()); if (m.matches()) { @@ -281,7 +288,12 @@ public class TumblrRipper extends AlbumRipper { Document d = Jsoup.parse(post.getString("body")); if (!d.select("img").attr("src").isEmpty()) { try { - downloadURL(new URL(d.select("img").attr("src")), date); + String imgSrc = d.select("img").attr("src"); + // Set maximum quality, tumblr doesn't go any further + // If the image is any smaller, it will still get the largest available size + qualM = qualP.matcher(imgSrc); + imgSrc = qualM.replaceFirst("_1280.$1"); + downloadURL(new URL(imgSrc), date); } catch (MalformedURLException e) { LOGGER.error("[!] Error while getting embedded image at " + post, e); return true;