Added code for saved reader
This commit is contained in:
@@ -31,7 +31,6 @@ import com.crashlytics.android.Crashlytics
|
|||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import kotlinx.serialization.json.JsonConfiguration
|
import kotlinx.serialization.json.JsonConfiguration
|
||||||
import xyz.quaver.availableInHiyobi
|
|
||||||
import xyz.quaver.hitomi.Reader
|
import xyz.quaver.hitomi.Reader
|
||||||
import xyz.quaver.hitomi.getReader
|
import xyz.quaver.hitomi.getReader
|
||||||
import xyz.quaver.hitomi.getReferer
|
import xyz.quaver.hitomi.getReferer
|
||||||
@@ -124,7 +123,7 @@ class GalleryDownloader(
|
|||||||
val cached = json.parse(serializer, cache.readText())
|
val cached = json.parse(serializer, cache.readText())
|
||||||
|
|
||||||
if (cached.galleryInfo.isNotEmpty()) {
|
if (cached.galleryInfo.isNotEmpty()) {
|
||||||
useHiyobi = availableInHiyobi(galleryID)
|
useHiyobi = cached.code == Reader.Code.HIYOBI
|
||||||
|
|
||||||
onReaderLoadedHandler?.invoke(cached)
|
onReaderLoadedHandler?.invoke(cached)
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,13 @@ data class GalleryInfo(
|
|||||||
)
|
)
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
open class Reader(val title: String, val galleryInfo: List<GalleryInfo>)
|
class Reader(val code:Code, val title: String, val galleryInfo: List<GalleryInfo>) {
|
||||||
|
enum class Code {
|
||||||
|
HITOMI,
|
||||||
|
HIYOBI,
|
||||||
|
SORALA
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Set header `Referer` to reader url to avoid 403 error
|
//Set header `Referer` to reader url to avoid 403 error
|
||||||
fun getReader(galleryID: Int) : Reader {
|
fun getReader(galleryID: Int) : Reader {
|
||||||
@@ -40,5 +46,5 @@ fun getReader(galleryID: Int) : Reader {
|
|||||||
|
|
||||||
val doc = Jsoup.connect(readerUrl).get()
|
val doc = Jsoup.connect(readerUrl).get()
|
||||||
|
|
||||||
return Reader(doc.title(), getGalleryInfo(galleryID))
|
return Reader(Reader.Code.HITOMI, doc.title(), getGalleryInfo(galleryID))
|
||||||
}
|
}
|
||||||
@@ -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) =
|
fun createImgList(galleryID: Int, reader: Reader) =
|
||||||
|
|||||||
Reference in New Issue
Block a user