refactor & support for extension update: Backend

2021-03-29 00:35:21 +04:30
parent b1b1abad1d
commit 077bbc3c38
34 changed files with 244 additions and 252 deletions
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Category.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Category.kt
@@ -7,10 +7,10 @@ package ir.armor.tachidesk.impl
 * 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.database.dataclass.CategoryDataClass
-import ir.armor.tachidesk.database.table.CategoryMangaTable
-import ir.armor.tachidesk.database.table.CategoryTable
-import ir.armor.tachidesk.database.table.toDataClass
+import ir.armor.tachidesk.model.database.CategoryMangaTable
+import ir.armor.tachidesk.model.database.CategoryTable
+import ir.armor.tachidesk.model.database.toDataClass
+import ir.armor.tachidesk.model.dataclass.CategoryDataClass
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.insert
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/CategoryManga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/CategoryManga.kt
@@ -7,12 +7,12 @@ package ir.armor.tachidesk.impl
 * 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.database.dataclass.CategoryDataClass
-import ir.armor.tachidesk.database.dataclass.MangaDataClass
-import ir.armor.tachidesk.database.table.CategoryMangaTable
-import ir.armor.tachidesk.database.table.CategoryTable
-import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.toDataClass
+import ir.armor.tachidesk.model.database.CategoryMangaTable
+import ir.armor.tachidesk.model.database.CategoryTable
+import ir.armor.tachidesk.model.database.MangaTable
+import ir.armor.tachidesk.model.database.toDataClass
+import ir.armor.tachidesk.model.dataclass.CategoryDataClass
+import ir.armor.tachidesk.model.dataclass.MangaDataClass
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.deleteWhere
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt
@@ -9,10 +9,10 @@ package ir.armor.tachidesk.impl

 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import ir.armor.tachidesk.database.dataclass.ChapterDataClass
-import ir.armor.tachidesk.database.table.ChapterTable
-import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.PageTable
+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.dataclass.ChapterDataClass
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.insertAndGetId
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt
@@ -15,9 +15,9 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.database.table.ExtensionTable
-import ir.armor.tachidesk.database.table.SourceTable
 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.server.applicationDirs
 import kotlinx.coroutines.runBlocking
 import mu.KotlinLogging
@@ -71,10 +71,10 @@ private fun dex2jar(dexFile: String, jarFile: String, fileNameWithoutType: Strin
    }
 }

-fun installAPK(apkName: String): Int {
-    logger.debug("Installing $apkName")
-    val extensionRecord = getExtensionList(true).first { it.apkName == apkName }
-    val fileNameWithoutType = apkName.substringBefore(".apk")
+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"

    // check if we don't have the dex file already downloaded
@@ -145,7 +145,7 @@ fun installAPK(apkName: String): Int {
            // update extension info
            transaction {
                ExtensionTable.update({ ExtensionTable.name eq extensionRecord.name }) {
-                    it[installed] = true
+                    it[isInstalled] = true
                    it[classFQName] = className
                }
            }
@@ -168,18 +168,18 @@ private fun downloadAPKFile(url: String, apkPath: String) {
    sink.close()
 }

-fun removeExtension(apkName: String) {
-    logger.debug("Uninstalling $apkName")
+fun removeExtension(pkgName: String) {
+    logger.debug("Uninstalling $pkgName")

-    val extensionRecord = getExtensionList(true).first { it.apkName == apkName }
-    val fileNameWithoutType = apkName.substringBefore(".apk")
+    val extensionRecord = extensionTableAsDataClass().first { it.pkgName == pkgName }
+    val fileNameWithoutType = extensionRecord.apkName.substringBefore(".apk")
    val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
    transaction {
        val extensionId = ExtensionTable.select { ExtensionTable.name eq extensionRecord.name }.first()[ExtensionTable.id]

        SourceTable.deleteWhere { SourceTable.extension eq extensionId }
        ExtensionTable.update({ ExtensionTable.name eq extensionRecord.name }) {
-            it[ExtensionTable.installed] = false
+            it[isInstalled] = false
        }
    }

@@ -188,6 +188,24 @@ fun removeExtension(apkName: String) {
    }
 }

+fun updateExtension(pkgName: String): Int {
+    val targetExtension = ExtensionListData.updateMap.remove(pkgName)!!
+    removeExtension(pkgName)
+    transaction {
+        ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
+            it[name] = targetExtension.name
+            it[versionName] = targetExtension.versionName
+            it[versionCode] = targetExtension.versionCode
+            it[lang] = targetExtension.lang
+            it[isNsfw] = targetExtension.isNsfw
+            it[apkName] = targetExtension.apkName
+            it[iconUrl] = targetExtension.iconUrl
+            it[hasUpdate] = false
+        }
+    }
+    return installExtension(pkgName)
+}
+
 val network: NetworkHelper by injectLazy()

 fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/ExtensionsList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/ExtensionsList.kt
@@ -9,86 +9,122 @@ package ir.armor.tachidesk.impl

 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.extension.model.Extension
-import ir.armor.tachidesk.database.dataclass.ExtensionDataClass
-import ir.armor.tachidesk.database.table.ExtensionTable
+import ir.armor.tachidesk.model.database.ExtensionTable
+import ir.armor.tachidesk.model.dataclass.ExtensionDataClass
 import kotlinx.coroutines.runBlocking
 import mu.KotlinLogging
+import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import java.util.concurrent.ConcurrentHashMap

 private val logger = KotlinLogging.logger {}

-private object Data {
-    var lastExtensionCheck: Long = 0
+object ExtensionListData {
+    var lastUpdateCheck: Long = 0
+    var updateMap = ConcurrentHashMap<String, Extension.Available>()
 }

-private fun extensionDatabaseIsEmtpy(): Boolean {
-    return transaction {
-        return@transaction ExtensionTable.selectAll().count() == 0L
-    }
-}
-
-fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
+fun getExtensionList(): List<ExtensionDataClass> {
    // update if 60 seconds has passed or requested offline and database is empty
-    if (Data.lastExtensionCheck + 60 * 1000 < System.currentTimeMillis() || (offline && extensionDatabaseIsEmtpy())) {
+    if (ExtensionListData.lastUpdateCheck + 60 * 1000 < System.currentTimeMillis()) {
        logger.debug("Getting extensions list from the internet")
-        Data.lastExtensionCheck = System.currentTimeMillis()
-        var foundExtensions: List<Extension.Available>
+        ExtensionListData.lastUpdateCheck = System.currentTimeMillis()
        runBlocking {
-            val api = ExtensionGithubApi()
-            foundExtensions = api.findExtensions()
-            transaction {
-                foundExtensions.forEach { foundExtension ->
-                    val extensionRecord = ExtensionTable.select { ExtensionTable.name eq foundExtension.name }.firstOrNull()
-                    if (extensionRecord != null) {
-                        // update the record
-                        ExtensionTable.update({ ExtensionTable.name eq foundExtension.name }) {
-                            it[name] = foundExtension.name
-                            it[pkgName] = foundExtension.pkgName
-                            it[versionName] = foundExtension.versionName
-                            it[versionCode] = foundExtension.versionCode
-                            it[lang] = foundExtension.lang
-                            it[isNsfw] = foundExtension.isNsfw
-                            it[apkName] = foundExtension.apkName
-                            it[iconUrl] = foundExtension.iconUrl
-                        }
-                    } else {
-                        // insert new record
-                        ExtensionTable.insert {
-                            it[name] = foundExtension.name
-                            it[pkgName] = foundExtension.pkgName
-                            it[versionName] = foundExtension.versionName
-                            it[versionCode] = foundExtension.versionCode
-                            it[lang] = foundExtension.lang
-                            it[isNsfw] = foundExtension.isNsfw
-                            it[apkName] = foundExtension.apkName
-                            it[iconUrl] = foundExtension.iconUrl
-                        }
-                    }
-                }
-            }
+            val foundExtensions = ExtensionGithubApi().findExtensions()
+            updateExtensionDatabase(foundExtensions)
        }
    } else {
        logger.debug("used cached extension list")
    }

-    return transaction {
-        return@transaction ExtensionTable.selectAll().map {
-            ExtensionDataClass(
-                it[ExtensionTable.name],
-                it[ExtensionTable.pkgName],
-                it[ExtensionTable.versionName],
-                it[ExtensionTable.versionCode],
-                it[ExtensionTable.lang],
-                it[ExtensionTable.isNsfw],
-                it[ExtensionTable.apkName],
-                getExtensionIconUrl(it[ExtensionTable.apkName]),
-                it[ExtensionTable.installed],
-                it[ExtensionTable.classFQName]
-            )
+    return extensionTableAsDataClass()
+}
+
+fun extensionTableAsDataClass() = transaction {
+    return@transaction ExtensionTable.selectAll().map {
+        ExtensionDataClass(
+            it[ExtensionTable.name],
+            it[ExtensionTable.pkgName],
+            it[ExtensionTable.versionName],
+            it[ExtensionTable.versionCode],
+            it[ExtensionTable.lang],
+            it[ExtensionTable.isNsfw],
+            it[ExtensionTable.apkName],
+            getExtensionIconUrl(it[ExtensionTable.apkName]),
+            it[ExtensionTable.isInstalled],
+            it[ExtensionTable.hasUpdate],
+            it[ExtensionTable.isObsolete],
+        )
+    }
+}
+
+private fun updateExtensionDatabase(foundExtensions: List<Extension.Available>) {
+    transaction {
+        foundExtensions.forEach { foundExtension ->
+            val extensionRecord = ExtensionTable.select { ExtensionTable.pkgName eq foundExtension.pkgName }.firstOrNull()
+            if (extensionRecord != null) {
+                if (extensionRecord[ExtensionTable.isInstalled]) {
+                    if (foundExtension.versionCode > extensionRecord[ExtensionTable.versionCode]) {
+                        // there is an update
+                        ExtensionTable.update({ ExtensionTable.pkgName eq foundExtension.pkgName }) {
+                            it[hasUpdate] = true
+                        }
+                        ExtensionListData.updateMap.putIfAbsent(foundExtension.pkgName, foundExtension)
+                    } else if (foundExtension.versionCode < extensionRecord[ExtensionTable.versionCode]) {
+                        // some how the user installed an invalid version
+                        ExtensionTable.update({ ExtensionTable.pkgName eq foundExtension.pkgName }) {
+                            it[isObsolete] = true
+                        }
+                    } else {
+                        // the two are equal
+                        // NOOP
+                    }
+                } else {
+                    // extension is not installed so we can overwrite the data without a care
+                    ExtensionTable.update({ ExtensionTable.pkgName eq foundExtension.pkgName }) {
+                        it[name] = foundExtension.name
+                        it[versionName] = foundExtension.versionName
+                        it[versionCode] = foundExtension.versionCode
+                        it[lang] = foundExtension.lang
+                        it[isNsfw] = foundExtension.isNsfw
+                        it[apkName] = foundExtension.apkName
+                        it[iconUrl] = foundExtension.iconUrl
+                    }
+                }
+            } else {
+                // insert new record
+                ExtensionTable.insert {
+                    it[name] = foundExtension.name
+                    it[pkgName] = foundExtension.pkgName
+                    it[versionName] = foundExtension.versionName
+                    it[versionCode] = foundExtension.versionCode
+                    it[lang] = foundExtension.lang
+                    it[isNsfw] = foundExtension.isNsfw
+                    it[apkName] = foundExtension.apkName
+                    it[iconUrl] = foundExtension.iconUrl
+                }
+            }
+        }
+
+        // deal with obsolete extensions
+        ExtensionTable.selectAll().forEach { extensionRecord ->
+            val foundExtension = foundExtensions.find { it.pkgName == extensionRecord[ExtensionTable.pkgName] }
+            if (foundExtension == null) {
+                // this extensions is obsolete
+                if (extensionRecord[ExtensionTable.isInstalled]) {
+                    // is installed so we should mark it as obsolete
+                    ExtensionTable.update({ ExtensionTable.pkgName eq extensionRecord[ExtensionTable.pkgName] }) {
+                        it[isObsolete] = true
+                    }
+                } else {
+                    // is not installed so we can remove the record without a care
+                    ExtensionTable.deleteWhere { ExtensionTable.pkgName eq extensionRecord[ExtensionTable.pkgName] }
+                }
+            }
        }
    }
 }
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Library.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Library.kt
@@ -7,10 +7,10 @@ package ir.armor.tachidesk.impl
 * 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.database.dataclass.MangaDataClass
-import ir.armor.tachidesk.database.table.CategoryMangaTable
-import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.toDataClass
+import ir.armor.tachidesk.model.database.CategoryMangaTable
+import ir.armor.tachidesk.model.database.MangaTable
+import ir.armor.tachidesk.model.database.toDataClass
+import ir.armor.tachidesk.model.dataclass.MangaDataClass
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.select
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt
@@ -9,9 +9,9 @@ package ir.armor.tachidesk.impl

 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.SManga
-import ir.armor.tachidesk.database.dataclass.MangaDataClass
-import ir.armor.tachidesk.database.table.MangaStatus
-import ir.armor.tachidesk.database.table.MangaTable
+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 org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/MangaList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/MangaList.kt
@@ -8,10 +8,10 @@ package ir.armor.tachidesk.impl
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

 import eu.kanade.tachiyomi.source.model.MangasPage
-import ir.armor.tachidesk.database.dataclass.MangaDataClass
-import ir.armor.tachidesk.database.dataclass.PagedMangaListDataClass
-import ir.armor.tachidesk.database.table.MangaStatus
-import ir.armor.tachidesk.database.table.MangaTable
+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.model.dataclass.PagedMangaListDataClass
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt
@@ -9,10 +9,10 @@ package ir.armor.tachidesk.impl

 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.database.table.ChapterTable
-import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.PageTable
-import ir.armor.tachidesk.database.table.SourceTable
+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 org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Search.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Search.kt
@@ -7,7 +7,7 @@ package ir.armor.tachidesk.impl
 * 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.database.dataclass.PagedMangaListDataClass
+import ir.armor.tachidesk.model.dataclass.PagedMangaListDataClass

 fun sourceFilters(sourceId: Long) {
    val source = getHttpSource(sourceId)
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/SourceList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/SourceList.kt
@@ -9,17 +9,14 @@ package ir.armor.tachidesk.impl

 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.database.dataclass.SourceDataClass
-import ir.armor.tachidesk.database.entity.ExtensionEntity
-import ir.armor.tachidesk.database.entity.SourceEntity
-import ir.armor.tachidesk.database.table.ExtensionTable
-import ir.armor.tachidesk.database.table.SourceTable
+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 mu.KotlinLogging
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import java.lang.NullPointerException
 import java.net.URL
 import java.net.URLClassLoader

@@ -30,8 +27,8 @@ private val extensionCache = mutableListOf<Pair<String, Any>>()

 fun getHttpSource(sourceId: Long): HttpSource {
    val sourceRecord = transaction {
-        SourceEntity.findById(sourceId)
-    } ?: throw NullPointerException("Source with id $sourceId is not installed")
+        SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()!!
+    }

    val cachedResult: Pair<Long, HttpSource>? = sourceCache.firstOrNull { it.first == sourceId }
    if (cachedResult != null) {
@@ -40,10 +37,10 @@ fun getHttpSource(sourceId: Long): HttpSource {
    }

    val result: HttpSource = transaction {
-        val extensionId = sourceRecord.extension.id.value
-        val extensionRecord = ExtensionEntity.findById(extensionId)!!
-        val apkName = extensionRecord.apkName
-        val className = extensionRecord.classFQName
+        val extensionId = sourceRecord[SourceTable.extension]
+        val extensionRecord = ExtensionTable.select { ExtensionTable.id eq extensionId }.firstOrNull()!!
+        val apkName = extensionRecord[ExtensionTable.apkName]
+        val className = extensionRecord[ExtensionTable.classFQName]
        val jarName = apkName.substringBefore(".apk") + ".jar"
        val jarPath = "${applicationDirs.extensionsRoot}/$jarName"

@@ -60,13 +57,15 @@ fun getHttpSource(sourceId: Long): HttpSource {
                val classToLoad = Class.forName(className, true, child)
                classToLoad.newInstance()
            }
-        if (sourceRecord.partOfFactorySource) {
+        if (sourceRecord[SourceTable.partOfFactorySource]) {
+            val positionInFactorySource = sourceRecord[SourceTable.positionInFactorySource]!!
            return@transaction if (usedCached) {
-                (instance as List<HttpSource>)[sourceRecord.positionInFactorySource!!]
+                @Suppress("UNCHECKED_CAST")
+                (instance as List<HttpSource>)[positionInFactorySource]
            } else {
                val list = (instance as SourceFactory).createSources()
                extensionCache.add(Pair(jarPath, list))
-                list[sourceRecord.positionInFactorySource!!] as HttpSource
+                list[positionInFactorySource] as HttpSource
            }
        } else {
            if (!usedCached)