let's not polute the namespace together

2026-07-04 19:34:35 -05:00 · 2021-03-30 21:10:41 +04:30
parent 90ae180b3e
commit 5656016700
16 changed files with 833 additions and 834 deletions
--- a/server/src/main/kotlin/ir/armor/tachidesk/Main.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/Main.kt
@@ -7,8 +7,8 @@ package ir.armor.tachidesk
 * 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/. */

+import ir.armor.tachidesk.server.JavalinSetup.javalinSetup
 import ir.armor.tachidesk.server.applicationSetup
-import ir.armor.tachidesk.server.javalinSetup

 class Main {
    companion object {
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/CategoryManga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/CategoryManga.kt
@@ -48,7 +48,6 @@ fun removeMangaFromCategory(mangaId: Int, categoryId: Int) {
        }
    }

-
 /**
     * list of mangas that belong to a category
     */
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt
@@ -16,10 +16,10 @@ import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
 import ir.armor.tachidesk.impl.ExtensionsList.extensionTableAsDataClass
+import ir.armor.tachidesk.impl.util.APKExtractor
 import ir.armor.tachidesk.model.database.ExtensionTable
 import ir.armor.tachidesk.model.database.SourceTable
-import ir.armor.tachidesk.impl.util.APKExtractor
-import ir.armor.tachidesk.server.applicationDirs
+import ir.armor.tachidesk.server.ApplicationDirs
 import kotlinx.coroutines.runBlocking
 import mu.KotlinLogging
 import okhttp3.Request
@@ -63,7 +63,7 @@ private fun dex2jar(dexFile: String, jarFile: String, fileNameWithoutType: Strin
            .skipExceptions(false)
            .to(jarFilePath)
        if (handler.hasException()) {
-        val errorFile: Path = File(applicationDirs.extensionsRoot).toPath().resolve("$fileNameWithoutType-error.txt")
+            val errorFile: Path = File(ApplicationDirs.extensionsRoot).toPath().resolve("$fileNameWithoutType-error.txt")
            logger.error(
                "Detail Error Information in File $errorFile\n" +
                    "Please report this file to one of following link if possible (any one).\n" +
@@ -90,10 +90,10 @@ fun installExtension(pkgName: String): Int {
        logger.debug("Installing $pkgName")
        val extensionRecord = extensionTableAsDataClass().first { it.pkgName == pkgName }
        val fileNameWithoutType = extensionRecord.apkName.substringBefore(".apk")
-    val dirPathWithoutType = "${applicationDirs.extensionsRoot}/$fileNameWithoutType"
+        val dirPathWithoutType = "${ApplicationDirs.extensionsRoot}/$fileNameWithoutType"

        // check if we don't have the dex file already downloaded
-    val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
+        val jarPath = "${ApplicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
        if (!File(jarPath).exists()) {
            runBlocking {
                val apkToDownload = ExtensionGithubApi.getApkUrl(extensionRecord)
@@ -188,7 +188,7 @@ fun uninstallExtension(pkgName: String) {

        val extensionRecord = transaction { ExtensionTable.select { ExtensionTable.pkgName eq pkgName }.firstOrNull()!! }
        val fileNameWithoutType = extensionRecord[ExtensionTable.apkName].substringBefore(".apk")
-    val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
+        val jarPath = "${ApplicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
        transaction {
            val extensionId = extensionRecord[ExtensionTable.id].value

@@ -229,7 +229,7 @@ val network: NetworkHelper by injectLazy()
    fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
        val iconUrl = transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.firstOrNull()!! }[ExtensionTable.iconUrl]

-    val saveDir = "${applicationDirs.extensionsRoot}/icon"
+        val saveDir = "${ApplicationDirs.extensionsRoot}/icon"

        return getCachedImageResponse(saveDir, apkName) {
            network.client.newCall(
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/ExtensionsList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/ExtensionsList.kt
@@ -25,11 +25,9 @@ import java.util.concurrent.ConcurrentHashMap
 object ExtensionsList {
    private val logger = KotlinLogging.logger {}

-
    var lastUpdateCheck: Long = 0
    var updateMap = ConcurrentHashMap<String, Extension.Available>()

-
 // const val ExtensionUpdateDelayTime = 60 * 1000 // 60,000 milliseconds = 60 seconds
    const val ExtensionUpdateDelayTime = 0

--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt
@@ -15,7 +15,7 @@ import ir.armor.tachidesk.impl.Source.getSource
 import ir.armor.tachidesk.model.database.MangaStatus
 import ir.armor.tachidesk.model.database.MangaTable
 import ir.armor.tachidesk.model.dataclass.MangaDataClass
-import ir.armor.tachidesk.server.applicationDirs
+import ir.armor.tachidesk.server.ApplicationDirs
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
@@ -94,7 +94,7 @@ fun getManga(mangaId: Int, proxyThumbnail: Boolean = true): MangaDataClass {

    fun getMangaThumbnail(mangaId: Int): Pair<InputStream, String> {
        val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
-    val saveDir = applicationDirs.thumbnailsRoot
+        val saveDir = ApplicationDirs.thumbnailsRoot
        val fileName = mangaId.toString()

        return getCachedImageResponse(saveDir, fileName) {
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt
@@ -14,7 +14,7 @@ import ir.armor.tachidesk.model.database.ChapterTable
 import ir.armor.tachidesk.model.database.MangaTable
 import ir.armor.tachidesk.model.database.PageTable
 import ir.armor.tachidesk.model.database.SourceTable
-import ir.armor.tachidesk.server.applicationDirs
+import ir.armor.tachidesk.server.ApplicationDirs
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -85,7 +85,7 @@ fun getChapterDir(mangaId: Int, chapterId: Int): String {
        val mangaTitle = mangaEntry[MangaTable.title]
        val sourceName = source.toString()

-    val mangaDir = "${applicationDirs.mangaRoot}/$sourceName/$mangaTitle/$chapterDir"
+        val mangaDir = "${ApplicationDirs.mangaRoot}/$sourceName/$mangaTitle/$chapterDir"
        // make sure dirs exist
        File(mangaDir).mkdirs()
        return mangaDir
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Source.kt
@@ -14,7 +14,7 @@ import ir.armor.tachidesk.impl.Extension.loadExtensionInstance
 import ir.armor.tachidesk.model.database.ExtensionTable
 import ir.armor.tachidesk.model.database.SourceTable
 import ir.armor.tachidesk.model.dataclass.SourceDataClass
-import ir.armor.tachidesk.server.applicationDirs
+import ir.armor.tachidesk.server.ApplicationDirs
 import mu.KotlinLogging
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
@@ -41,7 +41,7 @@ fun getHttpSource(sourceId: Long): HttpSource {
            val apkName = extensionRecord[ExtensionTable.apkName]
            val className = extensionRecord[ExtensionTable.classFQName]
            val jarName = apkName.substringBefore(".apk") + ".jar"
-        val jarPath = "${applicationDirs.extensionsRoot}/$jarName"
+            val jarPath = "${ApplicationDirs.extensionsRoot}/$jarName"

            val extensionInstance = loadExtensionInstance(jarPath, className)

--- a/server/src/main/kotlin/ir/armor/tachidesk/model/dataclass/DBMangaer.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/model/dataclass/DBMangaer.kt
@@ -14,14 +14,14 @@ import ir.armor.tachidesk.model.database.ExtensionTable
 import ir.armor.tachidesk.model.database.MangaTable
 import ir.armor.tachidesk.model.database.PageTable
 import ir.armor.tachidesk.model.database.SourceTable
-import ir.armor.tachidesk.server.applicationDirs
+import ir.armor.tachidesk.server.ApplicationDirs
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.SchemaUtils
 import org.jetbrains.exposed.sql.transactions.transaction

 object DBMangaer {
    val db by lazy {
-        Database.connect("jdbc:h2:${applicationDirs.dataRoot}/database", "org.h2.Driver")
+        Database.connect("jdbc:h2:${ApplicationDirs.dataRoot}/database", "org.h2.Driver")
    }
 }

--- a/server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt
@@ -41,6 +41,7 @@ import java.io.IOException
 * 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/. */

+object JavalinSetup {
    private val logger = KotlinLogging.logger {}

    fun javalinSetup() {
@@ -286,3 +287,4 @@ fun javalinSetup() {
            ctx.json(getCategoryMangaList(categoryId))
        }
    }
+}
--- a/server/src/main/kotlin/ir/armor/tachidesk/server/ServerSetup.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/server/ServerSetup.kt
@@ -24,7 +24,7 @@ import java.io.File

 private val logger = KotlinLogging.logger {}

-object applicationDirs {
+object ApplicationDirs {
    val dataRoot = AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)!!
    val extensionsRoot = "$dataRoot/extensions"
    val thumbnailsRoot = "$dataRoot/thumbnails"
@@ -50,17 +50,17 @@ fun applicationSetup() {

    // make dirs we need
    listOf(
-        applicationDirs.dataRoot,
-        applicationDirs.extensionsRoot,
-        "${applicationDirs.extensionsRoot}/icon",
-        applicationDirs.thumbnailsRoot
+        ApplicationDirs.dataRoot,
+        ApplicationDirs.extensionsRoot,
+        "${ApplicationDirs.extensionsRoot}/icon",
+        ApplicationDirs.thumbnailsRoot
    ).forEach {
        File(it).mkdirs()
    }

    // create conf file if doesn't exist
    try {
-        val dataConfFile = File("${applicationDirs.dataRoot}/server.conf")
+        val dataConfFile = File("${ApplicationDirs.dataRoot}/server.conf")
        if (!dataConfFile.exists()) {
            Main::class.java.getResourceAsStream("/server-reference.conf").use { input ->
                dataConfFile.outputStream().use { output ->
--- a/server/src/main/kotlin/ir/armor/tachidesk/server/util/SystemTray.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/server/util/SystemTray.kt
@@ -20,8 +20,8 @@ import java.io.IOException
 fun openInBrowser() {
    try {
        Desktop.browseURL("http://127.0.0.1:4567")
-    } catch (e1: IOException) {
-        e1.printStackTrace()
+    } catch (e: Exception) {
+        e.printStackTrace()
    }
 }