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

1.0.56 - Fix for imgur rips

Browse Source 
Should close #59
This commit is contained in:
4pr0n 2014-06-07 01:25:39 -07:00
parent 6c90522693
commit 1c90e98bf2
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.rarchives.ripme</groupId> <groupId>com.rarchives.ripme</groupId>
<artifactId>ripme</artifactId> <artifactId>ripme</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.55</version> <version>1.0.56</version>
<name>ripme</name> <name>ripme</name>
<url>http://rip.rarchives.com</url> <url>http://rip.rarchives.com</url>
<properties> <properties>

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

@ -25,7 +25,7 @@ public abstract class AbstractRipper
protected static final Logger logger = Logger.getLogger(AbstractRipper.class); protected static final Logger logger = Logger.getLogger(AbstractRipper.class);
public static final String USER_AGENT = public static final String USER_AGENT =
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:27.0) Gecko/20100101 Firefox/27.0"; "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:29.0) Gecko/20100101 Firefox/29.0";
protected URL url; protected URL url;
protected File workingDir; protected File workingDir;

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

@ -83,13 +83,14 @@ public class DownloadFileThread extends Thread {
tries += 1; tries += 1;
Response response; Response response;
response = Jsoup.connect(url.toExternalForm()) response = Jsoup.connect(url.toExternalForm())
.ignoreContentType(true) .ignoreContentType(true)
.userAgent(AbstractRipper.USER_AGENT) .userAgent(AbstractRipper.USER_AGENT)
.timeout(TIMEOUT) .header("accept", "*/*")
.maxBodySize(MAX_BODY_SIZE) .timeout(TIMEOUT)
.cookies(cookies) .maxBodySize(MAX_BODY_SIZE)
.referrer(referrer) .cookies(cookies)
.execute(); .referrer(referrer)
.execute();
if (response.statusCode() != 200) { if (response.statusCode() != 200) {
logger.error("[!] Non-OK status code " + response.statusCode() + " while downloading from " + url); logger.error("[!] Non-OK status code " + response.statusCode() + " while downloading from " + url);
observer.downloadErrored(url, "Non-OK status code " + response.statusCode() + " while downloading " + url.toExternalForm()); observer.downloadErrored(url, "Non-OK status code " + response.statusCode() + " while downloading " + url.toExternalForm());

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

@ -196,7 +196,7 @@ public class RedditRipper extends AlbumRipper {
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); addURLToDownload(urls.get(i), prefix, "", theUrl, null);
} }
} }
} }

2
src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
View File

@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
public class UpdateUtils { public class UpdateUtils {
private static final Logger logger = Logger.getLogger(UpdateUtils.class); private static final Logger logger = Logger.getLogger(UpdateUtils.class);
private static final String DEFAULT_VERSION = "1.0.55"; private static final String DEFAULT_VERSION = "1.0.56";
private static final String updateJsonURL = "http://rarchives.com/ripme.json"; private static final String updateJsonURL = "http://rarchives.com/ripme.json";
private static final String updateJarURL = "http://rarchives.com/ripme.jar"; private static final String updateJarURL = "http://rarchives.com/ripme.jar";
private static final String mainFileName = "ripme.jar"; private static final String mainFileName = "ripme.jar";