Dataclass cleanup and minor fixes (#2115)

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt

@@ -21,7 +21,7 @@ object CefHelper {
     }
 
     fun waitForInit() =
-        callbackFlow<CefApp> {
+        callbackFlow {
             val app = cefApp.first { it.isFailure || it.getOrThrow() != null }.getOrThrow()!!
             app.onInitialization {
                 logger.debug { "CEF: Initialization state $it" }

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt

@@ -15,16 +15,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import org.jetbrains.exposed.v1.core.SortOrder
 import suwayomi.tachidesk.graphql.types.AuthMode

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt

@@ -377,7 +377,7 @@ object SyncYomiSyncService {
                         // Use version number to decide which chapter to keep
                         val chosenChapter =
                             if (localChapter.version >= remoteChapter.version) {
-                                // If there mare more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
+                                // If there are more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
                                 if (localChapters.size < remoteChapters.size) {
                                     localChapter.copy(sourceOrder = remoteChapter.sourceOrder)
                                 } else {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt

@@ -117,12 +117,14 @@ object CategoryManga {
 
         val transform: (ResultRow) -> MangaDataClass = {
             // Map the data from the result row to the MangaDataClass
-            val dataClass = MangaTable.toDataClass(it)
+            MangaTable
-            dataClass.lastReadAt = it[lastReadAt]
+                .toDataClass(it)
-            dataClass.unreadCount = it[unreadCount]
+                .copy(
-            dataClass.downloadCount = it[downloadedCount]
+                    lastReadAt = it[lastReadAt],
-            dataClass.chapterCount = it[chapterCount]
+                    unreadCount = it[unreadCount],
-            dataClass
+                    downloadCount = it[downloadedCount],
+                    chapterCount = it[chapterCount],
+                )
         }
 
         return transaction {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt

@@ -104,9 +104,6 @@ object Chapter {
                     .associateBy({ it[ChapterTable.url] }, { it })
             }
 
-        val chapterIds = chapterList.map { dbChapterMap.getValue(it.url)[ChapterTable.id] }
-        val chapterMetas = getChaptersMetaMaps(chapterIds.map { it.value })
-
         return chapterList.mapIndexed { index, it ->
 
             val dbChapter = dbChapterMap.getValue(it.url)
@@ -128,10 +125,8 @@ object Chapter {
                 realUrl = dbChapter[ChapterTable.realUrl],
                 downloaded = dbChapter[ChapterTable.isDownloaded],
                 pageCount = dbChapter[ChapterTable.pageCount],
-                chapterCount = chapterList.size,
                 lastModifiedAt = dbChapter[ChapterTable.lastModifiedAt],
                 version = dbChapter[ChapterTable.version],
-                meta = chapterMetas.getValue(dbChapter[ChapterTable.id].value),
             )
         }
     }
@@ -618,7 +613,7 @@ object Chapter {
                 .withDefault { emptyMap() }
         }
 
-    fun getChapterMetaMap(chapter: EntityID<Int>): Map<String, String> =
+    fun getChapterMetaMap(chapter: Int): Map<String, String> =
         transaction {
             ChapterMetaTable
                 .selectAll()

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt

@@ -92,7 +92,6 @@ object Manga {
                 inLibrary = mangaEntry[MangaTable.inLibrary],
                 inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
                 source = getSource(mangaEntry[MangaTable.sourceReference]),
-                meta = getMangaMetaMap(mangaId),
                 realUrl = mangaEntry[MangaTable.realUrl],
                 lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
                 chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
@@ -213,12 +212,12 @@ object Manga {
                     .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
                     .firstOrNull { it[ChapterTable.isRead] }
 
-            mangaDaaClass.unreadCount = unreadCount
+            mangaDaaClass.copy(
-            mangaDaaClass.downloadCount = downloadCount
+                unreadCount = unreadCount,
-            mangaDaaClass.chapterCount = chapterCount
+                downloadCount = downloadCount,
-            mangaDaaClass.lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) }
+                chapterCount = chapterCount,
-
+                lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) },
-            mangaDaaClass
+            )
         }
     }
 
@@ -241,7 +240,6 @@ object Manga {
         inLibrary = mangaEntry[MangaTable.inLibrary],
         inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
         source = getSource(mangaEntry[MangaTable.sourceReference]),
-        meta = getMangaMetaMap(mangaId),
         realUrl = mangaEntry[MangaTable.realUrl],
         lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
         chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/CategoryDataClass.kt

@@ -1,6 +1,7 @@
 package suwayomi.tachidesk.manga.model.dataclass
 
 import com.fasterxml.jackson.annotation.JsonValue
+import suwayomi.tachidesk.manga.impl.Category
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -18,7 +19,7 @@ enum class IncludeOrExclude(
     ;
 
     companion object {
-        fun fromValue(value: Int) = IncludeOrExclude.values().find { it.value == value } ?: UNSET
+        fun fromValue(value: Int) = entries.find { it.value == value } ?: UNSET
     }
 }
 
@@ -27,11 +28,19 @@ data class CategoryDataClass(
     val order: Int,
     val name: String,
     val default: Boolean,
-    val size: Int,
     val includeInUpdate: IncludeOrExclude,
     val includeInDownload: IncludeOrExclude,
     val version: Long,
     val uid: Long,
     val lastModifiedAt: Long,
-    val meta: Map<String, String> = emptyMap(),
+) {
-)
+    @Deprecated("Remove with V1 Api")
+    val size: Int by lazy {
+        Category.getCategorySize(id)
+    }
+
+    @Deprecated("Remove with V1 Api")
+    val meta: Map<String, String> by lazy {
+        Category.getCategoryMetaMap(id)
+    }
+}

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt

@@ -1,6 +1,11 @@
 package suwayomi.tachidesk.manga.model.dataclass
 
 import eu.kanade.tachiyomi.source.model.SChapter
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.manga.impl.Chapter.getChapterMetaMap
+import suwayomi.tachidesk.manga.model.table.ChapterTable
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -36,12 +41,8 @@ data class ChapterDataClass(
     val downloaded: Boolean,
     /** used to construct pages in the front-end */
     val pageCount: Int = -1,
-    /** total chapter count, used to calculate if there's a next and prev chapter */
-    val chapterCount: Int? = null,
     val lastModifiedAt: Long = 0,
     val version: Long = 0,
-    /** used to store client specific values */
-    val meta: Map<String, String> = emptyMap(),
 ) {
     companion object {
         fun fromSChapter(
@@ -70,4 +71,20 @@ data class ChapterDataClass(
                 downloaded = false,
             )
     }
+
+    @Deprecated("Remove with V1 Api")
+    val chapterCount: Int by lazy {
+        transaction {
+            ChapterTable
+                .selectAll()
+                .where { ChapterTable.manga eq mangaId }
+                .count()
+                .toInt()
+        }
+    }
+
+    @Deprecated("Remove with V1 Api")
+    val meta: Map<String, String> by lazy {
+        getChapterMetaMap(id)
+    }
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt

@@ -8,6 +8,7 @@ package suwayomi.tachidesk.manga.model.dataclass
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
+import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
 import suwayomi.tachidesk.manga.impl.util.lang.trimAll
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import java.time.Instant
@@ -28,18 +29,16 @@ data class MangaDataClass(
     val inLibrary: Boolean = false,
     val inLibraryAt: Long = 0,
     val source: SourceDataClass? = null,
-    /** meta data for clients */
-    val meta: Map<String, String> = emptyMap(),
     val realUrl: String? = null,
-    var lastFetchedAt: Long? = 0,
+    val lastFetchedAt: Long? = 0,
-    var chaptersLastFetchedAt: Long? = 0,
+    val chaptersLastFetchedAt: Long? = 0,
-    var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
+    val updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
     val freshData: Boolean = false,
-    var unreadCount: Long? = null,
+    val unreadCount: Long? = null,
-    var downloadCount: Long? = null,
+    val downloadCount: Long? = null,
-    var chapterCount: Long? = null,
+    val chapterCount: Long? = null,
-    var lastReadAt: Long? = null,
+    val lastReadAt: Long? = null,
-    var lastChapterRead: ChapterDataClass? = null,
+    val lastChapterRead: ChapterDataClass? = null,
     val age: Long? = if (lastFetchedAt == null) 0 else Instant.now().epochSecond.minus(lastFetchedAt),
     val chaptersAge: Long? = if (chaptersLastFetchedAt == null) null else Instant.now().epochSecond.minus(chaptersLastFetchedAt),
     val trackers: List<MangaTrackerDataClass>? = null,
@@ -47,6 +46,11 @@ data class MangaDataClass(
     val version: Long = 0,
 ) {
     override fun toString(): String = "\"$title\" (id= $id) (sourceId= $sourceId)"
+
+    @Deprecated("Remove with V1 Api")
+    val meta: Map<String, String> by lazy {
+        getMangaMetaMap(id)
+    }
 }
 
 data class PagedMangaListDataClass(

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt

@@ -9,7 +9,6 @@ package suwayomi.tachidesk.manga.model.table
 
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.dataclass.IncludeOrExclude
 
@@ -28,15 +27,13 @@ object CategoryTable : IntIdTable() {
 
 fun CategoryTable.toDataClass(categoryEntry: ResultRow) =
     CategoryDataClass(
-        categoryEntry[id].value,
+        id = categoryEntry[id].value,
-        categoryEntry[order],
+        order = categoryEntry[order],
-        categoryEntry[name],
+        name = categoryEntry[name],
-        categoryEntry[isDefault],
+        default = categoryEntry[isDefault],
-        Category.getCategorySize(categoryEntry[id].value),
+        includeInUpdate = IncludeOrExclude.fromValue(categoryEntry[includeInUpdate]),
-        IncludeOrExclude.fromValue(categoryEntry[includeInUpdate]),
+        includeInDownload = IncludeOrExclude.fromValue(categoryEntry[includeInDownload]),
-        IncludeOrExclude.fromValue(categoryEntry[includeInDownload]),
+        version = categoryEntry[version],
-        categoryEntry[version],
+        uid = categoryEntry[uid],
-        categoryEntry[uid],
+        lastModifiedAt = categoryEntry[lastModifiedAt],
-        categoryEntry[lastModifiedAt],
-        Category.getCategoryMetaMap(categoryEntry[id].value),
     )

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt

@@ -10,10 +10,6 @@ package suwayomi.tachidesk.manga.model.table
 import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.manga.impl.Chapter.getChapterMetaMap
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.table.columns.truncatingVarchar
 
@@ -48,45 +44,24 @@ object ChapterTable : IntIdTable() {
     val isSyncing = bool("is_syncing").default(false)
 }
 
-fun ChapterTable.toDataClass(
+fun ChapterTable.toDataClass(chapterEntry: ResultRow) =
-    chapterEntry: ResultRow,
+    ChapterDataClass(
-    includeChapterCount: Boolean = true,
+        id = chapterEntry[id].value,
-    includeChapterMeta: Boolean = true,
+        url = chapterEntry[url],
-) = ChapterDataClass(
+        name = chapterEntry[name],
-    id = chapterEntry[id].value,
+        uploadDate = chapterEntry[date_upload],
-    url = chapterEntry[url],
+        chapterNumber = chapterEntry[chapter_number],
-    name = chapterEntry[name],
+        scanlator = chapterEntry[scanlator],
-    uploadDate = chapterEntry[date_upload],
+        mangaId = chapterEntry[manga].value,
-    chapterNumber = chapterEntry[chapter_number],
+        read = chapterEntry[isRead],
-    scanlator = chapterEntry[scanlator],
+        bookmarked = chapterEntry[isBookmarked],
-    mangaId = chapterEntry[manga].value,
+        lastPageRead = chapterEntry[lastPageRead],
-    read = chapterEntry[isRead],
+        lastReadAt = chapterEntry[lastReadAt],
-    bookmarked = chapterEntry[isBookmarked],
+        index = chapterEntry[sourceOrder],
-    lastPageRead = chapterEntry[lastPageRead],
+        fetchedAt = chapterEntry[fetchedAt],
-    lastReadAt = chapterEntry[lastReadAt],
+        realUrl = chapterEntry[realUrl],
-    index = chapterEntry[sourceOrder],
+        downloaded = chapterEntry[isDownloaded],
-    fetchedAt = chapterEntry[fetchedAt],
+        pageCount = chapterEntry[pageCount],
-    realUrl = chapterEntry[realUrl],
+        lastModifiedAt = chapterEntry[lastModifiedAt],
-    downloaded = chapterEntry[isDownloaded],
+        version = chapterEntry[version],
-    pageCount = chapterEntry[pageCount],
+    )
-    chapterCount =
-        if (includeChapterCount) {
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { manga eq chapterEntry[manga].value }
-                    .count()
-                    .toInt()
-            }
-        } else {
-            null
-        },
-    meta =
-        if (includeChapterMeta) {
-            getChapterMetaMap(chapterEntry[id])
-        } else {
-            emptyMap()
-        },
-    lastModifiedAt = chapterEntry[lastModifiedAt],
-    version = chapterEntry[version],
-)

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt

@@ -11,11 +11,9 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import org.jetbrains.exposed.v1.core.ResultRow
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
 import suwayomi.tachidesk.manga.model.dataclass.toGenreList
-import suwayomi.tachidesk.manga.model.table.MangaStatus.Companion
 import suwayomi.tachidesk.manga.model.table.columns.truncatingVarchar
 import suwayomi.tachidesk.manga.model.table.columns.unlimitedVarchar
 
@@ -52,37 +50,29 @@ object MangaTable : IntIdTable() {
     val isSyncing = bool("is_syncing").default(false)
 }
 
-fun MangaTable.toDataClass(
+fun MangaTable.toDataClass(mangaEntry: ResultRow) =
-    mangaEntry: ResultRow,
+    MangaDataClass(
-    includeMangaMeta: Boolean = true,
+        id = mangaEntry[this.id].value,
-) = MangaDataClass(
+        sourceId = mangaEntry[sourceReference].toString(),
-    id = mangaEntry[this.id].value,
+        url = mangaEntry[url],
-    sourceId = mangaEntry[sourceReference].toString(),
+        title = mangaEntry[title],
-    url = mangaEntry[url],
+        thumbnailUrl = proxyThumbnailUrl(mangaEntry[this.id].value),
-    title = mangaEntry[title],
+        thumbnailUrlLastFetched = mangaEntry[thumbnailUrlLastFetched],
-    thumbnailUrl = proxyThumbnailUrl(mangaEntry[this.id].value),
+        initialized = mangaEntry[initialized],
-    thumbnailUrlLastFetched = mangaEntry[thumbnailUrlLastFetched],
+        artist = mangaEntry[artist],
-    initialized = mangaEntry[initialized],
+        author = mangaEntry[author],
-    artist = mangaEntry[artist],
+        description = mangaEntry[description],
-    author = mangaEntry[author],
+        genre = mangaEntry[genre].toGenreList(),
-    description = mangaEntry[description],
+        status = MangaStatus.valueOf(mangaEntry[status]).name,
-    genre = mangaEntry[genre].toGenreList(),
+        inLibrary = mangaEntry[inLibrary],
-    status = Companion.valueOf(mangaEntry[status]).name,
+        inLibraryAt = mangaEntry[inLibraryAt],
-    inLibrary = mangaEntry[inLibrary],
+        realUrl = mangaEntry[realUrl],
-    inLibraryAt = mangaEntry[inLibraryAt],
+        lastFetchedAt = mangaEntry[lastFetchedAt],
-    meta =
+        chaptersLastFetchedAt = mangaEntry[chaptersLastFetchedAt],
-        if (includeMangaMeta) {
+        updateStrategy = UpdateStrategy.valueOf(mangaEntry[updateStrategy]),
-            getMangaMetaMap(mangaEntry[id].value)
+        lastModifiedAt = mangaEntry[lastModifiedAt],
-        } else {
+        version = mangaEntry[version],
-            emptyMap()
+    )
-        },
-    realUrl = mangaEntry[realUrl],
-    lastFetchedAt = mangaEntry[lastFetchedAt],
-    chaptersLastFetchedAt = mangaEntry[chaptersLastFetchedAt],
-    updateStrategy = UpdateStrategy.valueOf(mangaEntry[updateStrategy]),
-    lastModifiedAt = mangaEntry[lastModifiedAt],
-    version = mangaEntry[version],
-)
 
 enum class MangaStatus(
     val value: Int,

server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt

@@ -71,11 +71,6 @@ import java.net.Authenticator
 import java.net.PasswordAuthentication
 import java.security.Security
 import java.util.Locale
-import kotlin.concurrent.thread
-import kotlin.io.path.Path
-import kotlin.io.path.createDirectories
-import kotlin.io.path.div
-import kotlin.math.roundToInt
 
 private val logger = KotlinLogging.logger {}
 

server/src/main/kotlin/suwayomi/tachidesk/server/util/CEFManager.kt

@@ -11,9 +11,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.subscribe
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json

server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt

@@ -136,7 +136,7 @@ object WebInterfaceManager {
     fun getAboutInfo(): AboutWebUI {
         val currentVersion = getLocalVersion()
 
-        val failedToGetVersion = currentVersion === "r-1"
+        val failedToGetVersion = currentVersion == "r-1"
         if (failedToGetVersion) {
             throw Exception("Failed to get current version")
         }

server/src/test/kotlin/suwayomi/tachidesk/LooperTest.kt

@@ -2,14 +2,12 @@ package suwayomi.tachidesk
 
 import android.os.Handler
 import android.os.Looper
-import android.os.Message
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 import kotlin.test.assertTrue
-import kotlin.text.StringBuilder
 
 class LooperThread : Thread() {
     var mHandler: Handler? = null

server/src/test/kotlin/suwayomi/tachidesk/manga/impl/update/TestUpdater.kt

@@ -46,6 +46,7 @@ class TestUpdater : IUpdater {
         TODO("Not yet implemented")
     }
 
+    @Deprecated("Replaced with updates", replaceWith = ReplaceWith("updates"))
     override val status: Flow<UpdateStatus>
         get() = TODO("Not yet implemented")
     override val updates: Flow<UpdateUpdates>

server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt

@@ -28,7 +28,6 @@ import suwayomi.tachidesk.server.serverModule
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import suwayomi.tachidesk.server.util.AppMutex.handleAppMutex
 import suwayomi.tachidesk.server.util.ConfigTypeRegistration
-import suwayomi.tachidesk.server.util.SystemTray
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import xyz.nulldev.androidcompat.AndroidCompatInitializer