mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-20 12:42:06 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4 from ripmeapp2/for-ripme/utils-cleanup

Browse Source 
remove not necessary parts in Utils.java
This commit is contained in:
Stefan Aladzic
2021-02-18 00:07:54 +01:00
committed by GitHub
parent 4124c6d18d 5e44215cd1
commit 67af6dbdcf
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/rarchives/ripme/utils/Utils.java
View File

@@ -2,7 +2,6 @@ package com.rarchives.ripme.utils;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -22,7 +21,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -32,7 +30,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip;
@@ -359,7 +356,7 @@ public class Utils {
if (wasFirstParam) {
c = "?";
}
url = url.substring(0, paramIndex) + c + url.substring(nextParam + 1, url.length());
url = url.substring(0, paramIndex) + c + url.substring(nextParam + 1);
} else {
url = url.substring(0, paramIndex);
}
@@ -517,8 +514,7 @@ public class Utils {
return path;
}
String original = path; // needs to be checked if lowercase exists
String lastPart = original.substring(index + 1).toLowerCase(); // setting lowercase to check if it exists
String lastPart = path.substring(index + 1).toLowerCase(); // setting lowercase to check if it exists
// Get a List of all Directories and check its lowercase
// if file exists return it
@@ -532,7 +528,8 @@ public class Utils {
}
}
return original;
// otherwise return original path
return path;
}
/**
@@ -778,7 +775,7 @@ public class Utils {
Path myPath;
if (uri.getScheme().equals("jar")) {
FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.<String, Object>emptyMap());
FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
myPath = fileSystem.getPath("/");
} else {
myPath = Paths.get(uri).getParent();
@@ -820,7 +817,7 @@ public class Utils {
* bar
*/
public static String getByteStatusText(int completionPercentage, int bytesCompleted, int bytesTotal) {
return String.valueOf(completionPercentage) + "% - " + Utils.bytesToHumanReadable(bytesCompleted) + " / "
return completionPercentage + "% - " + Utils.bytesToHumanReadable(bytesCompleted) + " / "
+ Utils.bytesToHumanReadable(bytesTotal);
}
@@ -854,7 +851,7 @@ public class Utils {
for (File file : listOfFiles) {
if (file.isFile()) {
String[] filename = file.getName().split("\\.(?=[^\\.]+$)"); // split filename from it's extension
String[] filename = file.getName().split("\\.(?=[^.]+$)"); // split filename from it's extension
if (filename[0].equalsIgnoreCase(fileName)) {
return true;
}
@@ -868,15 +865,11 @@ public class Utils {
}
public static File shortenSaveAsWindows(String ripsDirPath, String fileName) throws FileNotFoundException {
// int ripDirLength = ripsDirPath.length();
// int maxFileNameLength = 260 - ripDirLength;
// LOGGER.info(maxFileNameLength);
LOGGER.error("The filename " + fileName + " is to long to be saved on this file system.");
LOGGER.info("Shortening filename");
String fullPath = ripsDirPath + File.separator + fileName;
// How long the path without the file name is
int pathLength = ripsDirPath.length();
int fileNameLength = fileName.length();
if (pathLength == 260) {
// We've reached the max length, there's nothing more we can do
throw new FileNotFoundException("File path is too long for this OS");
@@ -886,7 +879,6 @@ public class Utils {
// file extension
String fileExt = saveAsSplit[saveAsSplit.length - 1];
// The max limit for paths on Windows is 260 chars
LOGGER.info(fullPath.substring(0, 259 - pathLength - fileExt.length() + 1) + "." + fileExt);
fullPath = fullPath.substring(0, 259 - pathLength - fileExt.length() + 1) + "." + fileExt;
LOGGER.info(fullPath);
LOGGER.info(fullPath.length());