Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-09 05:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update library while restore happens

Browse Source
This commit is contained in:
Jays2Kings 2021-03-26 01:55:42 -04:00
parent c21b91bc02
commit 41f4ea6f01
8 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
View File

@ -77,6 +77,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
restoreProgress += 1
showRestoreProgress(restoreProgress, restoreAmount, manga.title)
LibraryUpdateService.callListener(manga)
}
/**

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
View File

@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaImpl
import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.data.database.models.TrackImpl
import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.source.Source
import java.util.Date
@ -100,6 +101,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract
restoreProgress += 1
showRestoreProgress(restoreProgress, restoreAmount, manga.title)
LibraryUpdateService.callListener(manga)
}
/**

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

@ -180,7 +180,7 @@ class LibraryUpdateService(
if (wakeLock.isHeld) {
wakeLock.release()
}
listener?.onUpdateManga(LibraryManga())
listener?.onUpdateManga()
super.onDestroy()
}
@ -225,7 +225,7 @@ class LibraryUpdateService(
stopSelf(startId)
}
if (target == Target.CHAPTERS) {
listener?.onUpdateManga(LibraryManga())
listener?.onUpdateManga()
}
job = GlobalScope.launch(handler) {
when (target) {
@ -626,9 +626,13 @@ class LibraryUpdateService(
fun removeListener(listener: LibraryServiceListener) {
if (this.listener == listener) this.listener = null
}
fun callListener(manga: Manga) {
listener?.onUpdateManga(manga)
}
}
}
interface LibraryServiceListener {
fun onUpdateManga(manga: LibraryManga)
fun onUpdateManga(manga: Manga? = null)
}

6
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -1165,9 +1165,9 @@ class LibraryController(
}
}
override fun onUpdateManga(manga: LibraryManga) {
if (manga.id == null) adapter.notifyDataSetChanged()
else presenter.updateManga(manga)
override fun onUpdateManga(manga: Manga?) {
if (manga == null) adapter.notifyDataSetChanged()
else presenter.updateManga()
}
private fun setSelection(position: Int, selected: Boolean = true) {

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -737,7 +737,7 @@ class LibraryPresenter(
}
/** Called when Library Service updates a manga, update the item as well */
fun updateManga(manga: LibraryManga) {
fun updateManga() {
scope.launch {
getLibrary()
}

5
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
View File

@ -9,7 +9,6 @@ import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Category
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.LibraryManga
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaCategory
import eu.kanade.tachiyomi.data.database.models.Track
@ -599,8 +598,8 @@ class MangaDetailsPresenter(
toggleFavorite()
}
override fun onUpdateManga(manga: LibraryManga) {
if (manga.id == this.manga.id) {
override fun onUpdateManga(manga: Manga?) {
if (manga?.id == this.manga.id) {
fetchChapters()
}
}

3
app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersPresenter.kt
View File

@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.recent_updates
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.LibraryManga
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaChapter
import eu.kanade.tachiyomi.data.download.DownloadManager
@ -92,7 +91,7 @@ class RecentChaptersPresenter(
}
}
override fun onUpdateManga(manga: LibraryManga) {
override fun onUpdateManga(manga: Manga?) {
getUpdates()
}

7
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt
View File

@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.History
import eu.kanade.tachiyomi.data.database.models.HistoryImpl
import eu.kanade.tachiyomi.data.database.models.LibraryManga
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
import eu.kanade.tachiyomi.data.download.DownloadManager
@ -265,10 +264,10 @@ class RecentsPresenter(
}
}
override fun onUpdateManga(manga: LibraryManga) {
if (manga.id == null && !LibraryUpdateService.isRunning()) {
override fun onUpdateManga(manga: Manga?) {
if (manga == null && !LibraryUpdateService.isRunning()) {
scope.launch(Dispatchers.Main) { controller.setRefreshing(false) }
} else if (manga.id == null) {
} else if (manga == null) {
scope.launch(Dispatchers.Main) { controller.setRefreshing(true) }
} else {
getRecents()