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

change a dependency to try to fix merged sources

Browse Source
This commit is contained in:
Rani Sargees 2020-03-11 00:15:33 -04:00 committed by Jobobby04
parent 654d98b5c4
commit 97a86269e6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt
View File

@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
import android.net.Uri import android.net.Uri
import com.kizitonwose.time.hours import com.kizitonwose.time.hours
import com.lvla.rxjava.interopkt.toV1Single import hu.akarnokd.rxjava.interop.RxJavaInterop
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.* import eu.kanade.tachiyomi.source.model.*
@ -177,9 +177,9 @@ class EightMuses: HttpSource(),
return client.newCall(request) return client.newCall(request)
.asObservableSuccess() .asObservableSuccess()
.flatMapSingle { response -> .flatMapSingle { response ->
GlobalScope.async(Dispatchers.IO) { RxJavaInterop.toV1Single(GlobalScope.async(Dispatchers.IO) {
parseResultsPage(response, dig) parseResultsPage(response, dig)
}.asSingle(GlobalScope.coroutineContext).toV1Single() }.asSingle(GlobalScope.coroutineContext))
} }
} }
@ -252,9 +252,9 @@ class EightMuses: HttpSource(),
} }
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> { override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
return GlobalScope.async(Dispatchers.IO) { return RxJavaInterop.toV1Single(GlobalScope.async(Dispatchers.IO) {
fetchAndParseChapterList("", manga.url) fetchAndParseChapterList("", manga.url)
}.asSingle(GlobalScope.coroutineContext).toV1Single().toObservable() }.asSingle(GlobalScope.coroutineContext)).toObservable()
} }
private suspend fun fetchAndParseChapterList(prefix: String, url: String): List<SChapter> { private suspend fun fetchAndParseChapterList(prefix: String, url: String): List<SChapter> {

6
app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
View File

@ -4,7 +4,7 @@ import android.net.Uri
import com.github.salomonbrys.kotson.array import com.github.salomonbrys.kotson.array
import com.github.salomonbrys.kotson.string import com.github.salomonbrys.kotson.string
import com.google.gson.JsonParser import com.google.gson.JsonParser
import com.lvla.rxjava.interopkt.toV1Single import hu.akarnokd.rxjava.interop.RxJavaInterop
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.POST
import eu.kanade.tachiyomi.network.asObservable import eu.kanade.tachiyomi.network.asObservable
@ -129,7 +129,7 @@ class HBrowse : HttpSource(), LewdSource<HBrowseSearchMetadata, Document>, UrlIm
= throw UnsupportedOperationException("Should not be called!") = throw UnsupportedOperationException("Should not be called!")
private fun fetchSearchMangaInternal(page: Int, query: String, filters: FilterList): Observable<MangasPage> { private fun fetchSearchMangaInternal(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
return GlobalScope.async(Dispatchers.IO) { return RxJavaInterop.toV1Single(GlobalScope.async(Dispatchers.IO) {
val modeFilter = filters.filterIsInstance<ModeFilter>().firstOrNull() val modeFilter = filters.filterIsInstance<ModeFilter>().firstOrNull()
val sortFilter = filters.filterIsInstance<SortFilter>().firstOrNull() val sortFilter = filters.filterIsInstance<SortFilter>().firstOrNull()
@ -252,7 +252,7 @@ class HBrowse : HttpSource(), LewdSource<HBrowseSearchMetadata, Document>, UrlIm
hasNextPage hasNextPage
) )
} }
}.asSingle(GlobalScope.coroutineContext).toV1Single().toObservable() }.asSingle(GlobalScope.coroutineContext)).toObservable()
} }
// Collection must be sorted and cannot be sorted // Collection must be sorted and cannot be sorted