re-order config options

WillDera · Feb 12, 2023 · f3c2ee4 · f3c2ee4
1 parent 555f73b
commit f3c2ee4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt
@@ -56,8 +56,6 @@ fun getChapterCachePath(mangaId: Int, chapterId: Int): String {
     return applicationDirs.tempMangaCacheRoot + "/" + getChapterDir(mangaId, chapterId)
 }
 
-// (if (useTempCache) applicationDirs.tempCacheRoot else )
-
 /** return value says if rename/move was successful */
 fun updateMangaDownloadDir(mangaId: Int, newTitle: String): Boolean {
     val mangaEntry = getMangaEntry(mangaId)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
@@ -19,30 +19,29 @@ class ServerConfig(config: Config, moduleName: String = MODULE_NAME) : SystemPro
 
     // proxy
     val socksProxyEnabled: Boolean by overridableConfig
-
     val socksProxyHost: String by overridableConfig
     val socksProxyPort: String by overridableConfig
 
-    // downloader
-    val downloadAsCbz: Boolean by overridableConfig
-
-    // misc
-    val debugLogsEnabled: Boolean = debugLogsEnabled(GlobalConfigManager.config)
-    val systemTrayEnabled: Boolean by overridableConfig
-    val downloadsPath: String by overridableConfig
-
     // webUI
     val webUIEnabled: Boolean by overridableConfig
     val webUIFlavor: String by overridableConfig
     val initialOpenInBrowserEnabled: Boolean by overridableConfig
     val webUIInterface: String by overridableConfig
     val electronPath: String by overridableConfig
 
+    // downloader
+    val downloadAsCbz: Boolean by overridableConfig
+    val downloadsPath: String by overridableConfig
+
     // Authentication
     val basicAuthEnabled: Boolean by overridableConfig
     val basicAuthUsername: String by overridableConfig
     val basicAuthPassword: String by overridableConfig
 
+    // misc
+    val debugLogsEnabled: Boolean = debugLogsEnabled(GlobalConfigManager.config)
+    val systemTrayEnabled: Boolean by overridableConfig
+
     companion object {
         fun register(config: Config) = ServerConfig(config.getConfig(MODULE_NAME))
     }

diff --git a/server/src/main/resources/server-reference.conf b/server/src/main/resources/server-reference.conf
@@ -14,15 +14,15 @@ server.initialOpenInBrowserEnabled = true
 server.webUIInterface = "browser" # "browser" or "electron"
 server.electronPath = ""
 
+# downloader
+server.downloadAsCbz = false
+server.downloadsPath = ""
+
 # Authentication
 server.basicAuthEnabled = false
 server.basicAuthUsername = ""
 server.basicAuthPassword = ""
 
-# downloader
-server.downloadAsCbz = false
-
 # misc
 server.debugLogsEnabled = false
 server.systemTrayEnabled = true
-server.downloadsPath = ""