diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java index c6a8c3df..aa84cd67 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java @@ -345,8 +345,8 @@ public abstract class AbstractHTMLRipper extends AbstractRipper { } @Override - public boolean addURLToDownload(URL url, File saveAs) { - return addURLToDownload(url, saveAs, null, null, false); + public boolean addURLToDownload(URL url, Path saveAs) { + return addURLToDownload(url, saveAs.toFile(), null, null, false); } /** diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java index 7bcab02c..4db46f8b 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java @@ -184,8 +184,8 @@ public abstract class AbstractJSONRipper extends AbstractRipper { } @Override - public boolean addURLToDownload(URL url, File saveAs) { - return addURLToDownload(url, saveAs, null, null, false); + public boolean addURLToDownload(URL url, Path saveAs) { + return addURLToDownload(url, saveAs.toFile(), null, null, false); } /** diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 2606068b..5a4e6654 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -208,7 +208,7 @@ public abstract class AbstractRipper * Path of the local file to save the content to. * @return True on success, false on failure. */ - public abstract boolean addURLToDownload(URL url, File saveAs); + public abstract boolean addURLToDownload(URL url, Path saveAs); /** * Queues image to be downloaded and saved. diff --git a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java index 094fcb10..3342c3c8 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java @@ -93,8 +93,8 @@ public abstract class AlbumRipper extends AbstractRipper { } @Override - public boolean addURLToDownload(URL url, File saveAs) { - return addURLToDownload(url, saveAs, null, null, false); + public boolean addURLToDownload(URL url, Path saveAs) { + return addURLToDownload(url, saveAs.toFile(), null, null, false); } /** diff --git a/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java b/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java index 0499354e..dc9cbe09 100644 --- a/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/VideoRipper.java @@ -44,8 +44,7 @@ public abstract class VideoRipper extends AbstractRipper { } @Override - public boolean addURLToDownload(URL url, File saveAsF) { - Path saveAs = saveAsF.toPath(); + public boolean addURLToDownload(URL url, Path saveAs) { if (Utils.getConfigBoolean("urls_only.save", false)) { // Output URL to file String urlFile = this.workingDir + "/urls.txt"; @@ -75,7 +74,7 @@ public abstract class VideoRipper extends AbstractRipper { @Override public boolean addURLToDownload(URL url, File saveAs, String referrer, Map cookies, Boolean getFileExtFromMIME) { - return addURLToDownload(url, saveAs); + return addURLToDownload(url, saveAs.toPath()); } /** diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java index 13568758..ba7e446d 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java @@ -249,7 +249,7 @@ public class EHentaiRipper extends AbstractHTMLRipper { savePath += String.format("%03d_", index); } savePath += m.group(1); - addURLToDownload(new URL(imgsrc), Paths.get(savePath).toFile()); + addURLToDownload(new URL(imgsrc), Paths.get(savePath)); } else { // Provide prefix and let the AbstractRipper "guess" the filename String prefix = ""; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java index 93cb809e..4a049b93 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java @@ -230,7 +230,7 @@ public class ImgurRipper extends AlbumRipper { } saveAs += imgurImage.getSaveAs(); saveAs = saveAs.replaceAll("\\?\\d", ""); - addURLToDownload(imgurImage.url, new File(saveAs)); + addURLToDownload(imgurImage.url, new File(saveAs).toPath()); } } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/PahealRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/PahealRipper.java index 4eb69c58..39d56b83 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/PahealRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/PahealRipper.java @@ -95,7 +95,7 @@ public class PahealRipper extends AbstractHTMLRipper { + "/" + Utils.filesystemSafe(new URI(name).getPath()) + ext); - addURLToDownload(url, outFile.toFile()); + addURLToDownload(url, outFile); } catch (URISyntaxException ex) { logger.error("Error while downloading URL " + url, ex); } 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 66f4a809..8947f4de 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java @@ -404,7 +404,7 @@ public class RedditRipper extends AlbumRipper { // It's from reddituploads. Assume .jpg extension. String savePath = this.workingDir + "/"; savePath += id + "-" + m.group(1) + title + ".jpg"; - addURLToDownload(urls.get(0), Paths.get(savePath).toFile()); + addURLToDownload(urls.get(0), Paths.get(savePath)); } if (url.contains("v.redd.it")) { String savePath = this.workingDir + "/"; @@ -412,7 +412,7 @@ public class RedditRipper extends AlbumRipper { URL urlToDownload = parseRedditVideoMPD(urls.get(0).toExternalForm()); if (urlToDownload != null) { LOGGER.info("url: " + urlToDownload + " file: " + savePath); - addURLToDownload(urlToDownload, Paths.get(savePath).toFile()); + addURLToDownload(urlToDownload, Paths.get(savePath)); } } else {