diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt index 32a18e34..e942f0c8 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt +++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt @@ -31,7 +31,6 @@ import com.crashlytics.android.Crashlytics import kotlinx.coroutines.* import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonConfiguration -import xyz.quaver.availableInHiyobi import xyz.quaver.hitomi.Reader import xyz.quaver.hitomi.getReader import xyz.quaver.hitomi.getReferer @@ -124,7 +123,7 @@ class GalleryDownloader( val cached = json.parse(serializer, cache.readText()) if (cached.galleryInfo.isNotEmpty()) { - useHiyobi = availableInHiyobi(galleryID) + useHiyobi = cached.code == Reader.Code.HIYOBI onReaderLoadedHandler?.invoke(cached) diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/reader.kt b/libpupil/src/main/java/xyz/quaver/hitomi/reader.kt index 23c9174d..b02df73f 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/reader.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/reader.kt @@ -32,7 +32,13 @@ data class GalleryInfo( ) @Serializable -open class Reader(val title: String, val galleryInfo: List) +class Reader(val code:Code, val title: String, val galleryInfo: List) { + enum class Code { + HITOMI, + HIYOBI, + SORALA + } +} //Set header `Referer` to reader url to avoid 403 error fun getReader(galleryID: Int) : Reader { @@ -40,5 +46,5 @@ fun getReader(galleryID: Int) : Reader { val doc = Jsoup.connect(readerUrl).get() - return Reader(doc.title(), getGalleryInfo(galleryID)) + return Reader(Reader.Code.HITOMI, doc.title(), getGalleryInfo(galleryID)) } \ No newline at end of file diff --git a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt index f1ce9222..07c0a357 100644 --- a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt +++ b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt @@ -76,7 +76,7 @@ fun getReader(galleryID: Int) : Reader { } ) - return Reader(title, galleryInfo) + return Reader(Reader.Code.HIYOBI, title, galleryInfo) } fun createImgList(galleryID: Int, reader: Reader) =