Extract common model and database code

app/build.gradle.kts

@@ -204,7 +204,6 @@ dependencies {
     implementation(libs.androidx.paging.compose)
 
     // https://developer.android.com/jetpack/androidx/releases/room
-    ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.paging)
 
     implementation(libs.androidx.work.runtime)
@@ -256,14 +255,12 @@ kotlin {
         optIn.addAll(
             "coil3.annotation.ExperimentalCoilApi",
             "androidx.paging.ExperimentalPagingApi",
-            "kotlinx.serialization.ExperimentalSerializationApi",
             "me.saket.telephoto.ExperimentalTelephotoApi",
         )
     }
 }
 
 ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
     arg("compose-destinations.codeGenPackageName", "com.hippo.ehviewer.ui")
 }
 

app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt

@@ -38,6 +38,7 @@ import coil3.request.allowRgb565
 import coil3.request.crossfade
 import coil3.serviceLoaderEnabled
 import coil3.util.DebugLogger
+import com.ehviewer.core.database.SearchDatabase
 import com.ehviewer.core.files.deleteContent
 import com.ehviewer.core.ui.util.initSETConnection
 import com.ehviewer.core.util.isAtLeastO
@@ -57,7 +58,6 @@ import com.hippo.ehviewer.coil.MapExtraInfoInterceptor
 import com.hippo.ehviewer.coil.MergeInterceptor
 import com.hippo.ehviewer.coil.QrCodeInterceptor
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.SearchDatabase
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadsFilterMode
 import com.hippo.ehviewer.ktbuilder.diskCache

app/src/main/kotlin/com/hippo/ehviewer/EhDB.kt

@@ -19,19 +19,21 @@ import android.content.Context
 import android.net.Uri
 import arrow.fx.coroutines.resource
 import arrow.fx.coroutines.resourceScope
+import com.ehviewer.core.data.model.asEntity
+import com.ehviewer.core.database.EhDatabase
+import com.ehviewer.core.database.Schema17to18
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.database.model.DownloadDirname
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.DownloadLabel
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.GalleryEntity
+import com.ehviewer.core.database.model.HistoryInfo
+import com.ehviewer.core.database.model.LocalFavoriteInfo
+import com.ehviewer.core.database.model.ProgressInfo
+import com.ehviewer.core.database.model.QuickSearch
 import com.ehviewer.core.files.sendTo
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.dao.DownloadArtist
-import com.hippo.ehviewer.dao.DownloadDirname
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.DownloadLabel
-import com.hippo.ehviewer.dao.EhDatabase
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.HistoryInfo
-import com.hippo.ehviewer.dao.LocalFavoriteInfo
-import com.hippo.ehviewer.dao.ProgressInfo
-import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.dao.Schema17to18
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.download.DownloadManager
 import kotlinx.coroutines.flow.Flow
 import okio.Path
@@ -44,15 +46,15 @@ object EhDB {
         addMigrations(Schema17to18())
     }
 
-    suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun putGalleryInfo(galleryInfo: GalleryEntity) {
         db.galleryDao().upsert(galleryInfo)
     }
 
-    private suspend fun deleteGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    private suspend fun deleteGalleryInfo(galleryInfo: GalleryEntity) {
         runCatching { db.galleryDao().delete(galleryInfo) }
     }
 
-    suspend fun updateGalleryInfo(galleryInfoList: List<BaseGalleryInfo>) {
+    suspend fun updateGalleryInfo(galleryInfoList: List<GalleryEntity>) {
         db.galleryDao().update(galleryInfoList)
     }
 
@@ -156,12 +158,12 @@ object EhDB {
         }
     }
 
-    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
+    suspend fun removeLocalFavorites(galleryInfo: GalleryInfo) {
         db.localFavoritesDao().deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo)
+        deleteGalleryInfo(galleryInfo.asEntity())
     }
 
-    suspend fun removeLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun removeLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             removeLocalFavorites(it)
         }
@@ -172,12 +174,12 @@ object EhDB {
         return dao.contains(gid)
     }
 
-    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
+    suspend fun putLocalFavorites(galleryInfo: GalleryInfo) {
+        putGalleryInfo(galleryInfo.asEntity())
         db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
     }
 
-    suspend fun putLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun putLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             putLocalFavorites(it)
         }
@@ -223,8 +225,8 @@ object EhDB {
 
     fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("*$keyword*")
 
-    suspend fun putHistoryInfo(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
+    suspend fun putHistoryInfo(galleryInfo: GalleryInfo) {
+        putGalleryInfo(galleryInfo.asEntity())
         db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
     }
 
@@ -241,7 +243,7 @@ object EhDB {
         dao.insertOrIgnore(historyInfoList)
     }
 
-    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun deleteHistoryInfo(galleryInfo: GalleryEntity) {
         val dao = db.historyDao()
         dao.deleteByKey(galleryInfo.gid)
         deleteGalleryInfo(galleryInfo)

app/src/main/kotlin/com/hippo/ehviewer/client/EhCacheKeyFactory.kt

@@ -15,7 +15,7 @@
  */
 package com.hippo.ehviewer.client
 
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo
 
 // Normal Preview (v2): https://*.hath.network/c(m|1|2)/[timed token]/[gid]-[index].(jpg|webp)
 // ExHentai Large Preview (v1 Cover): https://s.exhentai.org/t/***

app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt

@@ -22,12 +22,14 @@ import arrow.core.right
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.data.fillInfo
+import com.hippo.ehviewer.client.data.filterComments
 import com.hippo.ehviewer.client.exception.CloudflareBypassException
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.InsufficientFundsException

app/src/main/kotlin/com/hippo/ehviewer/client/EhFilter.kt

@@ -1,10 +1,10 @@
 package com.hippo.ehviewer.client
 
 import arrow.core.memoize
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.FilterMode
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.FilterMode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async

app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt

@@ -23,10 +23,10 @@ import arrow.core.Either
 import com.ehviewer.core.files.metadataOrNull
 import com.ehviewer.core.files.read
 import com.ehviewer.core.files.write
+import com.ehviewer.core.model.TagNamespace
 import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.TagNamespace
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.bodyAsUtf8Text
 import com.hippo.ehviewer.util.ensureSuccess

app/src/main/kotlin/com/hippo/ehviewer/client/EhUtils.kt

@@ -27,10 +27,10 @@ import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import androidx.core.net.toUri
 import arrow.core.memoize
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.parser.Archive
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.util.AppConfig

app/src/main/kotlin/com/hippo/ehviewer/client/data/AbstractDownloadInfo.kt

@@ -1,13 +0,0 @@
-package com.hippo.ehviewer.client.data
-
-interface AbstractDownloadInfo {
-    var state: Int
-    var legacy: Int
-    var time: Long
-    var label: String?
-    var speed: Long
-    var remaining: Long
-    var finished: Int
-    var downloaded: Int
-    var total: Int
-}

app/src/main/kotlin/com/hippo/ehviewer/client/data/GalleryDetail.kt

@@ -16,10 +16,13 @@
 package com.hippo.ehviewer.client.data
 
 import androidx.compose.ui.util.fastFlatMap
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryTagGroup
+import com.ehviewer.core.model.PowerStatus
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhFilter
-import kotlinx.serialization.Serializable
 
 private val LANGUAGES = arrayOf(
     "English",
@@ -38,45 +41,27 @@ private val LANGUAGES = arrayOf(
     "Dutch",
 )
 
-@Serializable
-data class GalleryDetail(
-    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
-    var apiUid: Long = -1L,
-    var apiKey: String? = null,
-    var torrentCount: Int = 0,
-    var parent: String? = null,
-    var newerVersions: List<BaseGalleryInfo> = emptyList(),
-    var visible: String? = null,
-    var language: String? = null,
-    var size: String? = null,
-    var favoriteCount: Int = 0,
-    var ratingCount: Int = 0,
-    val tagGroups: List<GalleryTagGroup>,
-    var comments: GalleryCommentList,
-    val previewList: List<GalleryPreview>,
-) : GalleryInfo by galleryInfo {
-    suspend fun fillInfo() {
-        val index = LANGUAGES.indexOf(language)
-        if (index != -1) simpleLanguage = GalleryInfo.S_LANGS[index]
-        simpleTags = tagGroups.fastFlatMap(GalleryTagGroup::tags).map { (text, power, _) ->
-            if (power == PowerStatus.Weak) "_$text" else text
-        }
-        if (favoriteSlot == GalleryInfo.NOT_FAVORITED && EhDB.containLocalFavorites(gid)) {
-            favoriteSlot = GalleryInfo.LOCAL_FAVORITED
-        }
+suspend fun GalleryDetail.fillInfo() {
+    val index = LANGUAGES.indexOf(language)
+    if (index != -1) simpleLanguage = GalleryInfo.S_LANGS[index]
+    simpleTags = tagGroups.fastFlatMap(GalleryTagGroup::tags).map { (text, power, _) ->
+        if (power == PowerStatus.Weak) "_$text" else text
     }
+    if (favoriteSlot == GalleryInfo.NOT_FAVORITED && EhDB.containLocalFavorites(gid)) {
+        favoriteSlot = GalleryInfo.LOCAL_FAVORITED
+    }
+}
 
-    suspend fun filterComments() {
-        comments = with(comments) {
-            val scoreThreshold = Settings.commentThreshold.value
-            copy(
-                comments = comments.filter {
-                    it.uploader ||
-                        it.score > scoreThreshold &&
-                        !EhFilter.filterCommenter(it.user.orEmpty()) &&
-                        !EhFilter.filterComment(it.comment)
-                },
-            )
-        }
+suspend fun GalleryDetail.filterComments() {
+    comments = with(comments) {
+        val scoreThreshold = Settings.commentThreshold.value
+        copy(
+            comments = comments.filter {
+                it.uploader ||
+                    it.score > scoreThreshold &&
+                    !EhFilter.filterCommenter(it.user.orEmpty()) &&
+                    !EhFilter.filterComment(it.comment)
+            },
+        )
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt

@@ -15,13 +15,14 @@
  */
 package com.hippo.ehviewer.client.data
 
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.addQueryParameter
 import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
 import com.hippo.ehviewer.client.ehUrl
-import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.main.AdvanceTable
 import io.ktor.http.Parameters
 import kotlinx.serialization.Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryApiParser.kt

@@ -15,9 +15,9 @@
  */
 package com.hippo.ehviewer.client.parser
 
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.EhUtils.getCategory
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.client.parseAs
 import kotlinx.serialization.SerialName

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt

@@ -17,9 +17,9 @@ package com.hippo.ehviewer.client.parser
 
 import arrow.core.Either
 import arrow.core.getOrElse
-import com.hippo.ehviewer.client.data.GalleryCommentList
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryPreviewList
+import com.ehviewer.core.model.GalleryCommentList
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryPreviewList
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryListParser.kt

@@ -1,6 +1,6 @@
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/VoteTagParser.kt

@@ -19,7 +19,7 @@ package com.hippo.ehviewer.client.parser
 
 import arrow.core.Either.Companion.catch
 import arrow.core.getOrElse
-import com.hippo.ehviewer.client.data.GalleryTagGroup
+import com.ehviewer.core.model.GalleryTagGroup
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 

app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt

@@ -6,6 +6,7 @@ import coil3.intercept.Interceptor
 import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.files.delete
 import com.ehviewer.core.files.isDirectory
 import com.ehviewer.core.files.isFile
@@ -14,7 +15,6 @@ import com.ehviewer.core.files.toUri
 import com.hippo.ehviewer.EhApplication.Companion.imageCache
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.getThumbKey
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.downloadLocation
 
 private val downloadInfoKey = Extras.Key<DownloadInfo?>(default = null)
@@ -35,7 +35,7 @@ object DownloadThumbInterceptor : Interceptor {
                 info.thumbKey = thumbKey
                 EhDB.putGalleryInfo(info.galleryInfo)
             }
-            val dir = downloadLocation / info.dirname
+            val dir = downloadLocation / info.dirname!!
             val format = thumbKey.substringAfterLast('.', "")
             check(format.isNotBlank())
             val thumb = dir / "thumb.$format"

app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt

@@ -7,10 +7,13 @@ import coil3.decode.BlackholeDecoder
 import coil3.request.CachePolicy
 import coil3.request.ImageRequest
 import coil3.size.SizeResolver
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryPreview
+import com.ehviewer.core.model.V2GalleryPreview
+import com.hippo.ehviewer.client.getThumbKey
+import com.hippo.ehviewer.client.getV2PreviewKey
 import com.hippo.ehviewer.client.thumbUrl
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ktbuilder.execute
 
@@ -30,7 +33,7 @@ fun ImageRequest.Builder.ehUrl(info: GalleryInfo) = apply {
 // Load in original size so the memory cache can be reused for preload requests
 fun ImageRequest.Builder.ehPreview(preview: GalleryPreview) = apply {
     with(preview) {
-        val key = imageKey
+        val key = if (this is V2GalleryPreview) getV2PreviewKey(url) else getThumbKey(url)
         data(url)
         size(SizeResolver.ORIGINAL)
         memoryCacheKey(key)

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt

@@ -26,21 +26,22 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.core.util.size
 import arrow.fx.coroutines.parMapNotNull
+import com.ehviewer.core.data.model.asEntity
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.DownloadLabel
 import com.ehviewer.core.files.delete
 import com.ehviewer.core.files.find
 import com.ehviewer.core.files.toOkioPath
 import com.ehviewer.core.files.toUri
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.preferences.edit
 import com.ehviewer.core.util.logcat
 import com.ehviewer.core.util.mapNotNull
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.FatalException
-import com.hippo.ehviewer.dao.DownloadArtist
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.DownloadLabel
 import com.hippo.ehviewer.spider.COMIC_INFO_FILE
 import com.hippo.ehviewer.spider.SpeedTracker
 import com.hippo.ehviewer.spider.SpiderQueen
@@ -179,7 +180,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
         } else {
             // It is new download info
-            info = DownloadInfo(galleryInfo, galleryInfo.downloadDirname())
+            info = DownloadInfo(galleryInfo.asEntity(), galleryInfo.downloadDirname())
             info.label = label
             info.state = DownloadInfo.STATE_WAIT
             // Add to all download list and map
@@ -198,7 +199,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             ensureDownload()
 
             // Add it to history
-            EhDB.putHistoryInfo(info.galleryInfo)
+            EhDB.putHistoryInfo(info)
         }
     }
 
@@ -288,7 +289,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }
 
     suspend fun restoreDownload(galleryInfo: BaseGalleryInfo, dirname: String) {
-        val info = DownloadInfo(galleryInfo, dirname)
+        val info = DownloadInfo(galleryInfo.asEntity(), dirname)
         info.state = DownloadInfo.STATE_NONE
 
         // Add to all download list and map
@@ -575,13 +576,14 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
         }
 
-        val galleryInfoList = mutableListOf<BaseGalleryInfo>()
-        list.forEach { (info, artists) ->
-            info?.let {
-                galleryInfoList.add(it)
-            }
-            artists?.let { (gid, updateList) ->
-                EhDB.putDownloadArtist(gid, updateList)
+        val galleryInfoList = buildList {
+            list.forEach { (info, artists) ->
+                info?.let {
+                    add(it)
+                }
+                artists?.let { (gid, updateList) ->
+                    EhDB.putDownloadArtist(gid, updateList)
+                }
             }
         }
         if (galleryInfoList.isNotEmpty()) EhDB.updateGalleryInfo(galleryInfoList)

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt

@@ -31,17 +31,17 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.savedstate.serialization.decodeFromSavedState
 import androidx.savedstate.serialization.encodeToSavedState
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.ehviewer.core.util.isAtLeastS
 import com.ehviewer.core.util.logcat
 import com.ehviewer.core.util.unsafeLazy
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.FatalException
 import com.hippo.ehviewer.client.exception.InsufficientGpException
 import com.hippo.ehviewer.client.exception.IpBannedException
 import com.hippo.ehviewer.client.exception.QuotaExceededException
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadsFilterMode.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.download
 
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.artists
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.artists
 
 enum class DownloadsFilterMode(
     val flag: Int,

app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.download
 
+import com.ehviewer.core.database.model.DownloadInfo
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 
 data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel: Boolean = false) {
     val flag

app/src/main/kotlin/com/hippo/ehviewer/gallery/EhPageLoader.kt

@@ -1,8 +1,8 @@
 package com.hippo.ehviewer.gallery
 
 import arrow.autoCloseScope
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.obtainSpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.releaseSpiderQueen

app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt

@@ -5,8 +5,8 @@ import coil3.ImageLoader
 import coil3.disk.DiskCache
 import coil3.imageLoader
 import coil3.request.ImageRequest
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryPreview
 import com.hippo.ehviewer.coil.ehPreview
 import com.hippo.ehviewer.coil.ehUrl
 import kotlinx.coroutines.CoroutineScope

app/src/main/kotlin/com/hippo/ehviewer/spider/ComicInfo.kt

@@ -1,24 +1,24 @@
 package com.hippo.ehviewer.spider
 
+import com.ehviewer.core.database.util.SimpleTagsConverter
 import com.ehviewer.core.files.read
 import com.ehviewer.core.files.write
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryTag
+import com.ehviewer.core.model.PowerStatus
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.model.TagNamespace.Artist
+import com.ehviewer.core.model.TagNamespace.Character
+import com.ehviewer.core.model.TagNamespace.Cosplayer
+import com.ehviewer.core.model.TagNamespace.Female
+import com.ehviewer.core.model.TagNamespace.Group
+import com.ehviewer.core.model.TagNamespace.Location
+import com.ehviewer.core.model.TagNamespace.Male
+import com.ehviewer.core.model.TagNamespace.Mixed
+import com.ehviewer.core.model.TagNamespace.Other
+import com.ehviewer.core.model.TagNamespace.Parody
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryTag
-import com.hippo.ehviewer.client.data.PowerStatus
-import com.hippo.ehviewer.client.data.SimpleTagsConverter
-import com.hippo.ehviewer.client.data.TagNamespace
-import com.hippo.ehviewer.client.data.TagNamespace.Artist
-import com.hippo.ehviewer.client.data.TagNamespace.Character
-import com.hippo.ehviewer.client.data.TagNamespace.Cosplayer
-import com.hippo.ehviewer.client.data.TagNamespace.Female
-import com.hippo.ehviewer.client.data.TagNamespace.Group
-import com.hippo.ehviewer.client.data.TagNamespace.Location
-import com.hippo.ehviewer.client.data.TagNamespace.Male
-import com.hippo.ehviewer.client.data.TagNamespace.Mixed
-import com.hippo.ehviewer.client.data.TagNamespace.Other
-import com.hippo.ehviewer.client.data.TagNamespace.Parody
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt

@@ -20,6 +20,7 @@ import arrow.fx.coroutines.autoCloseable
 import arrow.fx.coroutines.closeable
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.resourceScope
+import com.ehviewer.core.database.model.DownloadArtist
 import com.ehviewer.core.files.delete
 import com.ehviewer.core.files.exists
 import com.ehviewer.core.files.find
@@ -29,19 +30,18 @@ import com.ehviewer.core.files.mkdirs
 import com.ehviewer.core.files.moveTo
 import com.ehviewer.core.files.openFileDescriptor
 import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.imageCache as sCache
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils.getSuitableTitle
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.ehRequest
 import com.hippo.ehviewer.client.getImageKey
 import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.coil.suspendEdit
-import com.hippo.ehviewer.dao.DownloadArtist
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.download.tempDownloadDir

app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt

@@ -22,6 +22,8 @@ import arrow.core.getOrElse
 import arrow.core.partially1
 import com.ehviewer.core.files.find
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryPreview
 import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
@@ -29,8 +31,6 @@ import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUrl.getGalleryDetailUrl
 import com.hippo.ehviewer.client.EhUrl.referer
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
 import com.hippo.ehviewer.client.exception.FatalException
 import com.hippo.ehviewer.client.exception.QuotaExceededException
 import com.hippo.ehviewer.util.displayString

app/src/main/kotlin/com/hippo/ehviewer/ui/CommonOperations.kt

@@ -35,11 +35,16 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.files.delete
 import com.ehviewer.core.files.exists
 import com.ehviewer.core.files.isDirectory
 import com.ehviewer.core.files.write
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.LOCAL_FAVORITED
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
 import com.ehviewer.core.ui.component.LabeledCheckbox
 import com.ehviewer.core.util.isAtLeastT
 import com.ehviewer.core.util.mapToLongArray
@@ -50,12 +55,7 @@ import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.downloadDir
@@ -177,7 +177,7 @@ suspend fun startDownload(forceDefault: Boolean, vararg galleryInfos: BaseGaller
 }
 
 context(_: DialogState)
-suspend fun modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
+suspend fun modifyFavorites(galleryInfo: GalleryInfo): Boolean {
     val localFavorited = EhDB.containLocalFavorites(galleryInfo.gid)
     if (Settings.hasSignedIn.value) {
         val isFavorited = galleryInfo.favoriteSlot != NOT_FAVORITED
@@ -215,7 +215,7 @@ suspend fun modifyFavorites(galleryInfo: BaseGalleryInfo): Boolean {
 }
 
 private suspend fun doModifyFavorites(
-    galleryInfo: BaseGalleryInfo,
+    galleryInfo: GalleryInfo,
     slot: Int = NOT_FAVORITED,
     localFavorited: Boolean = true,
     note: String = "",
@@ -263,7 +263,7 @@ private suspend fun doModifyFavorites(
     add
 }
 
-suspend fun removeFromFavorites(galleryInfo: BaseGalleryInfo) = doModifyFavorites(
+suspend fun removeFromFavorites(galleryInfo: GalleryInfo) = doModifyFavorites(
     galleryInfo = galleryInfo,
     localFavorited = EhDB.containLocalFavorites(galleryInfo.gid),
 )

app/src/main/kotlin/com/hippo/ehviewer/ui/GalleryInfoBottomSheet.kt

@@ -25,11 +25,11 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.client.thumbUrl
 import com.hippo.ehviewer.ui.screen.navWithUrl
 import com.hippo.ehviewer.util.addTextToClipboard

app/src/main/kotlin/com/hippo/ehviewer/ui/UrlOpener.kt

@@ -21,7 +21,7 @@ import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.net.toUri
 import com.ehviewer.core.i18n.R
-import com.hippo.ehviewer.client.data.GalleryDetail
+import com.ehviewer.core.model.GalleryDetail
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 

app/src/main/kotlin/com/hippo/ehviewer/ui/main/DownloadCard.kt

@@ -39,6 +39,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.i18n.R
 import com.ehviewer.core.ui.component.CrystalCard
 import com.ehviewer.core.ui.component.GalleryListCardRating
@@ -46,7 +47,6 @@ import com.ehviewer.core.ui.util.TransitionsVisibilityScope
 import com.ehviewer.core.ui.util.listThumbGenerator
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.util.FileUtils
 

app/src/main/kotlin/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt

@@ -18,11 +18,11 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import coil3.compose.AsyncImagePainter
 import coil3.compose.rememberAsyncImagePainter
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.ui.util.SETNodeGenerator
 import com.ehviewer.core.ui.util.SharedElementBox
 import com.ehviewer.core.ui.util.TransitionsVisibilityScope
 import com.ehviewer.core.ui.util.thenIf
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.ktbuilder.imageRequest
 import com.hippo.ehviewer.ui.tools.shouldCrop
 

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryComment.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.text.parseAsHtml
 import com.ehviewer.core.i18n.R
-import com.hippo.ehviewer.client.data.GalleryComment
+import com.ehviewer.core.model.GalleryComment
 import com.hippo.ehviewer.ui.legacy.CoilImageGetter
 import com.hippo.ehviewer.ui.legacy.LinkifyTextView
 import com.hippo.ehviewer.util.ReadableTime

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryDetail.kt

@@ -33,13 +33,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.ui.icons.EhIcons
 import com.ehviewer.core.ui.icons.big.SadAndroid
 import com.ehviewer.core.ui.util.TransitionsVisibilityScope
 import com.ehviewer.core.ui.util.detailThumbGenerator
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
 
 @Composable
 fun GalleryDetailHeaderInfoCard(

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryInfo.kt

@@ -38,6 +38,8 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
 import com.ehviewer.core.ui.component.CrystalCard
 import com.ehviewer.core.ui.component.ElevatedCard
 import com.ehviewer.core.ui.component.GalleryListCardRating
@@ -46,8 +48,6 @@ import com.ehviewer.core.ui.util.TransitionsVisibilityScope
 import com.ehviewer.core.ui.util.listThumbGenerator
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt

@@ -52,13 +52,13 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.ehviewer.core.ui.component.FastScrollLazyVerticalGrid
 import com.ehviewer.core.ui.component.FastScrollLazyVerticalStaggeredGrid
 import com.ehviewer.core.ui.icons.EhIcons
 import com.ehviewer.core.ui.icons.big.SadAndroid
 import com.ehviewer.core.util.launch
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.NoHitsFoundException
 import com.hippo.ehviewer.coil.PrefetchAround
 import com.hippo.ehviewer.collectAsState

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryPreview.kt

@@ -23,9 +23,9 @@ import androidx.compose.ui.unit.IntSize
 import coil3.BitmapImage
 import coil3.compose.AsyncImagePainter.State
 import coil3.compose.rememberAsyncImagePainter
+import com.ehviewer.core.model.GalleryPreview
+import com.ehviewer.core.model.V2GalleryPreview
 import com.ehviewer.core.ui.component.CrystalCard
-import com.hippo.ehviewer.client.data.GalleryPreview
-import com.hippo.ehviewer.client.data.V2GalleryPreview
 import com.hippo.ehviewer.ktbuilder.imageRequest
 import com.hippo.ehviewer.ui.tools.shouldCrop
 

app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryTag.kt

@@ -22,12 +22,12 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.ehviewer.core.model.GalleryTagGroup
+import com.ehviewer.core.model.PowerStatus
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.model.VoteStatus
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.client.data.GalleryTagGroup
-import com.hippo.ehviewer.client.data.PowerStatus
-import com.hippo.ehviewer.client.data.TagNamespace
-import com.hippo.ehviewer.client.data.VoteStatus
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.ui.tools.includeFontPadding
 

app/src/main/kotlin/com/hippo/ehviewer/ui/main/SearchFilter.kt

@@ -34,6 +34,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import arrow.core.raise.ensure
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo.Companion.S_LANG_TAGS
 import com.ehviewer.core.ui.component.DropdownFilterChip
 import com.ehviewer.core.ui.util.thenIf
 import com.ehviewer.core.util.launch
@@ -41,7 +42,6 @@ import com.ehviewer.core.util.toIntOrDefault
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANG_TAGS
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.ui.tools.awaitResult

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/PageActions.kt

@@ -15,12 +15,12 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.core.content.FileProvider
 import com.ehviewer.core.files.toOkioPath
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.util.isAtLeastQ
 import com.ehviewer.core.util.isAtLeastT
 import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.BuildConfig.APPLICATION_ID
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.gallery.Page
 import com.hippo.ehviewer.gallery.PageLoader
 import com.hippo.ehviewer.util.AppConfig

app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt

@@ -59,6 +59,7 @@ import arrow.core.Either.Companion.catch
 import arrow.core.raise.ensure
 import arrow.core.right
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.ehviewer.core.ui.util.Await
 import com.ehviewer.core.ui.util.asyncInVM
 import com.ehviewer.core.ui.util.rememberSystemUiController
@@ -68,7 +69,6 @@ import com.ehviewer.core.util.launchIO
 import com.ehviewer.core.util.unreachable
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.archiveFile

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsFilterState.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.ui.screen
 
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.util.containsIgnoreCase
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadsFilterMode
 import kotlinx.serialization.Serializable
 

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt

@@ -82,7 +82,9 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import arrow.core.partially1
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.TagNamespace
 import com.ehviewer.core.ui.component.FAB_ANIMATE_TIME
 import com.ehviewer.core.ui.component.FabLayout
 import com.ehviewer.core.ui.component.FastScrollLazyColumn
@@ -109,9 +111,7 @@ import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.asMutableState
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.client.data.TagNamespace
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadManager.downloadInfoList
 import com.hippo.ehviewer.download.DownloadService
@@ -562,7 +562,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
         }
 
         fun onItemClick(info: DownloadInfo) {
-            launchIO { EhDB.putHistoryInfo(info.galleryInfo) }
+            launchIO { EhDB.putHistoryInfo(info) }
             navToReader(info.galleryInfo)
         }
 

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt

@@ -54,6 +54,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.ehviewer.core.ui.component.FAB_ANIMATE_TIME
 import com.ehviewer.core.ui.component.FabLayout
 import com.ehviewer.core.ui.component.LocalSideSheetState
@@ -70,7 +71,6 @@ import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.collectAsState
 import com.hippo.ehviewer.ui.DrawerHandle

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesViewModel.kt

@@ -13,12 +13,13 @@ import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import androidx.paging.cachedIn
 import androidx.paging.filter
+import androidx.paging.map
 import androidx.savedstate.compose.serialization.serializers.MutableStateSerializer
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.ui.tools.foldToLoadResult
 import kotlinx.coroutines.flow.flatMapLatest
@@ -45,7 +46,7 @@ class FavoritesViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
                 } else {
                     EhDB.searchLocalFav(keywordNow)
                 }
-            }
+            }.flow.map { data -> data.map<_, BaseGalleryInfo> { it } }
         } else {
             Pager(PagingConfig(DEFAULT_PAGE_SIZE, prefetchDistance = 20)) {
                 object : PagingSource<String, BaseGalleryInfo>() {
@@ -71,12 +72,12 @@ class FavoritesViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
                         }
                     }
                 }
+            }.flow.map { data ->
+                // https://github.com/FooIbar/EhViewer/issues/1190
+                // Workaround for duplicate items when sorting by favorited time
+                val gidSet = MutableLongSet(DEFAULT_PAGE_SIZE)
+                data.filter { gidSet.add(it.gid) }
             }
-        }.flow.map { pagingData ->
-            // https://github.com/FooIbar/EhViewer/issues/1190
-            // Workaround for duplicate items when sorting by favorited time
-            val gidSet = MutableLongSet(DEFAULT_PAGE_SIZE)
-            pagingData.filter { gidSet.add(it.gid) }
         }
     }.cachedIn(viewModelScope)
 }

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt

@@ -82,7 +82,10 @@ import androidx.core.text.buildSpannedString
 import androidx.core.text.getSpans
 import androidx.core.text.inSpans
 import androidx.core.text.parseAsHtml
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.FilterMode
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryComment
 import com.ehviewer.core.ui.util.animateFloatMergePredictiveBackAsState
 import com.ehviewer.core.ui.util.snackBarPadding
 import com.ehviewer.core.ui.util.thenIf
@@ -94,11 +97,8 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhFilter.remember
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.GalleryComment
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.FilterMode
 import com.hippo.ehviewer.ui.Screen
 import com.hippo.ehviewer.ui.jumpToReaderByPage
 import com.hippo.ehviewer.ui.main.GalleryCommentCard
@@ -394,7 +394,7 @@ fun AnimatedVisibilityScope.GalleryCommentsScreen(gid: Long, navigator: Destinat
                         }
                         if (!comment.voteState.isNullOrEmpty()) {
                             onSelect(checkVoteStatus) {
-                                showCommentVoteStatus(comment.voteState)
+                                showCommentVoteStatus(comment.voteState!!)
                             }
                         }
                     }()

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt

@@ -68,7 +68,21 @@ import androidx.paging.compose.itemKey
 import arrow.core.partially1
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
+import com.ehviewer.core.data.model.asGalleryDetail
+import com.ehviewer.core.data.model.findBaseInfo
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.FilterMode
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.GalleryComment
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
+import com.ehviewer.core.model.GalleryPreview
+import com.ehviewer.core.model.GalleryTagGroup
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.model.V2GalleryPreview
+import com.ehviewer.core.model.VoteStatus
 import com.ehviewer.core.ui.component.CrystalCard
 import com.ehviewer.core.ui.component.FastScrollLazyVerticalGrid
 import com.ehviewer.core.ui.component.FilledTertiaryIconButton
@@ -95,26 +109,12 @@ import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhFilter.remember
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryComment
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
-import com.hippo.ehviewer.client.data.GalleryPreview
-import com.hippo.ehviewer.client.data.GalleryTagGroup
 import com.hippo.ehviewer.client.data.ListUrlBuilder
-import com.hippo.ehviewer.client.data.TagNamespace
-import com.hippo.ehviewer.client.data.V2GalleryPreview
-import com.hippo.ehviewer.client.data.VoteStatus
-import com.hippo.ehviewer.client.data.asGalleryDetail
-import com.hippo.ehviewer.client.data.findBaseInfo
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.NoHathClientException
 import com.hippo.ehviewer.coil.PrefetchAround
 import com.hippo.ehviewer.coil.justDownload
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.FilterMode
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ktbuilder.executeIn
 import com.hippo.ehviewer.ktbuilder.imageRequest
@@ -498,7 +498,7 @@ fun BelowHeader(galleryDetail: GalleryDetail, voteTag: VoteTag) {
                     launchIO {
                         favoritesLock.mutate {
                             runSuspendCatching {
-                                modifyFavorites(galleryDetail.galleryInfo)
+                                modifyFavorites(galleryDetail)
                             }.onSuccess { add ->
                                 if (add) {
                                     snackbar(addSucceed)

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt

@@ -34,9 +34,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.util.fastJoinToString
 import androidx.lifecycle.viewModelScope
+import com.ehviewer.core.data.model.findBaseInfo
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.files.delete
 import com.ehviewer.core.files.toOkioPath
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.ui.util.LocalWindowSizeClass
 import com.ehviewer.core.ui.util.isExpanded
 import com.ehviewer.core.ui.util.launchInVM
@@ -50,13 +55,9 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.findBaseInfo
+import com.hippo.ehviewer.client.data.fillInfo
 import com.hippo.ehviewer.client.getImageKey
 import com.hippo.ehviewer.coil.justDownload
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ktbuilder.executeIn
 import com.hippo.ehviewer.ktbuilder.imageRequest
@@ -137,12 +138,12 @@ fun AnimatedVisibilityScope.GalleryDetailScreen(args: GalleryDetailScreenArgs, n
                     withIOContext { EhEngine.getGalleryDetail(galleryDetailUrl) }
                 }.onSuccess { galleryDetail ->
                     detailCache[galleryDetail.gid] = galleryDetail
-                }.onFailure {
-                    galleryInfo?.let { info -> EhDB.putHistoryInfo(info.findBaseInfo()) }
-                    getDetailError = it.displayString()
+                }.onFailure { e ->
+                    galleryInfo?.let { EhDB.putHistoryInfo(it) }
+                    getDetailError = e.displayString()
                 }.getOrNull()
             galleryDetail?.let {
-                EhDB.putHistoryInfo(it.galleryInfo)
+                EhDB.putHistoryInfo(it)
                 galleryInfo = it
             }
         }

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt

@@ -69,6 +69,7 @@ import androidx.paging.LoadState
 import androidx.paging.compose.collectAsLazyPagingItems
 import arrow.core.raise.ensure
 import arrow.core.raise.ensureNotNull
+import com.ehviewer.core.database.model.QuickSearch
 import com.ehviewer.core.i18n.R
 import com.ehviewer.core.ui.component.FAB_ANIMATE_TIME
 import com.ehviewer.core.ui.component.FabLayout
@@ -102,7 +103,6 @@ import com.hippo.ehviewer.client.data.ListUrlBuilder.Companion.MODE_WHATS_HOT
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.DrawerHandle
 import com.hippo.ehviewer.ui.Screen
 import com.hippo.ehviewer.ui.awaitSelectDate

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListViewModel.kt

@@ -11,9 +11,9 @@ import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import androidx.paging.cachedIn
 import androidx.savedstate.compose.serialization.serializers.MutableStateSerializer
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.client.EhEngine
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.data.ListUrlBuilder.Companion.MODE_TOPLIST
 import com.hippo.ehviewer.ui.tools.foldToLoadResult

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/MainNav.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.ui.screen
 
 import androidx.annotation.MainThread
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
 import com.hippo.ehviewer.client.parser.GalleryListUrlParser

app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt

@@ -65,17 +65,17 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.coerceAtMost
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.dao.SearchDao
+import com.ehviewer.core.database.model.Search
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.TagNamespace
 import com.ehviewer.core.ui.util.ifNotNullThen
 import com.ehviewer.core.ui.util.ifTrueThen
 import com.ehviewer.core.ui.util.thenIf
 import com.hippo.ehviewer.EhApplication.Companion.searchDatabase
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.client.data.TagNamespace
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.dao.Search
-import com.hippo.ehviewer.dao.SearchDao
 import com.hippo.ehviewer.ui.LocalNavDrawerState
 import com.hippo.ehviewer.ui.destinations.ImageSearchScreenDestination
 import com.hippo.ehviewer.ui.theme.scrim

app/src/main/kotlin/com/hippo/ehviewer/ui/settings/DownloadScreen.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parMapNotNull
+import com.ehviewer.core.database.model.DownloadInfo
 import com.ehviewer.core.files.delete
 import com.ehviewer.core.files.find
 import com.ehviewer.core.files.isDirectory
@@ -38,6 +39,8 @@ import com.ehviewer.core.files.mkdirs
 import com.ehviewer.core.files.toOkioPath
 import com.ehviewer.core.files.toUri
 import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.util.isAtLeastQ
 import com.ehviewer.core.util.launch
 import com.ehviewer.core.util.launchIO
@@ -47,11 +50,8 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.asMutableState
 import com.hippo.ehviewer.client.EhEngine.fillGalleryListByApi
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
 import com.hippo.ehviewer.client.parser.ParserUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.downloadDir
 import com.hippo.ehviewer.download.downloadLocation

app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt

@@ -53,6 +53,8 @@ import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.FilterMode
 import com.ehviewer.core.i18n.R
 import com.ehviewer.core.ui.util.Await
 import com.ehviewer.core.ui.util.thenIf
@@ -64,8 +66,6 @@ import com.hippo.ehviewer.client.EhFilter.forget
 import com.hippo.ehviewer.client.EhFilter.remember
 import com.hippo.ehviewer.client.EhFilter.trigger
 import com.hippo.ehviewer.collectAsState
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.FilterMode
 import com.hippo.ehviewer.ui.Screen
 import com.hippo.ehviewer.ui.main.NavigationIcon
 import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel

app/src/main/kotlin/com/hippo/ehviewer/ui/tools/CropDefaults.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.ui.tools
 
 import coil3.Image
-import com.hippo.ehviewer.client.data.V2GalleryPreview
+import com.ehviewer.core.model.V2GalleryPreview
 
 private const val CROP_MIN_ASPECT = 0.5F
 private const val CROP_MAX_ASPECT = 0.8f

app/src/main/kotlin/com/hippo/ehviewer/util/FavouriteStatusRouter.kt

@@ -22,10 +22,10 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.paging.compose.LazyPagingItems
+import com.ehviewer.core.model.GalleryInfo
 import com.ehviewer.core.ui.util.launchInVM
 import com.ehviewer.core.ui.util.rememberUpdatedStateInVM
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.client.data.GalleryInfo
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.FlowCollector

app/src/main/kotlin/com/hippo/ehviewer/util/GalleryAdsUtils.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.util
 
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.GalleryInfo
 import okio.Path.Companion.toOkioPath
 import splitties.init.appCtx
 

build-logic/convention/src/main/kotlin/com/ehviewer/Kotlin.kt

@@ -14,6 +14,7 @@ internal fun KotlinCommonCompilerOptions.configureKotlin() {
         "kotlin.time.ExperimentalTime",
         "kotlinx.coroutines.ExperimentalCoroutinesApi",
         "kotlinx.coroutines.FlowPreview",
+        "kotlinx.serialization.ExperimentalSerializationApi",
     )
     freeCompilerArgs.addAll(
         "-Xcontext-parameters",

build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.moko.resources) apply false
+    alias(libs.plugins.room) apply false
     alias(libs.plugins.spotless) apply false
     alias(libs.plugins.aboutlibrariesPlugin) apply false
     alias(libs.plugins.composeCompilerReportGenerator) apply false

core/common/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.ehviewer.multiplatform.library)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 kotlin {
@@ -10,6 +11,7 @@ kotlin {
                 api(libs.kotlinx.datetime)
                 api(libs.kotlinx.io)
                 api(libs.okio)
+                api(libs.serialization.cbor)
                 api(libs.logcat)
                 api(project.dependencies.platform(libs.arrow.stack))
                 api(libs.bundles.arrow)

core/common/src/commonMain/kotlin/com/ehviewer/core/model/BaseGalleryInfo.kt

@@ -13,84 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.PrimaryKey
-import androidx.room.TypeConverter
-import androidx.room.TypeConverters
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
 import kotlinx.serialization.Serializable
 
 @Serializable
-@Entity(tableName = "GALLERIES")
-@TypeConverters(SimpleTagsConverter::class)
-data class BaseGalleryInfo(
-    @PrimaryKey
-    @ColumnInfo(name = "GID")
+open class BaseGalleryInfo(
     override var gid: Long = 0,
-
-    @ColumnInfo(name = "TOKEN")
     override var token: String = "",
-
-    @ColumnInfo(name = "TITLE")
     override var title: String? = null,
-
-    @ColumnInfo(name = "TITLE_JPN")
     override var titleJpn: String? = null,
-
-    @ColumnInfo(name = "THUMB")
     override var thumbKey: String? = null,
-
-    @ColumnInfo(name = "CATEGORY")
     override var category: Int = 0,
-
-    @ColumnInfo(name = "POSTED")
     override var posted: String? = null,
-
-    @ColumnInfo(name = "UPLOADER")
     override var uploader: String? = null,
-
-    @Ignore
     override var disowned: Boolean = false,
-
-    @ColumnInfo(name = "RATING")
     override var rating: Float = 0f,
-
-    @Ignore
     override var rated: Boolean = false,
-
-    @ColumnInfo(name = "SIMPLE_TAGS")
     override var simpleTags: List<String>? = null,
-
-    @ColumnInfo(name = "PAGES", defaultValue = "0")
     override var pages: Int = 0,
-
-    @Ignore
     override var thumbWidth: Int = 0,
-
-    @Ignore
     override var thumbHeight: Int = 0,
-
-    @ColumnInfo(name = "SIMPLE_LANGUAGE")
     override var simpleLanguage: String? = null,
-
-    @ColumnInfo(name = "FAVORITE_SLOT")
     override var favoriteSlot: Int = NOT_FAVORITED,
-
-    @Ignore
     override var favoriteName: String? = null,
-
-    @Ignore
     override var favoriteNote: String? = null,
 ) : GalleryInfo
-
-class SimpleTagsConverter {
-    @TypeConverter
-    fun fromString(value: String) = value.split(", ")
-
-    @TypeConverter
-    fun toString(value: List<String>) = value.joinToString()
-}

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryComment.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
 import kotlinx.serialization.Serializable
 

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryCommentList.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
 import kotlinx.serialization.Serializable
 

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryDetail.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ehviewer.core.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GalleryDetail(
+    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
+    var apiUid: Long = -1L,
+    var apiKey: String? = null,
+    var torrentCount: Int = 0,
+    var parent: String? = null,
+    var newerVersions: List<BaseGalleryInfo> = emptyList(),
+    var visible: String? = null,
+    var language: String? = null,
+    var size: String? = null,
+    var favoriteCount: Int = 0,
+    var ratingCount: Int = 0,
+    val tagGroups: List<GalleryTagGroup>,
+    var comments: GalleryCommentList,
+    val previewList: List<GalleryPreview>,
+) : GalleryInfo by galleryInfo

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryInfo.kt

@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.data
-
-import com.ehviewer.core.util.unreachable
+package com.ehviewer.core.model
 
 interface GalleryInfo {
     var gid: Long
@@ -133,11 +131,3 @@ interface GalleryInfo {
         const val LOCAL_FAVORITED = -1
     }
 }
-
-fun GalleryInfo.findBaseInfo(): BaseGalleryInfo = when (this) {
-    is BaseGalleryInfo -> this
-    is GalleryDetail -> galleryInfo
-    else -> unreachable()
-}
-
-fun GalleryInfo.asGalleryDetail(): GalleryDetail? = this as? GalleryDetail

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryPreview.kt

@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
-import com.hippo.ehviewer.client.getThumbKey
-import com.hippo.ehviewer.client.getV2PreviewKey
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.cbor.CborArray
@@ -24,7 +22,6 @@ import kotlinx.serialization.cbor.CborArray
 @Serializable
 sealed interface GalleryPreview {
     val url: String
-    val imageKey: String
     val position: Int
     val pToken: String
 }
@@ -35,9 +32,7 @@ data class V1GalleryPreview(
     override val url: String,
     override val position: Int,
     override val pToken: String,
-) : GalleryPreview {
-    override val imageKey get() = getThumbKey(url)
-}
+) : GalleryPreview
 
 @Serializable
 @SerialName("V2")
@@ -48,9 +43,7 @@ data class V2GalleryPreview(
     val offsetX: Int,
     val clipWidth: Int,
     val clipHeight: Int,
-) : GalleryPreview {
-    override val imageKey get() = getV2PreviewKey(url)
-}
+) : GalleryPreview
 
 @Serializable
 @CborArray

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryTag.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
 import kotlinx.serialization.Serializable
 

core/common/src/commonMain/kotlin/com/ehviewer/core/model/GalleryTagGroup.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
 import kotlinx.serialization.Serializable
 

core/common/src/commonMain/kotlin/com/ehviewer/core/model/TagNamespace.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.client.data
+package com.ehviewer.core.model
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable

core/data/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
     alias(libs.plugins.ehviewer.multiplatform.library)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.room)
 }
 
 kotlin {
@@ -8,6 +10,7 @@ kotlin {
             dependencies {
                 api(projects.core.common)
                 api(libs.androidx.datastore)
+                api(libs.androidx.room.paging)
             }
         }
         androidMain {
@@ -16,3 +19,11 @@ kotlin {
         }
     }
 }
+
+dependencies {
+    add("kspAndroid", libs.androidx.room.compiler)
+}
+
+room {
+    schemaDirectory("$projectDir/schemas")
+}

core/data/src/commonMain/kotlin/com/ehviewer/core/data/model/GalleryInfo.kt

@@ -0,0 +1,31 @@
+package com.ehviewer.core.data.model
+
+import com.ehviewer.core.database.model.GalleryEntity
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.unreachable
+
+fun GalleryInfo.findBaseInfo(): BaseGalleryInfo = when (this) {
+    is BaseGalleryInfo -> this
+    is GalleryDetail -> galleryInfo
+    else -> unreachable()
+}
+
+fun GalleryInfo.asGalleryDetail(): GalleryDetail? = this as? GalleryDetail
+
+fun GalleryInfo.asEntity() = this as? GalleryEntity ?: GalleryEntity(
+    gid = gid,
+    token = token,
+    title = title,
+    titleJpn = titleJpn,
+    thumbKey = thumbKey,
+    category = category,
+    posted = posted,
+    uploader = uploader,
+    rating = rating,
+    simpleTags = simpleTags,
+    pages = pages,
+    simpleLanguage = simpleLanguage,
+    favoriteSlot = favoriteSlot,
+)

core/data/src/commonMain/kotlin/com/ehviewer/core/database/Database.kt

@@ -1,16 +1,39 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database
 
 import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.database.dao.DownloadArtistDao
+import com.ehviewer.core.database.dao.DownloadDirnameDao
+import com.ehviewer.core.database.dao.DownloadLabelDao
+import com.ehviewer.core.database.dao.DownloadsDao
+import com.ehviewer.core.database.dao.FilterDao
+import com.ehviewer.core.database.dao.GalleryDao
+import com.ehviewer.core.database.dao.HistoryDao
+import com.ehviewer.core.database.dao.LocalFavoritesDao
+import com.ehviewer.core.database.dao.ProgressDao
+import com.ehviewer.core.database.dao.QuickSearchDao
+import com.ehviewer.core.database.dao.SearchDao
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.database.model.DownloadDirname
+import com.ehviewer.core.database.model.DownloadEntity
+import com.ehviewer.core.database.model.DownloadLabel
+import com.ehviewer.core.database.model.Filter
+import com.ehviewer.core.database.model.FilterModeConverter
+import com.ehviewer.core.database.model.GalleryEntity
+import com.ehviewer.core.database.model.GalleryFtsEntity
+import com.ehviewer.core.database.model.HistoryInfo
+import com.ehviewer.core.database.model.LocalFavoriteInfo
+import com.ehviewer.core.database.model.ProgressInfo
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.database.model.Search
 
 @Database(
     entities = [
-        BaseGalleryInfo::class, DownloadLabel::class, DownloadEntity::class, DownloadDirname::class, DownloadArtist::class,
+        GalleryEntity::class, DownloadLabel::class, DownloadEntity::class, DownloadDirname::class, DownloadArtist::class,
         Filter::class, HistoryInfo::class, LocalFavoriteInfo::class, ProgressInfo::class, QuickSearch::class,
-        GalleryEntityFts::class,
+        GalleryFtsEntity::class,
     ],
     version = 23,
     exportSchema = true,

core/data/src/commonMain/kotlin/com/ehviewer/core/database/DatabaseMigrations.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database
 
 import androidx.room.DeleteColumn
 import androidx.room.DeleteTable
@@ -6,11 +6,12 @@ import androidx.room.RenameColumn
 import androidx.room.RenameTable
 import androidx.room.migration.AutoMigrationSpec
 import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
+import androidx.sqlite.SQLiteConnection
+import androidx.sqlite.execSQL
+import com.ehviewer.core.model.GalleryInfo.Companion.NOT_FAVORITED
 
 class Schema4to5 : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+    override fun onPostMigrate(connection: SQLiteConnection) {
         val needMigrationTables = arrayOf(
             "DOWNLOADS",
             "HISTORY",
@@ -23,7 +24,7 @@ class Schema4to5 : AutoMigrationSpec {
         )
         needMigrationTables.forEach { table ->
             prefixToRemove.forEach { prefix ->
-                db.execSQL("UPDATE $table SET thumb = SUBSTR(thumb ,LENGTH('$prefix') + 1) WHERE thumb LIKE '$prefix%'")
+                connection.execSQL("UPDATE $table SET thumb = SUBSTR(thumb ,LENGTH('$prefix') + 1) WHERE thumb LIKE '$prefix%'")
             }
         }
     }
@@ -34,13 +35,13 @@ class Schema6to7 : AutoMigrationSpec
 
 @RenameColumn(tableName = "HISTORY", fromColumnName = "MODE", toColumnName = "FAVORITE_SLOT")
 class Schema9to10 : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
-        db.execSQL("UPDATE HISTORY SET FAVORITE_SLOT = FAVORITE_SLOT - 2")
+    override fun onPostMigrate(connection: SQLiteConnection) {
+        connection.execSQL("UPDATE HISTORY SET FAVORITE_SLOT = FAVORITE_SLOT - 2")
     }
 }
 
 class Schema10to11 : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+    override fun onPostMigrate(connection: SQLiteConnection) {
         val needMigrationTables = arrayOf(
             "QUICK_SEARCH",
             "DOWNLOAD_LABELS",
@@ -48,7 +49,7 @@ class Schema10to11 : AutoMigrationSpec {
         )
         needMigrationTables.forEach { table ->
             // TODO: Rewrite this with row_number() when min sdk is 30 (SQLite 3.28.0)
-            db.execSQL("UPDATE $table SET POSITION = (SELECT COUNT(*) FROM $table T WHERE T.TIME < $table.TIME)")
+            connection.execSQL("UPDATE $table SET POSITION = (SELECT COUNT(*) FROM $table T WHERE T.TIME < $table.TIME)")
         }
     }
 }
@@ -58,14 +59,14 @@ class Schema10to11 : AutoMigrationSpec {
 class Schema11to12 : AutoMigrationSpec
 
 class Schema12to13 : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+    override fun onPostMigrate(connection: SQLiteConnection) {
         val needMigrationTables = arrayOf(
             "HISTORY",
             "DOWNLOADS",
             "LOCAL_FAVORITES",
         )
         needMigrationTables.forEachIndexed { index, table ->
-            db.execSQL(
+            connection.execSQL(
                 "INSERT OR IGNORE INTO GALLERIES " +
                     "SELECT GID, TOKEN, TITLE, TITLE_JPN, THUMB, CATEGORY, POSTED, UPLOADER, RATING, SIMPLE_LANGUAGE, " +
                     "${if (index == 0) "FAVORITE_SLOT" else NOT_FAVORITED} FROM $table",
@@ -105,11 +106,11 @@ class Schema12to13 : AutoMigrationSpec {
 class Schema13to14 : AutoMigrationSpec
 
 class Schema17to18 : Migration(17, 18) {
-    override fun migrate(db: SupportSQLiteDatabase) {
-        db.execSQL("CREATE TABLE IF NOT EXISTS `_new_GALLERIES` (`GID` INTEGER NOT NULL, `TOKEN` TEXT NOT NULL, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))")
-        db.execSQL("INSERT INTO `_new_GALLERIES` (`GID`,`TOKEN`,`TITLE`,`TITLE_JPN`,`THUMB`,`CATEGORY`,`POSTED`,`UPLOADER`,`RATING`,`SIMPLE_LANGUAGE`,`FAVORITE_SLOT`) SELECT `GID`,`TOKEN`,`TITLE`,`TITLE_JPN`,`THUMB`,`CATEGORY`,`POSTED`,`UPLOADER`,`RATING`,`SIMPLE_LANGUAGE`,`FAVORITE_SLOT` FROM `GALLERIES` WHERE `TOKEN` IS NOT NULL")
-        db.execSQL("DROP TABLE `GALLERIES`")
-        db.execSQL("ALTER TABLE `_new_GALLERIES` RENAME TO `GALLERIES`")
+    override fun migrate(connection: SQLiteConnection) {
+        connection.execSQL("CREATE TABLE IF NOT EXISTS `_new_GALLERIES` (`GID` INTEGER NOT NULL, `TOKEN` TEXT NOT NULL, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))")
+        connection.execSQL("INSERT INTO `_new_GALLERIES` (`GID`,`TOKEN`,`TITLE`,`TITLE_JPN`,`THUMB`,`CATEGORY`,`POSTED`,`UPLOADER`,`RATING`,`SIMPLE_LANGUAGE`,`FAVORITE_SLOT`) SELECT `GID`,`TOKEN`,`TITLE`,`TITLE_JPN`,`THUMB`,`CATEGORY`,`POSTED`,`UPLOADER`,`RATING`,`SIMPLE_LANGUAGE`,`FAVORITE_SLOT` FROM `GALLERIES` WHERE `TOKEN` IS NOT NULL")
+        connection.execSQL("DROP TABLE `GALLERIES`")
+        connection.execSQL("ALTER TABLE `_new_GALLERIES` RENAME TO `GALLERIES`")
     }
 }
 
@@ -117,8 +118,8 @@ class Schema17to18 : Migration(17, 18) {
 class Schema18to19 : AutoMigrationSpec
 
 class Schema20to21 : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
-        db.execSQL("INSERT INTO GalleryFts(GalleryFts) VALUES('rebuild')")
+    override fun onPostMigrate(connection: SQLiteConnection) {
+        connection.execSQL("INSERT INTO GalleryFts(GalleryFts) VALUES('rebuild')")
     }
 }
 

core/data/src/commonMain/kotlin/com/ehviewer/core/database/dao/DownloadArtistDao.kt

@@ -1,9 +1,10 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import com.ehviewer.core.database.model.DownloadArtist
 
 @Dao
 interface DownloadArtistDao {

core/data/src/commonMain/kotlin/com/ehviewer/core/database/dao/DownloadDirnameDao.kt

@@ -1,10 +1,11 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Upsert
+import com.ehviewer.core.database.model.DownloadDirname
 
 @Dao
 interface DownloadDirnameDao {

core/data/src/commonMain/kotlin/com/ehviewer/core/database/dao/DownloadLabelDao.kt

@@ -1,10 +1,11 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
+import com.ehviewer.core.database.model.DownloadLabel
 
 @Dao
 interface DownloadLabelDao {

core/data/src/commonMain/kotlin/com/ehviewer/core/database/dao/DownloadsDao.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -9,6 +9,8 @@ import androidx.room.RoomWarnings
 import androidx.room.Transaction
 import androidx.room.Update
 import androidx.room.Upsert
+import com.ehviewer.core.database.model.DownloadEntity
+import com.ehviewer.core.database.model.DownloadInfo
 import kotlinx.coroutines.flow.Flow
 
 @Dao

core/data/src/commonMain/kotlin/com/ehviewer/core/database/dao/FilterDao.kt

@@ -1,10 +1,11 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
+import com.ehviewer.core.database.model.Filter
 
 @Dao
 interface FilterDao {

core/data/src/commonMain/kotlin/com/ehviewer/core/database/dao/GalleryDao.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.dao
+package com.ehviewer.core.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -7,30 +7,30 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import androidx.room.Upsert
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.database.model.GalleryEntity
 
 @Dao
 interface GalleryDao {
     @Query("SELECT * FROM GALLERIES WHERE GID = :gid")
-    suspend fun load(gid: Long): BaseGalleryInfo?
+    suspend fun load(gid: Long): GalleryEntity?
 
     @Query("SELECT * FROM GALLERIES")
-    suspend fun list(): List<BaseGalleryInfo>
+    suspend fun list(): List<GalleryEntity>
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertOrIgnore(galleryInfoList: List<BaseGalleryInfo>)
+    suspend fun insertOrIgnore(galleryInfoList: List<GalleryEntity>)
 
     @Update
-    suspend fun update(galleryInfo: BaseGalleryInfo)
+    suspend fun update(galleryInfo: GalleryEntity)
 
     @Update
-    suspend fun update(galleryInfoList: List<BaseGalleryInfo>)
+    suspend fun update(galleryInfoList: List<GalleryEntity>)
 
     @Upsert
-    suspend fun upsert(galleryInfo: BaseGalleryInfo)
+    suspend fun upsert(galleryInfo: GalleryEntity)
 
     @Delete
-    suspend fun delete(galleryInfo: BaseGalleryInfo)
+    suspend fun delete(galleryInfo: GalleryEntity)
 
     @Query("DELETE FROM GALLERIES WHERE GID = :gid")
     suspend fun deleteByKey(gid: Long)