Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ChapterSourceSync: set default timestamp to max timestamp (#7197)

Browse Source 
(cherry picked from commit dd5da56695d8787ce5cf154b5d83aafaadf49def)
(cherry picked from commit 1d00dee9b7c349e365370fe20fda9e7cbce0b1f2)
This commit is contained in:
kasperskier 2022-06-05 00:48:18 +08:00 committed by Jobobby04
parent ac8e5cf78c
commit acc4d4a320
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
View File

@ -12,6 +12,7 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.util.Date import java.util.Date
import java.util.TreeSet import java.util.TreeSet
import kotlin.math.max
/** /**
* Helper method for syncing the list of chapters from the source with the ones from the database. * Helper method for syncing the list of chapters from the source with the ones from the database.
@ -60,6 +61,9 @@ fun syncChaptersWithSource(
} }
} }
var maxTimestamp = 0L // in previous chapters to add
val rightNow = Date().time
for (sourceChapter in sourceChapters) { for (sourceChapter in sourceChapters) {
// This forces metadata update for the main viewable things in the chapter list. // This forces metadata update for the main viewable things in the chapter list.
if (source is HttpSource) { if (source is HttpSource) {
@ -73,7 +77,9 @@ fun syncChaptersWithSource(
// Add the chapter if not in db already, or update if the metadata changed. // Add the chapter if not in db already, or update if the metadata changed.
if (dbChapter == null) { if (dbChapter == null) {
if (sourceChapter.date_upload == 0L) { if (sourceChapter.date_upload == 0L) {
sourceChapter.date_upload = Date().time sourceChapter.date_upload = if (maxTimestamp == 0L) rightNow else maxTimestamp
} else {
maxTimestamp = max(maxTimestamp, sourceChapter.date_upload)
} }
toAdd.add(sourceChapter) toAdd.add(sourceChapter)
} else { } else {
@ -98,6 +104,7 @@ fun syncChaptersWithSource(
return Pair(emptyList(), emptyList()) return Pair(emptyList(), emptyList())
} }
// Keep it a List instead of a Set. See #6372.
val readded = mutableListOf<Chapter>() val readded = mutableListOf<Chapter>()
db.inTransaction { db.inTransaction {
@ -170,6 +177,7 @@ fun syncChaptersWithSource(
db.updateLastUpdated(manga).executeAsBlocking() db.updateLastUpdated(manga).executeAsBlocking()
} }
@Suppress("ConvertArgumentToSet")
return Pair(toAdd.subtract(readded).toList(), toDelete.subtract(readded).toList()) return Pair(toAdd.subtract(readded).toList(), toDelete.subtract(readded).toList())
} }