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

1.0.33 - Allow duplicate URLs on the imgur ripper

Browse Source
This commit is contained in:
4pr0n 2014-04-30 20:13:44 -07:00
parent 761e75c07d
commit 535efb4d88
4 changed files with 20 additions and 5 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.32</version> <version>1.0.33</version>
<name>ripme</name> <name>ripme</name>
<url>http://rip.rarchives.com</url> <url>http://rip.rarchives.com</url>
<properties> <properties>

11
src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
View File

@ -28,10 +28,15 @@ public abstract class AlbumRipper extends AbstractRipper {
public abstract String getHost(); public abstract String getHost();
public abstract String getGID(URL url) throws MalformedURLException; public abstract String getGID(URL url) throws MalformedURLException;
public boolean allowDuplicates() {
return false;
}
public void addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies) { public void addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies) {
if (itemsPending.containsKey(url) if (!allowDuplicates()
|| itemsCompleted.containsKey(url) && ( itemsPending.containsKey(url)
|| itemsErrored.containsKey(url)) { || itemsCompleted.containsKey(url)
|| itemsErrored.containsKey(url) )) {
// Item is already downloaded/downloading, skip it. // Item is already downloaded/downloading, skip it.
logger.info("[!] Skipping " + url + " -- already attempted: " + Utils.removeCWD(saveAs)); logger.info("[!] Skipping " + url + " -- already attempted: " + Utils.removeCWD(saveAs));
return; return;

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

@ -45,6 +45,15 @@ public class ImgurRipper extends AlbumRipper {
SLEEP_BETWEEN_ALBUMS = 1; SLEEP_BETWEEN_ALBUMS = 1;
} }
/**
* Imgur ripper does not return the same URL except when ripping
* many albums at once (USER). In this case, we want duplicates.
*/
@Override
public boolean allowDuplicates() {
return true;
}
public boolean canRip(URL url) { public boolean canRip(URL url) {
if (!url.getHost().endsWith(DOMAIN)) { if (!url.getHost().endsWith(DOMAIN)) {
return false; return false;
@ -129,6 +138,7 @@ public class ImgurRipper extends AlbumRipper {
logger.info(" Retrieving " + url.toExternalForm()); logger.info(" Retrieving " + url.toExternalForm());
Document doc = Jsoup.connect(url.toExternalForm()) Document doc = Jsoup.connect(url.toExternalForm())
.userAgent(USER_AGENT) .userAgent(USER_AGENT)
.timeout(10 * 1000)
.maxBodySize(0) .maxBodySize(0)
.get(); .get();

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

@ -19,7 +19,7 @@ import org.jsoup.nodes.Document;
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.32"; private static final String DEFAULT_VERSION = "1.0.33";
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";