mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-29 05:17:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:inorichi/tachiyomi into dev

Browse Source
This commit is contained in:
arkon
2020-05-10 23:11:44 -04:00
parent 530daeaa3a 5723c184b1
commit 6b71264482
4 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@@ -349,9 +349,7 @@ class LibraryUpdateService(
// Update manga details metadata in the background
source.fetchMangaDetails(manga)
.map { networkManga ->
if (manga.thumbnail_url != networkManga.thumbnail_url) {
manga.prepUpdateCover(coverCache)
}
manga.prepUpdateCover(coverCache, networkManga, false)
manga.copyFrom(networkManga)
db.insertManga(manga).executeAsBlocking()
manga
@@ -368,11 +366,23 @@ class LibraryUpdateService(
var count = 0
return Observable.from(mangaToUpdate)
.doOnNext { notifier.showProgressNotification(it, count++, mangaToUpdate.size) }
.map { manga ->
manga.prepUpdateCover(coverCache)
db.insertManga(manga).executeAsBlocking()
manga
.doOnNext {
notifier.showProgressNotification(it, count++, mangaToUpdate.size)
}
.flatMap { manga ->
val source = sourceManager.get(manga.source)
?: return@flatMap Observable.empty<LibraryManga>()
source.fetchMangaDetails(manga)
.map { networkManga ->
manga.prepUpdateCover(coverCache, networkManga, true)
networkManga.thumbnail_url?.let {
manga.thumbnail_url = it
db.insertManga(manga).executeAsBlocking()
}
manga
}
.onErrorReturn { manga }
}
.doOnCompleted {
notifier.cancelProgressNotification()