From 3b33a69bd7077718e00ffe6004e9e9bb731d7526 Mon Sep 17 00:00:00 2001 From: soloturn Date: Fri, 15 Apr 2022 15:51:30 +0200 Subject: [PATCH] check if empty for filename and extension, not double add extension --- src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index a12f5fb2..a2956ead 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -395,18 +395,17 @@ public abstract class AbstractRipper } public static String getFileName(URL url, String fileName, String extension) { - if (fileName == null) { + if (fileName == null || fileName.trim().isEmpty()) { fileName = url.toExternalForm(); fileName = fileName.substring(fileName.lastIndexOf('/')+1); } - if (extension == null) { + if (extension == null || extension.trim().isEmpty()) { // Get the extension of the file String[] lastBitOfURL = url.toExternalForm().split("/"); String[] lastBit = lastBitOfURL[lastBitOfURL.length - 1].split("."); if (lastBit.length != 0) { extension = lastBit[lastBit.length - 1]; - fileName = fileName + "." + extension; } }