This is better.

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt

@@ -9,9 +9,10 @@ import net.harawata.appdirs.AppDirsFactory
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-fun tachideskRootDir(): String {
+val ApplicationRootDir: String
+    get(): String {
         return System.getProperty(
                 "ir.armor.tachidesk.rootDir",
                 AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
         )
-}
+    }

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt

@@ -46,7 +46,7 @@ open class ConfigManager {
 
         //Load user config
         val userConfig =
-            File(tachideskRootDir(), "server.conf").let {
+            File(ApplicationRootDir, "server.conf").let {
                 ConfigFactory.parseFile(it)
             }
 

server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt

@@ -50,7 +50,6 @@ object Extension {
     private val logger = KotlinLogging.logger {}
     private val applicationDirs by DI.global.instance<ApplicationDirs>()
 
-
     data class InstallableAPK(
         val apkFilePath: String,
         val pkgName: String

server/src/main/kotlin/ir/armor/tachidesk/server/ServerSetup.kt

@@ -20,15 +20,15 @@ import org.kodein.di.singleton
 import org.slf4j.Logger
 import xyz.nulldev.androidcompat.AndroidCompat
 import xyz.nulldev.androidcompat.AndroidCompatInitializer
+import xyz.nulldev.ts.config.ApplicationRootDir
 import xyz.nulldev.ts.config.ConfigKodeinModule
 import xyz.nulldev.ts.config.GlobalConfigManager
-import xyz.nulldev.ts.config.tachideskRootDir
 import java.io.File
 
 private val logger = KotlinLogging.logger {}
 
 class ApplicationDirs(
-    val dataRoot: String = tachideskRootDir()
+    val dataRoot: String = ApplicationRootDir
 ) {
     val extensionsRoot = "$dataRoot/extensions"
     val thumbnailsRoot = "$dataRoot/thumbnails"
@@ -44,9 +44,11 @@ val androidCompat by lazy { AndroidCompat() }
 fun applicationSetup() {
     // Application dirs
     val applicationDirs = ApplicationDirs()
-    DI.global.addImport(DI.Module("Server") {
+    DI.global.addImport(
+        DI.Module("Server") {
             bind<ApplicationDirs>() with singleton { applicationDirs }
-    })
+        }
+    )
 
     // make dirs we need
     listOf(
@@ -58,6 +60,7 @@ fun applicationSetup() {
         File(it).mkdirs()
     }
 
+    // register Tachidesk's config which is dubbed "ServerConfig"
     GlobalConfigManager.registerModule(
         ServerConfig.register(GlobalConfigManager.config)
     )

server/src/test/kotlin/ir/armor/tachidesk/TestExtensions.kt

@@ -75,9 +75,11 @@ class TestExtensions {
                     semaphore.withPermit {
                         logger.info { "$index - Now fetching popular manga from $source" }
                         try {
-                            mangaToFetch += source to (source.fetchPopularManga(1)
+                            mangaToFetch += source to (
+                                source.fetchPopularManga(1)
                                     .awaitSingleRepeat().mangas.firstOrNull()
-                                ?: throw Exception("Source returned no manga"))
+                                    ?: throw Exception("Source returned no manga")
+                                )
                         } catch (e: Exception) {
                             logger.warn { "Failed to fetch popular manga from $source: ${e.message}" }
                             failedToFetch += source to e