AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-16 07:16:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: not closing JarFile

Browse Source
This commit is contained in:
huanghongxun 2020-04-14 15:07:21 +08:00
parent 5adbac3cc9
commit 4382326dec
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java
View File

@ -22,12 +22,14 @@ import org.jackhuang.hmcl.game.Library;
import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.io.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.jar.JarFile;
import java.util.logging.Level; import java.util.logging.Level;
/** /**
@ -84,7 +86,18 @@ public final class GameLibrariesTask extends Task<Void> {
if (!download && integrityCheck && !library.getDownload().validateChecksum(jar, true)) download = true; if (!download && integrityCheck && !library.getDownload().validateChecksum(jar, true)) download = true;
if (!download && integrityCheck && if (!download && integrityCheck &&
library.getChecksums() != null && !library.getChecksums().isEmpty() && library.getChecksums() != null && !library.getChecksums().isEmpty() &&
!LibraryDownloadTask.checksumValid(jar.toFile(), library.getChecksums())) download = true; !LibraryDownloadTask.checksumValid(file, library.getChecksums())) download = true;
if (!download && integrityCheck) {
String ext = FileUtils.getExtension(file);
if (ext.equals("jar")) {
try (JarFile jarFile = new JarFile(file)) {
jarFile.getManifest();
} catch (IOException ignored) {
// the Jar file is malformed, so re-download it.
download = true;
}
}
}
} catch (IOException e) { } catch (IOException e) {
Logging.LOG.log(Level.WARNING, "Unable to calc hash value of file " + jar, e); Logging.LOG.log(Level.WARNING, "Unable to calc hash value of file " + jar, e);
} }

3
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java
View File

@ -145,9 +145,10 @@ public class LibraryDownloadTask extends Task<Void> {
task.addIntegrityCheckHandler((file, dest) -> { task.addIntegrityCheckHandler((file, dest) -> {
String ext = FileUtils.getExtension(dest).toLowerCase(); String ext = FileUtils.getExtension(dest).toLowerCase();
if (ext.equals("jar")) { if (ext.equals("jar")) {
JarFile jarFile = new JarFile(file.toFile()); try (JarFile jarFile = new JarFile(file.toFile())) {
jarFile.getManifest(); jarFile.getManifest();
} }
}
}); });
xz = false; xz = false;
} }