From 1422e32a43155ea38424239ec948e33687ea7441 Mon Sep 17 00:00:00 2001 From: soloturn Date: Mon, 3 Jan 2022 20:10:31 +0100 Subject: [PATCH] downloadexists java.nio --- .../java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java | 6 +++--- .../java/com/rarchives/ripme/ripper/AbstractJSONRipper.java | 6 +++--- .../java/com/rarchives/ripme/ripper/AbstractRipper.java | 3 ++- src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java | 6 +++--- .../java/com/rarchives/ripme/ripper/DownloadFileThread.java | 2 +- .../com/rarchives/ripme/ripper/DownloadVideoThread.java | 2 +- src/main/java/com/rarchives/ripme/ripper/VideoRipper.java | 5 ++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java index 5afaf936..c6a8c3df 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java @@ -403,14 +403,14 @@ public abstract class AbstractHTMLRipper extends AbstractRipper { Tells user that a single file in the album they wish to download has already been downloaded in the past. */ - public void downloadExists(URL url, File file) { + public void downloadExists(URL url, Path file) { if (observer == null) { return; } itemsPending.remove(url); - itemsCompleted.put(url, file); - observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " already saved as " + file.getAbsolutePath())); + itemsCompleted.put(url, file.toFile()); + observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " already saved as " + file)); checkIfComplete(); } diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java index 6be88472..7bcab02c 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java @@ -242,14 +242,14 @@ public abstract class AbstractJSONRipper extends AbstractRipper { * Tells user that a single file in the album they wish to download has * already been downloaded in the past. */ - public void downloadExists(URL url, File file) { + public void downloadExists(URL url, Path file) { if (observer == null) { return; } itemsPending.remove(url); - itemsCompleted.put(url, file); - observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " already saved as " + file.getAbsolutePath())); + itemsCompleted.put(url, file.toFile()); + observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " already saved as " + file)); checkIfComplete(); } diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 7d7275dd..2606068b 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.net.MalformedURLException; import java.net.URL; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -464,7 +465,7 @@ public abstract class AbstractRipper * @param url * @param file */ - public abstract void downloadExists(URL url, File file); + public abstract void downloadExists(URL url, Path file); /** * @return Number of files downloaded. diff --git a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java index 554c0e54..094fcb10 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java @@ -151,14 +151,14 @@ public abstract class AlbumRipper extends AbstractRipper { * Tells user that a single file in the album they wish to download has * already been downloaded in the past. */ - public void downloadExists(URL url, File file) { + public void downloadExists(URL url, Path file) { if (observer == null) { return; } itemsPending.remove(url); - itemsCompleted.put(url, file); - observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " already saved as " + file.getAbsolutePath())); + itemsCompleted.put(url, file.toFile()); + observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " already saved as " + file)); checkIfComplete(); } diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java index f879e069..983b931a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java +++ b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java @@ -89,7 +89,7 @@ class DownloadFileThread extends Thread { } else { logger.info("[!] " + Utils.getLocalizedString("skipping") + " " + url + " -- " + Utils.getLocalizedString("file.already.exists") + ": " + prettySaveAs); - observer.downloadExists(url, saveAs); + observer.downloadExists(url, saveAs.toPath()); return; } } diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java index 69734292..c51c9906 100644 --- a/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java +++ b/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java @@ -60,7 +60,7 @@ class DownloadVideoThread extends Thread { } } else { logger.info("[!] Skipping " + url + " -- file already exists: " + prettySaveAs); - observer.downloadExists(url, saveAs.toFile()); + observer.downloadExists(url, saveAs); return; } } diff --git a/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java b/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java index 8922b93f..0499354e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java @@ -153,12 +153,11 @@ public abstract class VideoRipper extends AbstractRipper { /** * Runs if user tries to redownload an already existing File. - * - * @param url Target URL + * @param url Target URL * @param file Existing file */ @Override - public void downloadExists(URL url, File file) { + public void downloadExists(URL url, Path file) { if (observer == null) { return; }