mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-09 15:26:53 +02:00
Code Issues Releases Wiki Activity

addURLToDownload(url, saveAs, referrer, cookies, getFileExtFromMIME) java.nio

Browse Source
This commit is contained in:
soloturn
2022-01-03 20:36:35 +01:00
parent 3c89ca8428
commit 2171d287f8
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,7 +303,7 @@ public abstract class AbstractHTMLRipper extends AbstractRipper {
/*
Queues multiple URLs of single images to download from a single Album URL
*/
public boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies, Boolean getFileExtFromMIME) {
public boolean addURLToDownload(URL url, Path saveAs, String referrer, Map<String,String> cookies, Boolean getFileExtFromMIME) {
// Only download one file if this is a test.
if (super.isThisATest() && (itemsCompleted.size() > 0 || itemsErrored.size() > 0)) {
stop();
@@ -315,7 +315,7 @@ public abstract class AbstractHTMLRipper extends AbstractRipper {
|| itemsCompleted.containsKey(url)
|| itemsErrored.containsKey(url) )) {
// 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.toFile()));
return false;
}
if (Utils.getConfigBoolean("urls_only.save", false)) {
@@ -330,8 +330,8 @@ public abstract class AbstractHTMLRipper extends AbstractRipper {
}
}
else {
itemsPending.put(url, saveAs);
DownloadFileThread dft = new DownloadFileThread(url, saveAs, this, getFileExtFromMIME);
itemsPending.put(url, saveAs.toFile());
DownloadFileThread dft = new DownloadFileThread(url, saveAs.toFile(), this, getFileExtFromMIME);
if (referrer != null) {
dft.setReferrer(referrer);
}
@@ -346,7 +346,7 @@ public abstract class AbstractHTMLRipper extends AbstractRipper {
@Override
public boolean addURLToDownload(URL url, Path saveAs) {
return addURLToDownload(url, saveAs.toFile(), null, null, false);
return addURLToDownload(url, saveAs, null, null, false);
}
/**

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

@@ -142,7 +142,7 @@ public abstract class AbstractJSONRipper extends AbstractRipper {
/**
* Queues multiple URLs of single images to download from a single Album URL
*/
public boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies, Boolean getFileExtFromMIME) {
public boolean addURLToDownload(URL url, Path saveAs, String referrer, Map<String,String> cookies, Boolean getFileExtFromMIME) {
// Only download one file if this is a test.
if (super.isThisATest() && (itemsCompleted.size() > 0 || itemsErrored.size() > 0)) {
stop();
@@ -154,7 +154,7 @@ public abstract class AbstractJSONRipper extends AbstractRipper {
|| itemsCompleted.containsKey(url)
|| itemsErrored.containsKey(url) )) {
// 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.toFile()));
return false;
}
if (Utils.getConfigBoolean("urls_only.save", false)) {
@@ -169,8 +169,8 @@ public abstract class AbstractJSONRipper extends AbstractRipper {
}
}
else {
itemsPending.put(url, saveAs);
DownloadFileThread dft = new DownloadFileThread(url, saveAs, this, getFileExtFromMIME);
itemsPending.put(url, saveAs.toFile());
DownloadFileThread dft = new DownloadFileThread(url, saveAs.toFile(), this, getFileExtFromMIME);
if (referrer != null) {
dft.setReferrer(referrer);
}
@@ -185,7 +185,7 @@ public abstract class AbstractJSONRipper extends AbstractRipper {
@Override
public boolean addURLToDownload(URL url, Path saveAs) {
return addURLToDownload(url, saveAs.toFile(), null, null, false);
return addURLToDownload(url, saveAs, null, null, false);
}
/**

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

@@ -224,7 +224,7 @@ public abstract class AbstractRipper
* True if downloaded successfully
* False if failed to download
*/
protected abstract boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String, String> cookies,
protected abstract boolean addURLToDownload(URL url, Path saveAs, String referrer, Map<String, String> cookies,
Boolean getFileExtFromMIME);
/**
@@ -350,7 +350,7 @@ public abstract class AbstractRipper
LOGGER.debug("Unable to write URL history file");
}
}
return addURLToDownload(url, saveFileAs, referrer, cookies, getFileExtFromMIME);
return addURLToDownload(url, saveFileAs.toPath(), referrer, cookies, getFileExtFromMIME);
}
protected boolean addURLToDownload(URL url, String prefix, String subdirectory, String referrer, Map<String,String> cookies, String fileName, String extension) {

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

@@ -51,7 +51,7 @@ public abstract class AlbumRipper extends AbstractRipper {
/**
* Queues multiple URLs of single images to download from a single Album URL
*/
public boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies, Boolean getFileExtFromMIME) {
public boolean addURLToDownload(URL url, Path saveAs, String referrer, Map<String,String> cookies, Boolean getFileExtFromMIME) {
// Only download one file if this is a test.
if (super.isThisATest() && (itemsCompleted.size() > 0 || itemsErrored.size() > 0)) {
stop();
@@ -63,7 +63,7 @@ public abstract class AlbumRipper extends AbstractRipper {
|| itemsCompleted.containsKey(url)
|| itemsErrored.containsKey(url) )) {
// 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.toFile()));
return false;
}
if (Utils.getConfigBoolean("urls_only.save", false)) {
@@ -78,8 +78,8 @@ public abstract class AlbumRipper extends AbstractRipper {
}
}
else {
itemsPending.put(url, saveAs);
DownloadFileThread dft = new DownloadFileThread(url, saveAs, this, getFileExtFromMIME);
itemsPending.put(url, saveAs.toFile());
DownloadFileThread dft = new DownloadFileThread(url, saveAs.toFile(), this, getFileExtFromMIME);
if (referrer != null) {
dft.setReferrer(referrer);
}
@@ -94,7 +94,7 @@ public abstract class AlbumRipper extends AbstractRipper {
@Override
public boolean addURLToDownload(URL url, Path saveAs) {
return addURLToDownload(url, saveAs.toFile(), null, null, false);
return addURLToDownload(url, saveAs, null, null, false);
}
/**

4
src/main/java/com/rarchives/ripme/ripper/VideoRipper.java
View File

@@ -73,8 +73,8 @@ public abstract class VideoRipper extends AbstractRipper {
}
@Override
public boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String, String> cookies, Boolean getFileExtFromMIME) {
return addURLToDownload(url, saveAs.toPath());
public boolean addURLToDownload(URL url, Path saveAs, String referrer, Map<String, String> cookies, Boolean getFileExtFromMIME) {
return addURLToDownload(url, saveAs);
}
/**

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

@@ -333,7 +333,7 @@ public class FivehundredpxRipper extends AbstractJSONRipper {
String[] fields = u.split("/");
String prefix = "/" + getPrefix(index) + fields[fields.length - 3];
Path saveAs = Paths.get(getWorkingDir() + prefix + ".jpg");
addURLToDownload(url, saveAs.toFile(), "", null, false);
addURLToDownload(url, saveAs, "", null, false);
}
}