Switch to a new Ktlint Formatter (#705)

* Switch to new Ktlint plugin * Add ktlintCheck to PR builds * Run formatter * Put ktlint version in libs toml * Fix lint * Use Zip4Java from libs.toml
2026-07-16 17:24:07 -05:00 · 2023-10-06 23:38:39 -04:00
parent 3cd3cb0186
commit 849acfca3d
277 changed files with 6709 additions and 5090 deletions
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt
@@ -71,7 +71,10 @@ object Extension {
        }
    }

-    suspend fun installExternalExtension(inputStream: InputStream, apkName: String): Int {
+    suspend fun installExternalExtension(
+        inputStream: InputStream,
+        apkName: String,
+    ): Int {
        return installAPK(true) {
            val savePath = "${applicationDirs.extensionsRoot}/$apkName"
            logger.debug { "Saving apk at $apkName" }
@@ -87,15 +90,19 @@ object Extension {
        }
    }

-    suspend fun installAPK(forceReinstall: Boolean = false, fetcher: suspend () -> String): Int {
+    suspend fun installAPK(
+        forceReinstall: Boolean = false,
+        fetcher: suspend () -> String,
+    ): Int {
        val apkFilePath = fetcher()
        val apkName = File(apkFilePath).name

        // check if we don't have the extension already installed
        // if it's installed and we want to update, it first has to be uninstalled
-        val isInstalled = transaction {
-            ExtensionTable.select { ExtensionTable.apkName eq apkName }.firstOrNull()
-        }?.get(ExtensionTable.isInstalled) ?: false
+        val isInstalled =
+            transaction {
+                ExtensionTable.select { ExtensionTable.apkName eq apkName }.firstOrNull()
+            }?.get(ExtensionTable.isInstalled) ?: false

        val fileNameWithoutType = apkName.substringBefore(".apk")

@@ -119,7 +126,7 @@ object Extension {
            if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
                throw Exception(
                    "Lib version is $libVersion, while only versions " +
-                        "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed"
+                        "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed",
                )
            }

@@ -148,18 +155,20 @@ object Extension {

            // collect sources from the extension
            val extensionMainClassInstance = loadExtensionSources(jarFilePath, className)
-            val sources: List<CatalogueSource> = when (extensionMainClassInstance) {
-                is Source -> listOf(extensionMainClassInstance)
-                is SourceFactory -> extensionMainClassInstance.createSources()
-                else -> throw RuntimeException("Unknown source class type! ${extensionMainClassInstance.javaClass}")
-            }.map { it as CatalogueSource }
+            val sources: List<CatalogueSource> =
+                when (extensionMainClassInstance) {
+                    is Source -> listOf(extensionMainClassInstance)
+                    is SourceFactory -> extensionMainClassInstance.createSources()
+                    else -> throw RuntimeException("Unknown source class type! ${extensionMainClassInstance.javaClass}")
+                }.map { it as CatalogueSource }

            val langs = sources.map { it.lang }.toSet()
-            val extensionLang = when (langs.size) {
-                0 -> ""
-                1 -> langs.first()
-                else -> "all"
-            }
+            val extensionLang =
+                when (langs.size) {
+                    0 -> ""
+                    1 -> langs.first()
+                    else -> "all"
+                }

            val extensionName = packageInfo.applicationInfo.nonLocalizedLabel.toString().substringAfter("Tachiyomi: ")

@@ -205,7 +214,10 @@ object Extension {
        }
    }

-    private fun extractAssetsFromApk(apkPath: String, jarPath: String) {
+    private fun extractAssetsFromApk(
+        apkPath: String,
+        jarPath: String,
+    ) {
        val apkFile = File(apkPath)
        val jarFile = File(jarPath)

@@ -256,7 +268,10 @@ object Extension {

    private val network: NetworkHelper by injectLazy()

-    private suspend fun downloadAPKFile(url: String, savePath: String) {
+    private suspend fun downloadAPKFile(
+        url: String,
+        savePath: String,
+    ) {
        val request = Request.Builder().url(url).build()
        val response = network.client.newCall(request).await()

@@ -275,23 +290,24 @@ object Extension {
        val extensionRecord = transaction { ExtensionTable.select { ExtensionTable.pkgName eq pkgName }.first() }
        val fileNameWithoutType = extensionRecord[ExtensionTable.apkName].substringBefore(".apk")
        val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
-        val sources = transaction {
-            val extensionId = extensionRecord[ExtensionTable.id].value
+        val sources =
+            transaction {
+                val extensionId = extensionRecord[ExtensionTable.id].value

-            val sources = SourceTable.select { SourceTable.extension eq extensionId }.map { it[SourceTable.id].value }
+                val sources = SourceTable.select { SourceTable.extension eq extensionId }.map { it[SourceTable.id].value }

-            SourceTable.deleteWhere { SourceTable.extension eq extensionId }
+                SourceTable.deleteWhere { SourceTable.extension eq extensionId }

-            if (extensionRecord[ExtensionTable.isObsolete]) {
-                ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName }
-            } else {
-                ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
-                    it[isInstalled] = false
+                if (extensionRecord[ExtensionTable.isObsolete]) {
+                    ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName }
+                } else {
+                    ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
+                        it[isInstalled] = false
+                    }
                }
-            }

-            sources
-        }
+                sources
+            }

        if (File(jarPath).exists()) {
            // free up the file descriptor if exists
@@ -323,17 +339,18 @@ object Extension {
    }

    suspend fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
-        val iconUrl = if (apkName == "localSource") {
-            ""
-        } else {
-            transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl]
-        }
+        val iconUrl =
+            if (apkName == "localSource") {
+                ""
+            } else {
+                transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl]
+            }

        val cacheSaveDir = "${applicationDirs.extensionsRoot}/icon"

        return getImageResponse(cacheSaveDir, apkName) {
            network.client.newCall(
-                GET(iconUrl)
+                GET(iconUrl),
            ).await()
        }
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt
@@ -48,23 +48,24 @@ object ExtensionsList {
        return extensionTableAsDataClass()
    }

-    fun extensionTableAsDataClass() = transaction {
-        ExtensionTable.selectAll().filter { it[ExtensionTable.name] != LocalSource.EXTENSION_NAME }.map {
-            ExtensionDataClass(
-                it[ExtensionTable.apkName],
-                getExtensionIconUrl(it[ExtensionTable.apkName]),
-                it[ExtensionTable.name],
-                it[ExtensionTable.pkgName],
-                it[ExtensionTable.versionName],
-                it[ExtensionTable.versionCode],
-                it[ExtensionTable.lang],
-                it[ExtensionTable.isNsfw],
-                it[ExtensionTable.isInstalled],
-                it[ExtensionTable.hasUpdate],
-                it[ExtensionTable.isObsolete]
-            )
+    fun extensionTableAsDataClass() =
+        transaction {
+            ExtensionTable.selectAll().filter { it[ExtensionTable.name] != LocalSource.EXTENSION_NAME }.map {
+                ExtensionDataClass(
+                    it[ExtensionTable.apkName],
+                    getExtensionIconUrl(it[ExtensionTable.apkName]),
+                    it[ExtensionTable.name],
+                    it[ExtensionTable.pkgName],
+                    it[ExtensionTable.versionName],
+                    it[ExtensionTable.versionCode],
+                    it[ExtensionTable.lang],
+                    it[ExtensionTable.isNsfw],
+                    it[ExtensionTable.isInstalled],
+                    it[ExtensionTable.hasUpdate],
+                    it[ExtensionTable.isObsolete],
+                )
+            }
        }
-    }

    private fun updateExtensionDatabase(foundExtensions: List<OnlineExtension>) {
        transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt
@@ -36,7 +36,7 @@ object ExtensionGithubApi {
        val nsfw: Int,
        val hasReadme: Int = 0,
        val hasChangelog: Int = 0,
-        val sources: List<ExtensionSourceJsonObject>?
+        val sources: List<ExtensionSourceJsonObject>?,
    )

    @Serializable
@@ -44,27 +44,29 @@ object ExtensionGithubApi {
        val name: String,
        val lang: String,
        val id: Long,
-        val baseUrl: String
+        val baseUrl: String,
    )

    private var requiresFallbackSource = false

    suspend fun findExtensions(): List<OnlineExtension> {
-        val githubResponse = if (requiresFallbackSource) {
-            null
-        } else {
-            try {
-                client.newCall(GET("${REPO_URL_PREFIX}index.min.json")).awaitSuccess()
-            } catch (e: Throwable) {
-                logger.error(e) { "Failed to get extensions from GitHub" }
-                requiresFallbackSource = true
+        val githubResponse =
+            if (requiresFallbackSource) {
                null
+            } else {
+                try {
+                    client.newCall(GET("${REPO_URL_PREFIX}index.min.json")).awaitSuccess()
+                } catch (e: Throwable) {
+                    logger.error(e) { "Failed to get extensions from GitHub" }
+                    requiresFallbackSource = true
+                    null
+                }
            }
-        }

-        val response = githubResponse ?: run {
-            client.newCall(GET("${FALLBACK_REPO_URL_PREFIX}index.min.json")).awaitSuccess()
-        }
+        val response =
+            githubResponse ?: run {
+                client.newCall(GET("${FALLBACK_REPO_URL_PREFIX}index.min.json")).awaitSuccess()
+            }

        return with(json) {
            response
@@ -107,7 +109,7 @@ object ExtensionGithubApi {
                    hasChangelog = it.hasChangelog == 1,
                    sources = it.sources?.toExtensionSources() ?: emptyList(),
                    apkName = it.apk,
-                    iconUrl = "${REPO_URL_PREFIX}icon/${it.apk.replace(".apk", ".png")}"
+                    iconUrl = "${REPO_URL_PREFIX}icon/${it.apk.replace(".apk", ".png")}",
                )
            }
    }
@@ -118,7 +120,7 @@ object ExtensionGithubApi {
                name = it.name,
                lang = it.lang,
                id = it.id,
-                baseUrl = it.baseUrl
+                baseUrl = it.baseUrl,
            )
        }
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/OnlineExtension.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/OnlineExtension.kt
@@ -11,7 +11,7 @@ data class OnlineExtensionSource(
    val name: String,
    val lang: String,
    val id: Long,
-    val baseUrl: String
+    val baseUrl: String,
 )

 data class OnlineExtension(
@@ -25,5 +25,5 @@ data class OnlineExtension(
    val hasReadme: Boolean,
    val hasChangelog: Boolean,
    val sources: List<OnlineExtensionSource>,
-    val iconUrl: String
+    val iconUrl: String,
 )