Update everything (#68)

* Update everything, cleanup build.gradle.kts's

* Make requested changes

server/src/main/kotlin/ir/armor/tachidesk/impl/backup/legacy/LegacyBackupImport.kt

@@ -9,8 +9,8 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.SManga
 import ir.armor.tachidesk.impl.Category.createCategory
 import ir.armor.tachidesk.impl.Category.getCategoryList
-import ir.armor.tachidesk.impl.backup.legacy.LegacyBackupRestoreValidator.ValidationResult
-import ir.armor.tachidesk.impl.backup.legacy.LegacyBackupRestoreValidator.validate
+import ir.armor.tachidesk.impl.backup.legacy.LegacyBackupValidator.ValidationResult
+import ir.armor.tachidesk.impl.backup.legacy.LegacyBackupValidator.validate
 import ir.armor.tachidesk.impl.backup.legacy.models.Backup
 import ir.armor.tachidesk.impl.backup.legacy.models.DHistory
 import ir.armor.tachidesk.impl.backup.models.CategoryImpl
@@ -54,7 +54,7 @@ object LegacyBackupImport : LegacyBackupBase() {
         json.get(Backup.CATEGORIES)?.let { restoreCategories(it) }
 
         // Store source mapping for error messages
-        sourceMapping = LegacyBackupRestoreValidator.getSourceMapping(json)
+        sourceMapping = LegacyBackupValidator.getSourceMapping(json)
 
         // Restore individual manga
         mangasJson.forEach {

server/src/main/kotlin/ir/armor/tachidesk/impl/backup/legacy/LegacyBackupValidator.kt

@@ -13,7 +13,7 @@ import ir.armor.tachidesk.model.database.SourceTable
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 
-object LegacyBackupRestoreValidator {
+object LegacyBackupValidator {
     data class ValidationResult(val missingSources: List<String>, val missingTrackers: List<String>)
 
     /**

server/src/main/kotlin/ir/armor/tachidesk/server/util/SystemTray.kt

@@ -13,9 +13,9 @@ import dorkbox.systemTray.SystemTray.TrayType
 import dorkbox.util.CacheUtil
 import dorkbox.util.Desktop
 import ir.armor.tachidesk.Main
+import ir.armor.tachidesk.server.BuildConfig
 import ir.armor.tachidesk.server.serverConfig
-import java.awt.event.ActionListener
-import java.io.IOException
+import kotlin.system.exitProcess
 
 fun openInBrowser() {
     try {
@@ -32,22 +32,17 @@ fun systemTray(): SystemTray? {
         if (System.getProperty("os.name").startsWith("Windows"))
             SystemTray.FORCE_TRAY_TYPE = TrayType.Swing
 
-        CacheUtil.clear()
+        CacheUtil.clear(BuildConfig.name)
 
-        val systemTray = SystemTray.get() ?: return null
+        val systemTray = SystemTray.get(BuildConfig.name) ?: return null
         val mainMenu = systemTray.menu
 
         mainMenu.add(
             MenuItem(
-                "Open Tachidesk",
-                ActionListener {
-                    try {
-                        Desktop.browseURL("http://127.0.0.1:4567")
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
-                }
-            )
+                "Open Tachidesk"
+            ) {
+                openInBrowser()
+            }
         )
 
         val icon = Main::class.java.getResource("/icon/faviconlogo.png")
@@ -56,13 +51,15 @@ fun systemTray(): SystemTray? {
         systemTray.setImage(icon)
 //    systemTray.status = "No Mail"
 
-        systemTray.getMenu().add(
+        mainMenu.add(
             MenuItem("Quit") {
                 systemTray.shutdown()
-                System.exit(0)
+                exitProcess(0)
             }
         )
 
+        systemTray.installShutdownHook()
+
         return systemTray
     } catch (e: Exception) {
         e.printStackTrace()