mirrors/packwiz-installer
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz-installer.git synced 2025-04-19 13:06:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better error reporting, fix NPE (stupid Gson)

Browse Source
This commit is contained in:
comp500 2019-06-24 03:38:19 +01:00
parent 165c8cc172
commit d18e134140
No known key found for this signature in database
GPG Key ID: 214C822FFEC586B5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/link/infra/packwiz/installer/Main.java
View File

@ -122,7 +122,13 @@ public class Main {
ui.executeManager(new Runnable(){ ui.executeManager(new Runnable(){
@Override @Override
public void run() { public void run() {
try {
new UpdateManager(uOptions, ui); new UpdateManager(uOptions, ui);
} catch (Exception e) {
// TODO: better error message?
ui.handleExceptionAndExit(e);
return;
}
} }
}); });
} catch (Exception e) { } catch (Exception e) {

8
src/main/java/link/infra/packwiz/installer/UpdateManager.java
View File

@ -110,16 +110,18 @@ public class UpdateManager {
ui.submitProgress(new InstallProgress("Loading manifest file...")); ui.submitProgress(new InstallProgress("Loading manifest file..."));
Gson gson = new Gson(); Gson gson = new Gson();
ManifestFile manifest; ManifestFile manifest = null;
try { try {
manifest = gson.fromJson(new FileReader(Paths.get(opts.packFolder, opts.manifestFile).toString()), manifest = gson.fromJson(new FileReader(Paths.get(opts.packFolder, opts.manifestFile).toString()),
ManifestFile.class); ManifestFile.class);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) { // Do nothing
manifest = new ManifestFile();
} catch (JsonSyntaxException | JsonIOException e) { } catch (JsonSyntaxException | JsonIOException e) {
ui.handleExceptionAndExit(e); ui.handleExceptionAndExit(e);
return; return;
} }
if (manifest == null) {
manifest = new ManifestFile();
}
ui.submitProgress(new InstallProgress("Loading pack file...")); ui.submitProgress(new InstallProgress("Loading pack file..."));
GeneralHashingSource packFileSource; GeneralHashingSource packFileSource;