Merge pull request #690 from cyian-1756/tumblrFixes
Tumblr ripper no longer tries to download images in fullsize if the image doesn't support it
This commit is contained in:
commit
1d71b04533
@ -235,8 +235,12 @@ public class TumblrRipper extends AlbumRipper {
|
|||||||
for (int j = 0; j < photos.length(); j++) {
|
for (int j = 0; j < photos.length(); j++) {
|
||||||
photo = photos.getJSONObject(j);
|
photo = photos.getJSONObject(j);
|
||||||
try {
|
try {
|
||||||
if (Utils.getConfigBoolean("tumblr.get_raw_image", false)) {
|
String imageUrl = photo.getJSONObject("original_size").getString("url");
|
||||||
String urlString = photo.getJSONObject("original_size").getString("url").replaceAll("https", "http");
|
// If the url is shorter than 65 chars long we skip it because it's those images don't support grabbing them in fullsize
|
||||||
|
if (Utils.getConfigBoolean("tumblr.get_raw_image", false) &&
|
||||||
|
imageUrl.replaceAll("https", "http").length() > 65) {
|
||||||
|
// We have to change the link to http because tumblr uses an invalid cert for data.tumblr.com
|
||||||
|
String urlString = imageUrl.replaceAll("https", "http");
|
||||||
urlString = urlString.replaceAll("https?://[a-sA-Z0-9_\\-\\.]*\\.tumblr", "http://data.tumblr");
|
urlString = urlString.replaceAll("https?://[a-sA-Z0-9_\\-\\.]*\\.tumblr", "http://data.tumblr");
|
||||||
urlString = urlString.replaceAll("_\\d+\\.", "_raw.");
|
urlString = urlString.replaceAll("_\\d+\\.", "_raw.");
|
||||||
fileURL = new URL(urlString);
|
fileURL = new URL(urlString);
|
||||||
|
Loading…
Reference in New Issue
Block a user