Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2024-11-24 12:16:28 +01:00
Code Issues Projects Releases Wiki Activity

Allow bootstrap server to announce unpacked update jars

Browse Source 
Pack200 is dead, this is the start of its removal
This commit is contained in:
Henry Le Grys 2021-02-02 03:18:22 +00:00
parent 27da4e8e4c
commit 662162392e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
launcher-bootstrap/src/main/java/com/skcraft/launcher/bootstrap/Downloader.java
View File

@ -61,11 +61,10 @@ public class Downloader implements Runnable, ProgressObservable {
} }
}); });
File finalFile = new File(bootstrap.getBinariesDir(), System.currentTimeMillis() + ".jar.pack");
File tempFile = new File(finalFile.getParentFile(), finalFile.getName() + ".tmp");
URL updateUrl = HttpRequest.url(bootstrap.getProperties().getProperty("latestUrl")); URL updateUrl = HttpRequest.url(bootstrap.getProperties().getProperty("latestUrl"));
log.info("Reading update URL " + updateUrl + "..."); log.info("Reading update URL " + updateUrl + "...");
List<LauncherBinary> binaries = new ArrayList<LauncherBinary>();
try { try {
String data = HttpRequest String data = HttpRequest
@ -93,6 +92,16 @@ public class Downloader implements Runnable, ProgressObservable {
checkInterrupted(); checkInterrupted();
boolean packed = true;
Object packedCheck = ((JSONObject) object).get("packed");
if (packedCheck == Boolean.FALSE) {
packed = false;
}
String extension = packed ? ".jar.pack" : ".jar";
File finalFile = new File(bootstrap.getBinariesDir(), System.currentTimeMillis() + extension);
File tempFile = new File(finalFile.getParentFile(), finalFile.getName() + ".tmp");
log.info("Downloading " + url + " to " + tempFile.getAbsolutePath()); log.info("Downloading " + url + " to " + tempFile.getAbsolutePath());
httpRequest = HttpRequest.get(url); httpRequest = HttpRequest.get(url);
@ -103,6 +112,9 @@ public class Downloader implements Runnable, ProgressObservable {
finalFile.delete(); finalFile.delete();
tempFile.renameTo(finalFile); tempFile.renameTo(finalFile);
LauncherBinary binary = new LauncherBinary(finalFile);
binaries.add(binary);
} finally { } finally {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
@ -113,9 +125,6 @@ public class Downloader implements Runnable, ProgressObservable {
}); });
} }
LauncherBinary binary = new LauncherBinary(finalFile);
List<LauncherBinary> binaries = new ArrayList<LauncherBinary>();
binaries.add(binary);
bootstrap.launchExisting(binaries, false); bootstrap.launchExisting(binaries, false);
} }