temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-04 03:14:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Delete outdated thumbnails when inserting mangas into database (#739)

Browse Source 
In case the database got deleted without deleting cached/downloaded thumbnails, the next time a manga gets inserted, it's possible that a thumbnail was already downloaded for its id.
This then causes mangas to be displayed with incorrect thumbnails due to using the outdated cached/downloaded thumbnails
This commit is contained in:
schroda
2023-10-29 16:02:23 +01:00
committed by GitHub
parent 05707e29d7
commit 6531b80998
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,7 +329,7 @@ object Manga {
return fetchMangaThumbnail(mangaId) return fetchMangaThumbnail(mangaId)
} }
private fun clearThumbnail(mangaId: Int) { fun clearThumbnail(mangaId: Int) {
val fileName = mangaId.toString() val fileName = mangaId.toString()
clearCachedImage(applicationDirs.tempThumbnailCacheRoot, fileName) clearCachedImage(applicationDirs.tempThumbnailCacheRoot, fileName)

33
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt
View File

@@ -56,20 +56,26 @@ object MangaList {
(MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId) (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId)
}.firstOrNull() }.firstOrNull()
if (mangaEntry == null) { // create manga entry if (mangaEntry == null) { // create manga entry
MangaTable.insertAndGetId { val mangaId =
it[url] = manga.url MangaTable.insertAndGetId {
it[title] = manga.title it[url] = manga.url
it[title] = manga.title
it[artist] = manga.artist it[artist] = manga.artist
it[author] = manga.author it[author] = manga.author
it[description] = manga.description it[description] = manga.description
it[genre] = manga.genre it[genre] = manga.genre
it[status] = manga.status it[status] = manga.status
it[thumbnail_url] = manga.thumbnail_url it[thumbnail_url] = manga.thumbnail_url
it[updateStrategy] = manga.update_strategy.name it[updateStrategy] = manga.update_strategy.name
it[sourceReference] = sourceId it[sourceReference] = sourceId
}.value }.value
// delete thumbnail in case cached data still exists
Manga.clearThumbnail(mangaId)
mangaId
} else { } else {
mangaEntry[MangaTable.id].value mangaEntry[MangaTable.id].value
} }
@@ -103,6 +109,9 @@ object MangaList {
it[sourceReference] = sourceId it[sourceReference] = sourceId
}.value }.value
// delete thumbnail in case cached data still exists
Manga.clearThumbnail(mangaId)
mangaEntry = mangaEntry =
MangaTable.select { MangaTable.select {
(MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId) (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId)

4
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
View File

@@ -22,6 +22,7 @@ import org.jetbrains.exposed.sql.transactions.transaction
import org.jetbrains.exposed.sql.update import org.jetbrains.exposed.sql.update
import suwayomi.tachidesk.manga.impl.Category import suwayomi.tachidesk.manga.impl.Category
import suwayomi.tachidesk.manga.impl.CategoryManga import suwayomi.tachidesk.manga.impl.CategoryManga
import suwayomi.tachidesk.manga.impl.Manga.clearThumbnail
import suwayomi.tachidesk.manga.impl.backup.models.Chapter import suwayomi.tachidesk.manga.impl.backup.models.Chapter
import suwayomi.tachidesk.manga.impl.backup.models.Manga import suwayomi.tachidesk.manga.impl.backup.models.Manga
import suwayomi.tachidesk.manga.impl.backup.models.Track import suwayomi.tachidesk.manga.impl.backup.models.Track
@@ -188,6 +189,9 @@ object ProtoBackupImport : ProtoBackupBase() {
it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added) it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added)
}.value }.value
// delete thumbnail in case cached data still exists
clearThumbnail(mangaId)
// insert chapter data // insert chapter data
val chaptersLength = chapters.size val chaptersLength = chapters.size
chapters.forEach { chapter -> chapters.forEach { chapter ->