- cleanup

Author: derreisende77

src/main/java/mediathek/Main.java

@@ -99,14 +99,10 @@ private static void cleanupOsxFiles() {
      * CAUTION: At least some UI MUST BE INITILIZED, otherwise on macOS VM will crash in native code!!!!
      */
     private static void removeMediaDb() {
-        try {
-            var mediaDbPath = StandardLocations.getSettingsDirectory().resolve("mediadb.txt");
-            if (Files.exists(mediaDbPath)) {
-                logger.info("Moving old unsupported media database to trash.");
-                mediathek.tool.FileUtils.moveToTrash(mediaDbPath);
-            }
-        }
-        catch (IOException ignored) {
+        var mediaDbPath = StandardLocations.getSettingsDirectory().resolve("mediadb.txt");
+        if (Files.exists(mediaDbPath)) {
+            logger.info("Moving old unsupported media database to trash.");
+            FileUtils.moveToTrash(mediaDbPath);
         }
     }
 

src/main/java/mediathek/gui/actions/DeleteLocalFilmlistAction.java

@@ -4,17 +4,13 @@
 import mediathek.config.StandardLocations;
 import mediathek.mainwindow.MediathekGui;
 import mediathek.tool.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
-import java.io.IOException;
 import java.nio.file.Paths;
 
 public class DeleteLocalFilmlistAction extends AbstractAction {
     private final JFrame owner;
-    private static final Logger logger = LogManager.getLogger();
 
     public DeleteLocalFilmlistAction(MediathekGui parent) {
         super();
@@ -25,23 +21,12 @@ public DeleteLocalFilmlistAction(MediathekGui parent) {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        try {
-            var filmlistPathStr = StandardLocations.getFilmlistFilePathString();
-            var fimlistPath = Paths.get(filmlistPathStr);
-            FileUtils.moveToTrash(fimlistPath);
-            JOptionPane.showMessageDialog(owner,
-                    "Filmliste wurde gelöscht.\nDas Programm wird nun beendet.",
-                    Konstanten.PROGRAMMNAME,JOptionPane.INFORMATION_MESSAGE);
-            MediathekGui.ui().quitApplication();
-        } catch (IOException ex) {
-            logger.error("Failed to delete filmlist", ex);
-            JOptionPane.showMessageDialog(owner,
-                    """
-                            Es trat ein Fehler beim Löschen der Filmliste auf.
-                            Weitere Informationen finden Sie in der Logdatei.
-                            Das Programm wird nun beendet.""",
-                    Konstanten.PROGRAMMNAME,JOptionPane.ERROR_MESSAGE);
-            MediathekGui.ui().quitApplication();
-        }
+        var filmlistPathStr = StandardLocations.getFilmlistFilePathString();
+        var fimlistPath = Paths.get(filmlistPathStr);
+        FileUtils.moveToTrash(fimlistPath);
+        JOptionPane.showMessageDialog(owner,
+                "Filmliste wurde gelöscht.\nDas Programm wird nun beendet.",
+                Konstanten.PROGRAMMNAME, JOptionPane.INFORMATION_MESSAGE);
+        MediathekGui.ui().quitApplication();
     }
 }

src/main/java/mediathek/tool/FileUtils.kt

@@ -14,18 +14,18 @@ object FileUtils {
     /**
      * Move a file to the OS trash if supported, otherwise delete it.
      * @param filePath the pathe to the file to be deleted.
-     * @throws IOException any occuring exception.
      */
-    @Throws(IOException::class)
     @JvmStatic
     fun moveToTrash(filePath: Path) {
-        if (SystemUtils.IS_OS_MAC_OSX) {
-            MacFileUtils.moveToTrash(filePath.toFile())
-        }
-        else if (SystemUtils.IS_OS_WINDOWS) {
-            WindowsFileUtils.moveToTrash(filePath.toFile())
-        }
-        else {
+        try {
+            if (SystemUtils.IS_OS_MAC_OSX) {
+                MacFileUtils.moveToTrash(filePath.toFile())
+            } else if (SystemUtils.IS_OS_WINDOWS) {
+                WindowsFileUtils.moveToTrash(filePath.toFile())
+            } else {
+                Files.deleteIfExists(filePath)
+            }
+        } catch (_: IOException) {
             Files.deleteIfExists(filePath)
         }
     }