From 07e5525c7433914f8e4b7dad03eb3081e622df48 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 7 Jul 2021 18:07:51 -0400 Subject: [PATCH] Fix chapter source order not working correctly and allow refresh to update source order Based on https://github.com/CarlosEsco/Neko/commit/00f916a4f0e8d677f8e2107e92139d43d88606ae Co-authored-by: CarlosEsco --- .../tachiyomi/util/chapter/ChapterSourceSync.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt index e229989e0c..ee3a535e6a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt @@ -74,6 +74,7 @@ fun syncChaptersWithSource( dbChapter.name = sourceChapter.name dbChapter.date_upload = sourceChapter.date_upload dbChapter.chapter_number = sourceChapter.chapter_number + dbChapter.source_order = sourceChapter.source_order toChange.add(dbChapter) } } @@ -158,7 +159,9 @@ fun syncChaptersWithSource( db.insertChapters(toChange).executeAsBlocking() } - val topChapters = db.getChapters(manga).executeAsBlocking().sortedByDescending { it.date_upload }.take(4) + val topChapters = db.getChapters(manga).executeAsBlocking() + .sortedByDescending { it.date_upload } + .take(4) // Recalculate next update since chapters were changed if (topChapters.size > 1) { var delta = 0L @@ -187,11 +190,11 @@ fun syncChaptersWithSource( return Pair(toAdd.subtract(readded).toList(), toDelete.subtract(readded).toList()) } -// checks if the chapter in db needs updated -private fun shouldUpdateDbChapter(dbChapter: Chapter, sourceChapter: SChapter): Boolean { +private fun shouldUpdateDbChapter(dbChapter: Chapter, sourceChapter: Chapter): Boolean { return dbChapter.scanlator != sourceChapter.scanlator || dbChapter.name != sourceChapter.name || dbChapter.date_upload != sourceChapter.date_upload || - dbChapter.chapter_number != sourceChapter.chapter_number + dbChapter.chapter_number != sourceChapter.chapter_number || + dbChapter.source_order != sourceChapter.source_order } class NoChaptersException : Exception()