Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[don't merge] history.end_rip_after_already_seen now works even if remember.url_his… #1014

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[don't merge] history.end_rip_after_already_seen now works even if remember.url_his… #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82197d
history.end_rip_after_already_seen now works even if remember.url_his…
Oct 19, 2018
48cd13a
Merge branch 'master' into history.end_rip_after_already_seen-Changes
cyian-1756 Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public void rip() throws IOException {
}

while (doc != null) {
LOGGER.info("AHR: alreadyDownloadedUrls = " + alreadyDownloadedUrls + " history.end_rip_after_already_seen = " + Utils.getConfigInteger("history.end_rip_after_already_seen", 1000000000));
if (alreadyDownloadedUrls >= Utils.getConfigInteger("history.end_rip_after_already_seen", 1000000000) && !isThisATest()) {
sendUpdate(STATUS.DOWNLOAD_COMPLETE_HISTORY, "Already seen the last " + alreadyDownloadedUrls + " images ending rip");
break;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public abstract class AbstractRipper
public abstract String getGID(URL url) throws MalformedURLException;
public boolean hasASAPRipping() { return false; }
// Everytime addUrlToDownload skips a already downloaded url this increases by 1
public int alreadyDownloadedUrls = 0;
public static int alreadyDownloadedUrls = 0;
private boolean shouldStop = false;
private static boolean thisIsATest = false;

Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ public void run() {
}
if (saveAs.exists() && !observer.tryResumeDownload() && !getFileExtFromMIME ||
Utils.fuzzyExists(new File(saveAs.getParent()), saveAs.getName()) && getFileExtFromMIME && !observer.tryResumeDownload()) {
AbstractRipper.alreadyDownloadedUrls += 1;
logger.info("alreadyDownloadedUrls = " + AbstractRipper.alreadyDownloadedUrls);
if (Utils.getConfigBoolean("file.overwrite", false)) {
logger.info("[!] " + rb.getString("deleting.existing.file") + prettySaveAs);
saveAs.delete();
Expand Down Expand Up @@ -217,7 +219,8 @@ public void run() {
String[] saveAsSplit = saveAs.getName().split("\\.");
// Get the file extension so when we shorten the file name we don't cut off the file extension
String fileExt = saveAsSplit[saveAsSplit.length - 1];
// The max limit for filenames on Linux with Ext3/4 is 255 bytes
// The max limit for filenames on Linux with Ext3/4 is 255 bytes, on windows it's 256 chars so rather than
// bother with code with both platforms we just cut the file name down to 254 chars
logger.info(saveAs.getName().substring(0, 254 - fileExt.length()) + fileExt);
String filename = saveAs.getName().substring(0, 254 - fileExt.length()) + "." + fileExt;
// We can't just use the new file name as the saveAs because the file name doesn't include the
Expand Down