From 3c096add201edbb9aa664149bc47f7e67c210aea Mon Sep 17 00:00:00 2001 From: 4pr0n Date: Tue, 13 Jan 2015 00:39:52 -0800 Subject: [PATCH] 1.1.1 - Updated User-Agent, send referrer in reddit rips Attempt to fix #155 --- pom.xml | 2 +- src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java | 2 +- .../java/com/rarchives/ripme/ripper/DownloadFileThread.java | 4 +++- .../java/com/rarchives/ripme/ripper/rippers/RedditRipper.java | 2 +- src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 65ba808e..c3746d75 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rarchives.ripme ripme jar - 1.1.0 + 1.1.1 ripme http://rip.rarchives.com diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index e7292fee..081e991a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -28,7 +28,7 @@ public abstract class AbstractRipper protected static final Logger logger = Logger.getLogger(AbstractRipper.class); public static final String USER_AGENT = - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:29.0) Gecko/20100101 Firefox/29.0"; + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:34.0) Gecko/20100101 Firefox/34.0"; protected URL url; protected File workingDir; diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java index 319e504b..859fa668 100644 --- a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java +++ b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java @@ -99,7 +99,9 @@ public class DownloadFileThread extends Thread { huc.setInstanceFollowRedirects(true); huc.setConnectTimeout(TIMEOUT); huc.setRequestProperty("accept", "*/*"); - huc.setRequestProperty("Referer", referrer); // Sic + if (!referrer.equals("")) { + huc.setRequestProperty("Referer", referrer); // Sic + } huc.setRequestProperty("User-agent", AbstractRipper.USER_AGENT); String cookie = ""; for (String key : cookies.keySet()) { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java index f7670d79..2a4e4411 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java @@ -195,7 +195,7 @@ public class RedditRipper extends AlbumRipper { List urls = RipUtils.getFilesFromURL(originalURL); if (urls.size() == 1) { - addURLToDownload(urls.get(0), id + "-"); + addURLToDownload(urls.get(0), id + "-", "", theUrl, null); } else if (urls.size() > 1) { for (int i = 0; i < urls.size(); i++) { String prefix = id + "-"; diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java index bd003181..89f7d46f 100644 --- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java +++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java @@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils; public class UpdateUtils { private static final Logger logger = Logger.getLogger(UpdateUtils.class); - private static final String DEFAULT_VERSION = "1.1.0"; + private static final String DEFAULT_VERSION = "1.1.1"; private static final String updateJsonURL = "http://rarchives.com/ripme.json"; private static final String updateJarURL = "http://rarchives.com/ripme.jar"; private static final String mainFileName = "ripme.jar";