Handle getImage for delegate sources
This commit is contained in:
@@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.data.database.models.Track
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.data.track.mdlist.MdList
|
||||
import eu.kanade.tachiyomi.network.asObservableSuccess
|
||||
import eu.kanade.tachiyomi.network.awaitSuccess
|
||||
import eu.kanade.tachiyomi.source.model.MangasPage
|
||||
import eu.kanade.tachiyomi.source.model.MetadataMangasPage
|
||||
import eu.kanade.tachiyomi.source.model.Page
|
||||
@@ -194,9 +195,13 @@ class MangaDex(delegate: HttpSource, val context: Context) :
|
||||
}
|
||||
|
||||
override fun fetchImage(page: Page): Observable<Response> {
|
||||
return pageHandler.fetchImage(page) {
|
||||
super.fetchImage(it)
|
||||
}
|
||||
val call = pageHandler.getImageCall(page)
|
||||
return call?.asObservableSuccess() ?: super.fetchImage(page)
|
||||
}
|
||||
|
||||
override suspend fun getImage(page: Page): Response {
|
||||
val call = pageHandler.getImageCall(page)
|
||||
return call?.awaitSuccess() ?: super.getImage(page)
|
||||
}
|
||||
|
||||
override fun fetchImageUrl(page: Page): Observable<String> {
|
||||
|
||||
@@ -62,6 +62,7 @@ class MergedSource : HttpSource() {
|
||||
override fun fetchChapterList(manga: SManga) = throw UnsupportedOperationException()
|
||||
override suspend fun getChapterList(manga: SManga) = throw UnsupportedOperationException()
|
||||
override fun fetchImage(page: Page) = throw UnsupportedOperationException()
|
||||
override suspend fun getImage(page: Page): Response = throw UnsupportedOperationException()
|
||||
override fun fetchImageUrl(page: Page) = throw UnsupportedOperationException()
|
||||
|
||||
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList"))
|
||||
|
||||
Reference in New Issue
Block a user