Add custom Thumbnail Url. Support backup & restore (#1059)

* Add custom thumbnail url. Support backup & restore - add custom thumbnail url in edit info/custom - include it in backup n restore * increase chop char * edit chop char again to match screenshoot * tweak truncating middle part * apply edited cover to history, updates , others * simplify placeholder logic --------- Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
komikku-app · Feb 19, 2024 · 65c3c07 · 65c3c07
1 parent cbd6a45
commit 65c3c07
Show file tree

Hide file tree

Showing 29 changed files with 96 additions and 29 deletions.
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
@@ -55,22 +55,22 @@ fun Manga.copyFrom(other: SManga): Manga {
     // SY -->
     val author = other.author ?: ogAuthor
     val artist = other.artist ?: ogArtist
+    val thumbnailUrl = other.thumbnail_url ?: ogThumbnailUrl
     val description = other.description ?: ogDescription
     val genres = if (other.genre != null) {
         other.getGenres()
     } else {
         ogGenre
     }
     // SY <--
-    val thumbnailUrl = other.thumbnail_url ?: thumbnailUrl
     return this.copy(
         // SY -->
         ogAuthor = author,
         ogArtist = artist,
+        ogThumbnailUrl = thumbnailUrl,
         ogDescription = description,
         ogGenre = genres,
         // SY <--
-        thumbnailUrl = thumbnailUrl,
         // SY -->
         ogStatus = other.status.toLong(),
         // SY <--
@@ -86,11 +86,11 @@ fun SManga.toDomainManga(sourceId: Long): Manga {
         ogTitle = title,
         ogArtist = artist,
         ogAuthor = author,
+        ogThumbnailUrl = thumbnail_url,
         ogDescription = description,
         ogGenre = getGenres(),
         ogStatus = status.toLong(),
         // SY <--
-        thumbnailUrl = thumbnail_url,
         updateStrategy = update_strategy,
         initialized = initialized,
         source = sourceId,

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
@@ -86,7 +86,7 @@ private fun BrowseSourceComfortableGridItem(
             mangaId = manga.id,
             sourceId = manga.source,
             isMangaFavorite = manga.favorite,
-            url = manga.thumbnailUrl,
+            ogUrl = manga.thumbnailUrl,
             lastModified = manga.coverLastModified,
         ),
         coverAlpha = if (manga.favorite) CommonMangaItemDefaults.BrowseFavoriteCoverAlpha else 1f,

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
@@ -86,7 +86,7 @@ private fun BrowseSourceCompactGridItem(
             mangaId = manga.id,
             sourceId = manga.source,
             isMangaFavorite = manga.favorite,
-            url = manga.thumbnailUrl,
+            ogUrl = manga.thumbnailUrl,
             lastModified = manga.coverLastModified,
         ),
         coverAlpha = if (manga.favorite) CommonMangaItemDefaults.BrowseFavoriteCoverAlpha else 1f,

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
@@ -79,7 +79,7 @@ private fun BrowseSourceListItem(
             mangaId = manga.id,
             sourceId = manga.source,
             isMangaFavorite = manga.favorite,
-            url = manga.thumbnailUrl,
+            ogUrl = manga.thumbnailUrl,
             lastModified = manga.coverLastModified,
         ),
         coverAlpha = if (manga.favorite) CommonMangaItemDefaults.BrowseFavoriteCoverAlpha else 1f,

diff --git a/app/src/main/java/eu/kanade/presentation/history/HistoryScreenModelStateProvider.kt b/app/src/main/java/eu/kanade/presentation/history/HistoryScreenModelStateProvider.kt
@@ -103,7 +103,7 @@ class HistoryScreenModelStateProvider : PreviewParameterProvider<HistoryScreenMo
                             mangaId = Random.nextLong(),
                             sourceId = Random.nextLong(),
                             isMangaFavorite = Random.nextBoolean(),
-                            url = "https://example.com/cover.png",
+                            ogUrl = "https://example.com/cover.png",
                             lastModified = Random.nextLong(),
                         ),
                     ),

diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryWithRelationsProvider.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryWithRelationsProvider.kt
@@ -20,7 +20,7 @@ internal class HistoryWithRelationsProvider : PreviewParameterProvider<HistoryWi
             mangaId = 3L,
             sourceId = 4L,
             isMangaFavorite = false,
-            url = "https://example.com/cover.png",
+            ogUrl = "https://example.com/cover.png",
             lastModified = 5L,
         ),
     )
@@ -39,7 +39,7 @@ internal class HistoryWithRelationsProvider : PreviewParameterProvider<HistoryWi
             mangaId = 3L,
             sourceId = 4L,
             isMangaFavorite = false,
-            url = "https://example.com/cover.png",
+            ogUrl = "https://example.com/cover.png",
             lastModified = 5L,
         ),
     )
@@ -58,7 +58,7 @@ internal class HistoryWithRelationsProvider : PreviewParameterProvider<HistoryWi
             mangaId = 3L,
             sourceId = 4L,
             isMangaFavorite = false,
-            url = "https://example.com/cover.png",
+            ogUrl = "https://example.com/cover.png",
             lastModified = 5L,
         ),
     )

diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
@@ -41,7 +41,7 @@ internal fun LibraryComfortableGrid(
                     mangaId = manga.id,
                     sourceId = manga.source,
                     isMangaFavorite = manga.favorite,
-                    url = manga.thumbnailUrl,
+                    ogUrl = manga.thumbnailUrl,
                     lastModified = manga.coverLastModified,
                 ),
                 coverBadgeStart = {

diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
@@ -42,7 +42,7 @@ internal fun LibraryCompactGrid(
                     mangaId = manga.id,
                     sourceId = manga.source,
                     isMangaFavorite = manga.favorite,
-                    url = manga.thumbnailUrl,
+                    ogUrl = manga.thumbnailUrl,
                     lastModified = manga.coverLastModified,
                 ),
                 coverBadgeStart = {

diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
@@ -51,7 +51,7 @@ internal fun LibraryList(
                     mangaId = manga.id,
                     sourceId = manga.source,
                     isMangaFavorite = manga.favorite,
-                    url = manga.thumbnailUrl,
+                    ogUrl = manga.thumbnailUrl,
                     lastModified = manga.coverLastModified,
                 ),
                 badge = {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt
@@ -140,6 +140,7 @@ private fun Manga.toBackupManga(/* SY --> */customMangaInfo: CustomMangaInfo?/*
             backupManga.customTitle = it.title
             backupManga.customArtist = it.artist
             backupManga.customAuthor = it.author
+            backupManga.customThumbnailUrl = it.thumbnailUrl
             backupManga.customDescription = it.description
             backupManga.customGenre = it.genre
             backupManga.customStatus = it.status?.toInt() ?: 0

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
@@ -45,6 +45,7 @@ data class BackupManga(
     @ProtoNumber(600) var mergedMangaReferences: List<BackupMergedMangaReference> = emptyList(),
     @ProtoNumber(601) var flatMetadata: BackupFlatMetadata? = null,
     @ProtoNumber(602) var customStatus: Int = 0,
+    @ProtoNumber(603) var customThumbnailUrl: String? = null,
 
     // J2K specific values
     @ProtoNumber(800) var customTitle: String? = null,
@@ -53,6 +54,7 @@ data class BackupManga(
     // skipping 803 due to using duplicate value in previous builds
     @ProtoNumber(804) var customDescription: String? = null,
     @ProtoNumber(805) var customGenre: List<String>? = null,
+
 ) {
     fun getMangaImpl(): Manga {
         return Manga.create().copy(
@@ -61,11 +63,11 @@ data class BackupManga(
             ogTitle = this@BackupManga.title,
             ogArtist = this@BackupManga.artist,
             ogAuthor = this@BackupManga.author,
+            ogThumbnailUrl = this@BackupManga.thumbnailUrl,
             ogDescription = this@BackupManga.description,
             ogGenre = this@BackupManga.genre,
             ogStatus = this@BackupManga.status.toLong(),
             // SY <--
-            thumbnailUrl = this@BackupManga.thumbnailUrl,
             favorite = this@BackupManga.favorite,
             source = this@BackupManga.source,
             dateAdded = this@BackupManga.dateAdded,

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt
@@ -120,7 +120,7 @@ class MangaRestorer(
             ogArtist = newer.artist,
             ogDescription = newer.description,
             ogGenre = newer.genre,
-            thumbnailUrl = newer.thumbnailUrl,
+            ogThumbnailUrl = newer.thumbnailUrl,
             ogStatus = newer.status,
             // SY <--
             initialized = this.initialized || newer.initialized,
@@ -507,6 +507,7 @@ class MangaRestorer(
         if (customTitle != null ||
             customArtist != null ||
             customAuthor != null ||
+            customThumbnailUrl != null ||
             customDescription != null ||
             customGenre != null ||
             customStatus != 0
@@ -516,6 +517,7 @@ class MangaRestorer(
                 title = customTitle,
                 author = customAuthor,
                 artist = customArtist,
+                thumbnailUrl = customThumbnailUrl,
                 description = customDescription,
                 genre = customGenre,
                 status = customStatus.takeUnless { it == 0 }?.toLong(),

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
@@ -729,6 +729,7 @@ class LibraryScreenModel(
                 title = editedTitle.nullIfBlank(),
                 author = manga.author.takeUnless { it == manga.ogAuthor },
                 artist = manga.artist.takeUnless { it == manga.ogArtist },
+                thumbnailUrl = manga.thumbnailUrl.takeUnless { it == manga.ogThumbnailUrl },
                 description = manga.description.takeUnless { it == manga.ogDescription },
                 genre = manga.genre.takeUnless { it == manga.ogGenre },
                 status = manga.status.takeUnless { it == manga.ogStatus }?.toLong(),

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
@@ -50,6 +50,7 @@ fun EditMangaDialog(
         title: String?,
         author: String?,
         artist: String?,
+        thumbnailUrl: String?,
         description: String?,
         tags: List<String>?,
         status: Long?,
@@ -69,6 +70,7 @@ fun EditMangaDialog(
                         binding.title.text.toString(),
                         binding.mangaAuthor.text.toString(),
                         binding.mangaArtist.text.toString(),
+                        binding.thumbnailUrl.text.toString(),
                         binding.mangaDescription.text.toString(),
                         binding.mangaGenresTags.getTextStrings(),
                         binding.status.selectedItemPosition.let {
@@ -157,6 +159,7 @@ private fun onViewCreated(manga: Manga, context: Context, binding: EditMangaDial
         binding.title.hint = context.stringResource(SYMR.strings.title_hint, manga.url)
         binding.mangaAuthor.setText(manga.author.orEmpty())
         binding.mangaArtist.setText(manga.artist.orEmpty())
+        binding.thumbnailUrl.setText(manga.thumbnailUrl.orEmpty())
         binding.mangaDescription.setText(manga.description.orEmpty())
         binding.mangaGenresTags.setChips(manga.genre.orEmpty().dropBlank(), scope)
     } else {
@@ -169,19 +172,30 @@ private fun onViewCreated(manga: Manga, context: Context, binding: EditMangaDial
         if (manga.artist != manga.ogArtist) {
             binding.mangaArtist.append(manga.artist.orEmpty())
         }
+        if (manga.thumbnailUrl != manga.ogThumbnailUrl) {
+            binding.thumbnailUrl.append(manga.thumbnailUrl.orEmpty())
+        }
         if (manga.description != manga.ogDescription) {
             binding.mangaDescription.append(manga.description.orEmpty())
         }
         binding.mangaGenresTags.setChips(manga.genre.orEmpty().dropBlank(), scope)
 
         binding.title.hint = context.stringResource(SYMR.strings.title_hint, manga.ogTitle)
+
         binding.mangaAuthor.hint = context.stringResource(SYMR.strings.author_hint, manga.ogAuthor ?: "")
         binding.mangaArtist.hint = context.stringResource(SYMR.strings.artist_hint, manga.ogArtist ?: "")
         binding.mangaDescription.hint =
             context.stringResource(
                 SYMR.strings.description_hint,
                 manga.ogDescription?.takeIf { it.isNotBlank() }?.let { it.replace("\n", " ").chop(20) } ?: ""
             )
+        binding.thumbnailUrl.hint =
+            context.stringResource(
+                SYMR.strings.thumbnail_url_hint,
+                manga.ogThumbnailUrl?.let {
+                    it.chop(40) + if (it.length > 46) "." + it.substringAfterLast(".").chop(6) else ""
+                } ?: ""
+            )
     }
     binding.mangaGenresTags.clearFocus()
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
@@ -488,6 +488,7 @@ class MangaScreenModel(
         title: String?,
         author: String?,
         artist: String?,
+        thumbnailUrl: String?,
         description: String?,
         tags: List<String>?,
         status: Long?,
@@ -498,11 +499,13 @@ class MangaScreenModel(
             val newTitle = if (title.isNullOrBlank()) manga.url else title.trim()
             val newAuthor = author?.trimOrNull()
             val newArtist = artist?.trimOrNull()
+            val newThumbnailUrl = thumbnailUrl?.trimOrNull()
             val newDesc = description?.trimOrNull()
             manga = manga.copy(
                 ogTitle = newTitle,
                 ogAuthor = author?.trimOrNull(),
                 ogArtist = artist?.trimOrNull(),
+                ogThumbnailUrl = thumbnailUrl?.trimOrNull(),
                 ogDescription = description?.trimOrNull(),
                 ogGenre = tags?.nullIfEmpty(),
                 ogStatus = status ?: 0,
@@ -516,6 +519,7 @@ class MangaScreenModel(
                         title = newTitle,
                         author = newAuthor,
                         artist = newArtist,
+                        thumbnailUrl = newThumbnailUrl,
                         description = newDesc,
                         genre = tags,
                         status = status,
@@ -534,6 +538,7 @@ class MangaScreenModel(
                     title?.trimOrNull(),
                     author?.trimOrNull(),
                     artist?.trimOrNull(),
+                    thumbnailUrl?.trimOrNull(),
                     description?.trimOrNull(),
                     genre,
                     status.takeUnless { it == state.manga.ogStatus },

diff --git a/app/src/main/res/layout/edit_manga_dialog.xml b/app/src/main/res/layout/edit_manga_dialog.xml
@@ -87,6 +87,22 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp">
+
+        <eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText
+            android:id="@+id/thumbnail_url"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text|textMultiLine"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
     <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
         android:layout_width="match_parent"

diff --git a/data/src/main/java/tachiyomi/data/history/HistoryMapper.kt b/data/src/main/java/tachiyomi/data/history/HistoryMapper.kt
@@ -44,7 +44,7 @@ object HistoryMapper {
             mangaId = mangaId,
             sourceId = sourceId,
             isMangaFavorite = isFavorite,
-            url = thumbnailUrl,
+            ogUrl = thumbnailUrl,
             lastModified = coverLastModified,
         ),
     )

diff --git a/data/src/main/java/tachiyomi/data/manga/CustomMangaRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/CustomMangaRepositoryImpl.kt
@@ -42,6 +42,7 @@ class CustomMangaRepositoryImpl(context: Context) : CustomMangaRepository {
             mangaInfo.title == null &&
             mangaInfo.author == null &&
             mangaInfo.artist == null &&
+            mangaInfo.thumbnailUrl == null &&
             mangaInfo.description == null &&
             mangaInfo.genre == null &&
             mangaInfo.status == null
@@ -72,6 +73,7 @@ class CustomMangaRepositoryImpl(context: Context) : CustomMangaRepository {
         val title: String? = null,
         val author: String? = null,
         val artist: String? = null,
+        val thumbnailUrl: String? = null,
         val description: String? = null,
         val genre: List<String>? = null,
         val status: Long? = null,
@@ -82,6 +84,7 @@ class CustomMangaRepositoryImpl(context: Context) : CustomMangaRepository {
             title = this@MangaJson.title?.takeUnless { it.isBlank() },
             author = this@MangaJson.author,
             artist = this@MangaJson.artist,
+            thumbnailUrl = this@MangaJson.thumbnailUrl,
             description = this@MangaJson.description,
             genre = this@MangaJson.genre,
             status = this@MangaJson.status?.takeUnless { it == 0L },
@@ -94,6 +97,7 @@ class CustomMangaRepositoryImpl(context: Context) : CustomMangaRepository {
             title,
             author,
             artist,
+            thumbnailUrl,
             description,
             genre,
             status,

diff --git a/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
@@ -49,11 +49,11 @@ object MangaMapper {
         ogTitle = title,
         ogArtist = artist,
         ogAuthor = author,
+        ogThumbnailUrl = thumbnailUrl,
         ogDescription = description,
         ogGenre = genre,
         ogStatus = status,
         // SY <--
-        thumbnailUrl = thumbnailUrl,
         updateStrategy = updateStrategy,
         initialized = initialized,
         lastModifiedAt = lastModifiedAt,
@@ -150,7 +150,7 @@ object MangaMapper {
                 ogDescription = libraryView.description,
                 ogGenre = libraryView.genre,
                 ogStatus = libraryView.status,
-                thumbnailUrl = libraryView.thumbnail_url,
+                ogThumbnailUrl = libraryView.thumbnail_url,
                 updateStrategy = libraryView.update_strategy,
                 initialized = libraryView.initialized,
                 fetchInterval = libraryView.calculate_interval.toInt(),

diff --git a/data/src/main/java/tachiyomi/data/updates/UpdatesRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/updates/UpdatesRepositoryImpl.kt
@@ -86,7 +86,7 @@ class UpdatesRepositoryImpl(
             mangaId = mangaId,
             sourceId = sourceId,
             isMangaFavorite = favorite,
-            url = thumbnailUrl,
+            ogUrl = thumbnailUrl,
             lastModified = coverLastModified,
         ),
     )
@@ -107,7 +107,7 @@ class UpdatesRepositoryImpl(
                 mangaId = updatesView.mangaId,
                 sourceId = updatesView.source,
                 isMangaFavorite = updatesView.favorite,
-                url = updatesView.thumbnailUrl,
+                ogUrl = updatesView.thumbnailUrl,
                 lastModified = updatesView.coverLastModified,
             ),
         )