fix progress bar, improve database load error

xspanger3770 · Nov 20, 2023 · c54605b · c54605b
1 parent b538f25
commit c54605b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/GlobalQuakeClient/src/main/java/globalquake/ui/client/MainFrame.java b/GlobalQuakeClient/src/main/java/globalquake/ui/client/MainFrame.java
@@ -166,20 +166,20 @@ public static void updateProgressBar(String status, int value) {
     }
 
     private static void finishInit() {
-        updateProgressBar("Calibrating...", (int) ((phase++ / (PHASES + 3)) * 100.0));
+        updateProgressBar("Calibrating...", (int) ((phase++ / (PHASES + 4)) * 100.0));
 
         if(Settings.recalibrateOnLaunch) {
             EarthquakeAnalysisTraining.calibrateResolution(MainFrame::updateProgressBar, null);
         }
 
-        updateProgressBar("Updating Station Sources...", (int) ((phase++ / (PHASES + 3)) * 100.0));
+        updateProgressBar("Updating Station Sources...", (int) ((phase++ / (PHASES + 4)) * 100.0));
         databaseManager.runUpdate(
                 databaseManager.getStationDatabase().getStationSources().stream()
                         .filter(StationSource::isOutdated).collect(Collectors.toList()),
                 () -> {
                     updateProgressBar("Checking Seedlink Networks...", (int) ((phase++ / (PHASES + 3)) * 100.0));
                     databaseManager.runAvailabilityCheck(databaseManager.getStationDatabase().getSeedlinkNetworks(), () -> {
-                        updateProgressBar("Saving...", (int) ((phase++ / (PHASES + 3)) * 100.0));
+                        updateProgressBar("Saving...", (int) ((phase++ / (PHASES + 4)) * 100.0));
 
                         try {
                             databaseManager.save();
@@ -188,7 +188,7 @@ private static void finishInit() {
                         }
                         databaseMonitorFrame.initDone();
 
-                        updateProgressBar("Done", (int) ((phase++ / (PHASES + 3)) * 100.0));
+                        updateProgressBar("Done", (int) ((phase++ / (PHASES + 4)) * 100.0));
                     });
                 });
     }

diff --git a/GlobalQuakeCore/src/main/java/globalquake/core/database/StationDatabaseManager.java b/GlobalQuakeCore/src/main/java/globalquake/core/database/StationDatabaseManager.java
@@ -46,7 +46,8 @@ public void load() throws FatalIOException {
 
                 Logger.info("Database load successfull");
             } catch (ClassNotFoundException | IOException e) {
-                GlobalQuake.getErrorHandler().handleException(new FatalIOException("Unable to read station database!", e));
+                GlobalQuake.getErrorHandler().handleException(
+                        new FatalIOException("Unable to load station database, it probably got corrupted!", e));
             }
         }