lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Paths.get(url.toURI()) in LocalVersion.current()

Browse Source
This commit is contained in:
yushijinhun
2018-08-04 21:17:52 +08:00
parent b78beb3305
commit be37014206
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
HMCL/src/main/java/org/jackhuang/hmcl/upgrade/LocalVersion.java
View File

@@ -17,14 +17,12 @@
*/ */
package org.jackhuang.hmcl.upgrade; package org.jackhuang.hmcl.upgrade;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.jackhuang.hmcl.util.Logging.LOG; import static org.jackhuang.hmcl.util.Logging.LOG;
import java.io.UnsupportedEncodingException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.net.URLDecoder; import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.CodeSource; import java.security.CodeSource;
@@ -47,22 +45,11 @@ class LocalVersion {
return Optional.empty(); return Optional.empty();
} }
String pathString = url.getFile();
if (pathString.isEmpty()) {
return Optional.empty();
}
try {
pathString = URLDecoder.decode(pathString, UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
Path path; Path path;
try { try {
path = Paths.get(pathString); path = Paths.get(url.toURI());
} catch (InvalidPathException e) { } catch (FileSystemNotFoundException | IllegalArgumentException | URISyntaxException e) {
LOG.log(Level.WARNING, "Invalid path: " + pathString, e); LOG.log(Level.WARNING, "Invalid path: " + url, e);
return Optional.empty(); return Optional.empty();
} }