Manga cover updates (#3101)

* cover caching overhaul

* add ui for removing custom cover

* skip some loading work

* minor cleanup

* allow refresh library metadata to refresh local manga

* rename metadata_date to cover_last_modified

* rearrange removeMangaFromLibrary

* change custom cover directory
add setting for updating cover when refreshing library

* remove toggle and explicit action for updating covers

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt

@@ -9,10 +9,10 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
+import eu.kanade.tachiyomi.util.isLocal
 import eu.kanade.tachiyomi.util.lang.isNullOrUnsubscribed
 import java.util.Date
 import rx.Observable
@@ -189,7 +189,7 @@ class ChaptersPresenter(
             observable = observable.filter { it.read }
         }
         if (onlyDownloaded()) {
-            observable = observable.filter { it.isDownloaded || it.manga.source == LocalSource.ID }
+            observable = observable.filter { it.isDownloaded || it.manga.isLocal() }
         }
         if (onlyBookmarked()) {
             observable = observable.filter { it.bookmark }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt

@@ -67,8 +67,6 @@ class MangaInfoController(private val fromSource: Boolean = false) :
 
     private var initialLoad: Boolean = true
 
-    private var thumbnailUrl: String? = null
-
     override fun createPresenter(): MangaInfoPresenter {
         val ctrl = parentController as MangaController
         return MangaInfoPresenter(
@@ -113,7 +111,7 @@ class MangaInfoController(private val fromSource: Boolean = false) :
 
         // Set SwipeRefresh to refresh manga data.
         binding.swipeRefresh.refreshes()
-            .onEach { fetchMangaFromSource() }
+            .onEach { fetchMangaFromSource(manualFetch = true) }
             .launchIn(scope)
 
         binding.mangaFullTitle.longClicks()
@@ -241,23 +239,20 @@ class MangaInfoController(private val fromSource: Boolean = false) :
         setFavoriteButtonState(manga.favorite)
 
         // Set cover if it wasn't already.
-        if (binding.mangaCover.drawable == null || manga.thumbnail_url != thumbnailUrl) {
-            thumbnailUrl = manga.thumbnail_url
-            val mangaThumbnail = manga.toMangaThumbnail()
+        val mangaThumbnail = manga.toMangaThumbnail()
 
+        GlideApp.with(view.context)
+            .load(mangaThumbnail)
+            .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+            .centerCrop()
+            .into(binding.mangaCover)
+
+        binding.backdrop?.let {
             GlideApp.with(view.context)
                 .load(mangaThumbnail)
                 .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                 .centerCrop()
-                .into(binding.mangaCover)
-
-            if (binding.backdrop != null) {
-                GlideApp.with(view.context)
-                    .load(mangaThumbnail)
-                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-                    .centerCrop()
-                    .into(binding.backdrop!!)
-            }
+                .into(it)
         }
 
         // Manga info section
@@ -422,10 +417,10 @@ class MangaInfoController(private val fromSource: Boolean = false) :
     /**
      * Start fetching manga information from source.
      */
-    private fun fetchMangaFromSource() {
+    private fun fetchMangaFromSource(manualFetch: Boolean = false) {
         setRefreshing(true)
         // Call presenter and start fetching manga information
-        presenter.fetchMangaFromSource()
+        presenter.fetchMangaFromSource(manualFetch)
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt

@@ -12,6 +12,8 @@ import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.util.lang.isNullOrUnsubscribed
+import eu.kanade.tachiyomi.util.prepUpdateCover
+import eu.kanade.tachiyomi.util.removeCovers
 import java.util.Date
 import rx.Observable
 import rx.Subscription
@@ -36,11 +38,6 @@ class MangaInfoPresenter(
     private val coverCache: CoverCache = Injekt.get()
 ) : BasePresenter<MangaInfoController>() {
 
-    /**
-     * Subscription to send the manga to the view.
-     */
-    private var viewMangaSubscription: Subscription? = null
-
     /**
      * Subscription to update the manga from the source.
      */
@@ -48,7 +45,9 @@ class MangaInfoPresenter(
 
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
-        sendMangaToView()
+
+        getMangaObservable()
+            .subscribeLatestCache({ view, manga -> view.onNextManga(manga, source) })
 
         // Update chapter count
         chapterCountRelay.observeOn(AndroidSchedulers.mainThread())
@@ -64,22 +63,21 @@ class MangaInfoPresenter(
             .subscribeLatestCache(MangaInfoController::setLastUpdateDate)
     }
 
-    /**
-     * Sends the active manga to the view.
-     */
-    fun sendMangaToView() {
-        viewMangaSubscription?.let { remove(it) }
-        viewMangaSubscription = Observable.just(manga)
-            .subscribeLatestCache({ view, manga -> view.onNextManga(manga, source) })
+    private fun getMangaObservable(): Observable<Manga> {
+        return db.getManga(manga.url, manga.source).asRxObservable()
+            .observeOn(AndroidSchedulers.mainThread())
     }
 
     /**
      * Fetch manga information from source.
      */
-    fun fetchMangaFromSource() {
+    fun fetchMangaFromSource(manualFetch: Boolean = false) {
         if (!fetchMangaSubscription.isNullOrUnsubscribed()) return
         fetchMangaSubscription = Observable.defer { source.fetchMangaDetails(manga) }
             .map { networkManga ->
+                if (manualFetch || manga.thumbnail_url != networkManga.thumbnail_url) {
+                    manga.prepUpdateCover(coverCache)
+                }
                 manga.copyFrom(networkManga)
                 manga.initialized = true
                 db.insertManga(manga).executeAsBlocking()
@@ -87,7 +85,6 @@ class MangaInfoPresenter(
             }
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
-            .doOnNext { sendMangaToView() }
             .subscribeFirst(
                 { view, _ ->
                     view.onFetchMangaDone()
@@ -104,10 +101,9 @@ class MangaInfoPresenter(
     fun toggleFavorite(): Boolean {
         manga.favorite = !manga.favorite
         if (!manga.favorite) {
-            coverCache.deleteFromCache(manga.thumbnail_url)
+            manga.removeCovers(coverCache)
         }
         db.insertManga(manga).executeAsBlocking()
-        sendMangaToView()
         return manga.favorite
     }