浏览代码

Include chapter fetch date when migrating

Based on https://github.com/Jays2Kings/tachiyomiJ2K/commit/ee4f3e6586910c8c4d62859c867c2a40e41eef67

Co-authored-by: Jays2Kings <[email protected]>
arkon 4 年之前
父节点
当前提交
1875c4a752
共有 1 个文件被更改,包括 6 次插入7 次删除
  1. 6 7
      app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt

+ 6 - 7
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt

@@ -105,19 +105,18 @@ class SearchPresenter(
                 val maxChapterRead = prevMangaChapters
                     .filter { it.read }
                     .maxByOrNull { it.chapter_number }?.chapter_number
-                val bookmarkedChapters = prevMangaChapters
-                    .filter { it.bookmark && it.isRecognizedNumber }
-                    .map { it.chapter_number }
                 if (maxChapterRead != null) {
                     val dbChapters = db.getChapters(manga).executeAsBlocking()
                     for (chapter in dbChapters) {
                         if (chapter.isRecognizedNumber) {
-                            if (chapter.chapter_number <= maxChapterRead) {
+                            val prevChapter = prevMangaChapters
+                                .find { it.isRecognizedNumber && it.chapter_number == chapter.chapter_number }
+                            if (prevChapter != null) {
+                                chapter.date_fetch = prevChapter.date_fetch
+                                chapter.bookmark = prevChapter.bookmark
+                            } else if (chapter.chapter_number <= maxChapterRead) {
                                 chapter.read = true
                             }
-                            if (chapter.chapter_number in bookmarkedChapters) {
-                                chapter.bookmark = true
-                            }
                         }
                     }
                     db.insertChapters(dbChapters).executeAsBlocking()