WIP

mediathekview · Oct 26, 2023 · c54d55c · c54d55c
1 parent a9b8093
commit c54d55c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 108 deletions.
diff --git a/src/main/java/mediathek/mainwindow/MediathekGui.java b/src/main/java/mediathek/mainwindow/MediathekGui.java
@@ -1051,71 +1051,62 @@ public boolean quitApplication(boolean shouldDownloadAndQuit) {
 
         manageAboAction.closeDialog();
 
-        ShutdownDialogController shutdownProgress = new ShutdownDialogController(this);
-        shutdownProgress.show();
-
-        var historyWorker = CompletableFuture.runAsync(() -> {
-            try (SeenHistoryController history = new SeenHistoryController()) {
-                history.performMaintenance();
-            }
-        });
+        logger.info("Perform history maintenance.");
+        try (SeenHistoryController history = new SeenHistoryController()) {
+            history.performMaintenance();
+        }
 
-        var bookmarkWorker = CompletableFuture.runAsync(() ->
-                daten.getListeBookmarkList().saveToFile(StandardLocations.getBookmarkFilePath()));
+        logger.info("Save bookmark list.");
+        daten.getListeBookmarkList().saveToFile(StandardLocations.getBookmarkFilePath());
 
         // stop the download thread
-        shutdownProgress.setStatus(ShutdownState.TERMINATE_STARTER_THREAD);
+        logger.info("Stop Starter Thread.");
         daten.getStarterClass().getStarterThread().interrupt();
 
-        shutdownProgress.setStatus(ShutdownState.SHUTDOWN_NOTIFICATION_CENTER);
+        logger.info("Close Notification center.");
         closeNotificationCenter();
 
         // Tabelleneinstellungen merken
-        shutdownProgress.setStatus(ShutdownState.SAVE_FILM_DATA);
+        logger.info("Save Tab Filme data.");
         tabFilme.tabelleSpeichern();
         tabFilme.saveSettings();  // needs thread pools active!
         tabFilme.filmActionPanel.getFilterDialog().dispose();
 
-        shutdownProgress.setStatus(ShutdownState.SAVE_DOWNLOAD_DATA);
+        logger.info("Save Tab Download data.");
         tabDownloads.tabelleSpeichern();
 
-        shutdownProgress.setStatus(ShutdownState.STOP_DOWNLOADS);
+        logger.info("Stop all downloads.");
         stopDownloads();
 
-        shutdownProgress.setStatus(ShutdownState.SAVE_APP_DATA);
+        logger.info("Save app data.");
         daten.allesSpeichern();
 
-        shutdownProgress.setStatus(ShutdownState.SHUTDOWN_THREAD_POOL);
+        logger.info("Shutdown pools.");
         shutdownTimerPool();
         waitForCommonPoolToComplete();
 
         //shutdown JavaFX
-        shutdownProgress.setStatus(ShutdownState.TERMINATE_JAVAFX_SUPPORT);
+        logger.info("Shutdown JavaFX.");
         shutdownJavaFx();
 
-        try {
-            shutdownProgress.setStatus(ShutdownState.SAVE_BOOKMARKS);
-            bookmarkWorker.get();
-
-            shutdownProgress.setStatus(ShutdownState.PERFORM_SEEN_HISTORY_MAINTENANCE);
-            historyWorker.get();
-        } catch (InterruptedException | ExecutionException e) {
-            logger.error("Async task error", e);
-        }
-
         //close main window
+        logger.info("Close main window.");
         dispose();
 
         //write all settings if not done already...
+        logger.info("Write app config.");
         ApplicationConfiguration.getInstance().writeConfiguration();
 
         RuntimeStatistics.printRuntimeStatistics();
-        RuntimeStatistics.printDataUsageStatistics();
-        shutdownProgress.setStatus(ShutdownState.COMPLETE);
+        if (Config.isEnhancedLoggingEnabled()) {
+            RuntimeStatistics.printDataUsageStatistics();
+        }
 
+        logger.info("Cleanup Lucene index.");
         cleanupLuceneIndex();
 
         if (isShutdownRequested()) {
+            logger.info("Requesting computer shutdown.");
             shutdownComputer();
         }
 

diff --git a/src/main/java/mediathek/mainwindow/ShutdownDialogController.kt b/src/main/java/mediathek/mainwindow/ShutdownDialogController.kt
diff --git a/src/main/java/mediathek/tool/RuntimeStatistics.java b/src/main/java/mediathek/tool/RuntimeStatistics.java
@@ -1,6 +1,5 @@
 package mediathek.tool;
 
-import mediathek.config.Config;
 import mediathek.tool.http.MVHttpClient;
 import org.apache.logging.log4j.LogManager;
 
@@ -19,7 +18,7 @@ public class RuntimeStatistics {
     public static void printRuntimeStatistics() {
         DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
         final var endZeit = LocalDateTime.now();
-        final var runTime = LocalTime.MIN.plusSeconds(Duration.between(startZeit,endZeit).toSeconds());
+        final var runTime = LocalTime.MIN.plusSeconds(Duration.between(startZeit, endZeit).toSeconds());
 
         var logger = LogManager.getLogger();
         logger.info("################################################################################");
@@ -29,11 +28,9 @@ public static void printRuntimeStatistics() {
     }
 
     public static void printDataUsageStatistics() {
-        if (Config.isEnhancedLoggingEnabled()) {
-            var byteCounter = MVHttpClient.getInstance().getByteCounter();
-            var logger = LogManager.getLogger();
-            logger.info("total data sent: {}", FileUtils.humanReadableByteCountBinary(byteCounter.totalBytesWritten()));
-            logger.info("total data received: {}", FileUtils.humanReadableByteCountBinary(byteCounter.totalBytesRead()));
-        }
+        var byteCounter = MVHttpClient.getInstance().getByteCounter();
+        var logger = LogManager.getLogger();
+        logger.info("total data sent: {}", FileUtils.humanReadableByteCountBinary(byteCounter.totalBytesWritten()));
+        logger.info("total data received: {}", FileUtils.humanReadableByteCountBinary(byteCounter.totalBytesRead()));
     }
 }
diff --git a/src/main/java/mediathek/tool/ShutdownState.java b/src/main/java/mediathek/tool/ShutdownState.java