diff --git a/app/src/main/java/eu/kanade/domain/chapter/model/Chapter.kt b/app/src/main/java/eu/kanade/domain/chapter/model/Chapter.kt index 32d2381b1..28da13e37 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/model/Chapter.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/model/Chapter.kt @@ -13,6 +13,7 @@ fun Chapter.toSChapter(): SChapter { it.date_upload = dateUpload it.chapter_number = chapterNumber.toFloat() it.scanlator = scanlator + it.memo = memo } } @@ -23,6 +24,7 @@ fun Chapter.copyFromSChapter(sChapter: SChapter): Chapter { dateUpload = sChapter.date_upload, chapterNumber = sChapter.chapter_number.toDouble(), scanlator = sChapter.scanlator?.ifBlank { null }?.trim(), + memo = sChapter.memo, ) } @@ -39,4 +41,5 @@ fun Chapter.toDbChapter(): DbChapter = ChapterImpl().also { it.date_upload = dateUpload it.chapter_number = chapterNumber.toFloat() it.source_order = sourceOrder.toInt() + it.memo = memo } diff --git a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt index 2109d5191..ececb06d8 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt @@ -45,6 +45,7 @@ fun Manga.toSManga(): SManga = SManga.create().also { it.status = status.toInt() it.thumbnail_url = thumbnailUrl it.initialized = initialized + it.memo = memo } fun Manga.copyFrom(other: SManga): Manga { @@ -66,6 +67,7 @@ fun Manga.copyFrom(other: SManga): Manga { status = other.status.toLong(), updateStrategy = other.update_strategy, initialized = other.initialized && initialized, + memo = other.memo, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt index 2672d0887..57edc71d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/ChapterImpl.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.data.database.models import kotlinx.serialization.json.JsonObject +import mihon.core.common.extensions.EMPTY class ChapterImpl : Chapter { @@ -34,7 +35,7 @@ class ChapterImpl : Chapter { override var version: Long = 0 - override var memo: JsonObject = JsonObject(emptyMap()) + override var memo: JsonObject = JsonObject.EMPTY override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/domain/src/main/java/mihon/domain/manga/model/SManga.kt b/domain/src/main/java/mihon/domain/manga/model/SManga.kt index 033f313d0..49746b72f 100644 --- a/domain/src/main/java/mihon/domain/manga/model/SManga.kt +++ b/domain/src/main/java/mihon/domain/manga/model/SManga.kt @@ -15,6 +15,7 @@ fun SManga.toDomainManga(sourceId: Long): Manga { thumbnailUrl = thumbnail_url, updateStrategy = update_strategy, initialized = initialized, + memo = memo, source = sourceId, ) } diff --git a/domain/src/main/java/tachiyomi/domain/chapter/interactor/ShouldUpdateDbChapter.kt b/domain/src/main/java/tachiyomi/domain/chapter/interactor/ShouldUpdateDbChapter.kt index 56497a5fc..4e4179dec 100644 --- a/domain/src/main/java/tachiyomi/domain/chapter/interactor/ShouldUpdateDbChapter.kt +++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/ShouldUpdateDbChapter.kt @@ -9,6 +9,7 @@ class ShouldUpdateDbChapter { dbChapter.name != sourceChapter.name || dbChapter.dateUpload != sourceChapter.dateUpload || dbChapter.chapterNumber != sourceChapter.chapterNumber || - dbChapter.sourceOrder != sourceChapter.sourceOrder + dbChapter.sourceOrder != sourceChapter.sourceOrder || + dbChapter.memo != sourceChapter.memo } } diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt index 9ed836af6..9fd3d6175 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt @@ -36,6 +36,7 @@ interface SChapter : Serializable { date_upload = other.date_upload chapter_number = other.chapter_number scanlator = other.scanlator + memo = other.memo } companion object { diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt index 597271997..2ee6d7d23 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.source.model import kotlinx.serialization.json.JsonObject +import mihon.core.common.extensions.EMPTY class SChapterImpl : SChapter { @@ -16,5 +17,5 @@ class SChapterImpl : SChapter { override var date_upload: Long = 0 - override var memo: JsonObject = JsonObject(emptyMap()) + override var memo: JsonObject = JsonObject.EMPTY } diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt index 2f0c8852c..983c16c18 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt @@ -56,6 +56,7 @@ interface SManga : Serializable { it.thumbnail_url = thumbnail_url it.update_strategy = update_strategy it.initialized = initialized + it.memo = memo } companion object { diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt index 248cf6163..c3fcbf99a 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.source.model import kotlinx.serialization.json.JsonObject +import mihon.core.common.extensions.EMPTY class SMangaImpl : SManga { @@ -26,5 +27,5 @@ class SMangaImpl : SManga { override var initialized: Boolean = false - override var memo: JsonObject = JsonObject(emptyMap()) + override var memo: JsonObject = JsonObject.EMPTY }