diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java index 9b99f747..f879e069 100644 --- a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java +++ b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java @@ -81,7 +81,7 @@ class DownloadFileThread extends Thread { return; } if (saveAs.exists() && !observer.tryResumeDownload() && !getFileExtFromMIME - || Utils.fuzzyExistsBetter(Paths.get(saveAs.getParent()), saveAs.getName()) && getFileExtFromMIME + || Utils.fuzzyExists(Paths.get(saveAs.getParent()), saveAs.getName()) && getFileExtFromMIME && !observer.tryResumeDownload()) { if (Utils.getConfigBoolean("file.overwrite", false)) { logger.info("[!] " + Utils.getLocalizedString("deleting.existing.file") + prettySaveAs); diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java index 9e757a09..7352c4ac 100644 --- a/src/main/java/com/rarchives/ripme/utils/Utils.java +++ b/src/main/java/com/rarchives/ripme/utils/Utils.java @@ -862,28 +862,7 @@ public class Utils { } // Checks if a file exists ignoring it's extension. - // Code from: https://stackoverflow.com/a/17698068 - public static boolean fuzzyExists(File folder, String fileName) { - if (!folder.exists()) { - return false; - } - File[] listOfFiles = folder.listFiles(); - if (listOfFiles == null) { - return false; - } - - for (File file : listOfFiles) { - if (file.isFile()) { - String[] filename = file.getName().split("\\.(?=[^.]+$)"); // split filename from it's extension - if (filename[0].equalsIgnoreCase(fileName)) { - return true; - } - } - } - return false; - } - - public static boolean fuzzyExistsBetter(Path folder, String filename) { + public static boolean fuzzyExists(Path folder, String filename) { return Files.exists(folder.resolve(filename)); }