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

Update view when chapters read status has changed

Browse Source
This commit is contained in:
Jobobby04 2020-05-23 21:39:05 -04:00
parent 35ef07d720
commit b803dbe3af
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt
View File

@ -99,10 +99,18 @@ class MangaAllInOnePresenter(
// Listen for download status changes // Listen for download status changes
observeDownloads() observeDownloads()
add(
db.getChapters(manga).asRxObservable().subscribe {
scope.launch(Dispatchers.IO) {
updateChaptersView(updateInfo = true)
}
}
)
} }
private fun updateChapters() { private suspend fun updateChapters() {
val chapters = db.getChapters(manga).executeAsBlocking().map { it.toModel() } val chapters = db.getChapters(manga).await().map { it.toModel() }
// Find downloaded chapters // Find downloaded chapters
setDownloadedChapters(chapters) setDownloadedChapters(chapters)
@ -136,9 +144,12 @@ class MangaAllInOnePresenter(
this.chapters = applyChapterFilters(chapters) this.chapters = applyChapterFilters(chapters)
} }
private fun updateChaptersView() { private fun updateChaptersView(updateInfo: Boolean = false) {
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
updateChapters() updateChapters()
if (updateInfo) {
updateChapterInfo()
}
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
Observable.just(manga) Observable.just(manga)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@ -161,7 +172,7 @@ class MangaAllInOnePresenter(
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
var manga2: Manga? = null var manga2: Manga? = null
if (updateInfo) { if (updateInfo) {
manga2 = db.getManga(manga.url, manga.source).executeAsBlocking() manga2 = db.getManga(manga.url, manga.source).await()
updateChapters() updateChapters()
updateChapterInfo() updateChapterInfo()
} }
@ -197,7 +208,7 @@ class MangaAllInOnePresenter(
manga.prepUpdateCover(coverCache, networkManga, manualFetch) manga.prepUpdateCover(coverCache, networkManga, manualFetch)
manga.copyFrom(networkManga) manga.copyFrom(networkManga)
manga.initialized = true manga.initialized = true
db.insertManga(manga).executeAsBlocking() db.insertManga(manga).await()
} }
} }
var chapters: List<SChapter> = listOf() var chapters: List<SChapter> = listOf()
@ -483,6 +494,11 @@ class MangaAllInOnePresenter(
} }
.toList() .toList()
.flatMap { db.updateChaptersProgress(it).asRxObservable() } .flatMap { db.updateChaptersProgress(it).asRxObservable() }
.doOnNext {
scope.launch {
updateChaptersView()
}
}
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe() .subscribe()
} }