diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt index cdbde5922..4f464dad7 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt @@ -23,7 +23,7 @@ class GetPagePreviews( return try { val pagePreviews = try { pagePreviewCache.getPageListFromCache(manga, chapterIds, page) - } catch (e: Exception) { + } catch (_: Exception) { source.getPagePreviewList(manga.toSManga(), chapters.map { it.toSChapter() }, page).also { pagePreviewCache.putPageListToCache(manga, chapterIds, it) } 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 2898dad0f..1fe268a1e 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 @@ -38,12 +38,14 @@ fun Manga.chaptersFiltered(): Boolean { fun Manga.toSManga(): SManga = SManga.create().also { it.url = url - it.title = title - it.artist = artist - it.author = author - it.description = description - it.genre = genre.orEmpty().joinToString() - it.status = status.toInt() + // SY --> + it.title = ogTitle + it.artist = ogArtist + it.author = ogAuthor + it.description = ogDescription + it.genre = ogGenre.orEmpty().joinToString() + it.status = ogStatus.toInt() + //SY <-- it.thumbnail_url = thumbnailUrl it.initialized = initialized } 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 index 79a73a057..35e458a97 100644 --- 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 @@ -118,13 +118,15 @@ class MangaBackupCreator( private fun Manga.toBackupManga(/* SY --> */customMangaInfo: CustomMangaInfo?/* SY <-- */) = BackupManga( url = this.url, - title = this.title, - artist = this.artist, - author = this.author, - description = this.description, - genre = this.genre.orEmpty(), - status = this.status.toInt(), - thumbnailUrl = this.thumbnailUrl, + // SY --> + title = this.ogTitle, + artist = this.ogArtist, + author = this.ogAuthor, + description = this.ogDescription, + genre = this.ogGenre.orEmpty(), + status = this.ogStatus.toInt(), + thumbnailUrl = this.ogThumbnailUrl, + // SY <-- favorite = this.favorite, source = this.source, dateAdded = this.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 index d47d86d74..bb7a292c7 100644 --- 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 @@ -139,13 +139,15 @@ class MangaRestorer( mangasQueries.update( source = manga.source, url = manga.url, - artist = manga.artist, - author = manga.author, - description = manga.description, - genre = manga.genre?.joinToString(separator = ", "), - title = manga.title, - status = manga.status, - thumbnailUrl = manga.thumbnailUrl, + // SY --> + artist = manga.ogArtist, + author = manga.ogAuthor, + description = manga.ogDescription, + genre = manga.ogGenre?.joinToString(separator = ", "), + title = manga.ogTitle, + status = manga.ogStatus, + thumbnailUrl = manga.ogThumbnailUrl, + // SY <-- favorite = manga.favorite, lastUpdate = manga.lastUpdate, nextUpdate = null, @@ -275,13 +277,15 @@ class MangaRestorer( mangasQueries.insert( source = manga.source, url = manga.url, - artist = manga.artist, - author = manga.author, - description = manga.description, - genre = manga.genre, - title = manga.title, - status = manga.status, - thumbnailUrl = manga.thumbnailUrl, + // SY --> + artist = manga.ogArtist, + author = manga.ogAuthor, + description = manga.ogDescription, + genre = manga.ogGenre, + title = manga.ogTitle, + status = manga.ogStatus, + thumbnailUrl = manga.ogThumbnailUrl, + // SY <-- favorite = manga.favorite, lastUpdate = manga.lastUpdate, nextUpdate = 0L,