Utilizing Glide

Fixed Reader FAB icon
Changed to use gallery id instead of galleryblock to open Reader

libpupil/src/main/java/xyz/quaver/hitomi/reader.kt

@@ -0,0 +1,72 @@
+package xyz.quaver.hitomi
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
+import kotlinx.serialization.list
+import org.jsoup.Jsoup
+import xyz.quaver.hiyobi.HiyobiReader
+import java.net.URL
+
+fun getReferer(galleryID: Int) = "https://hitomi.la/reader/$galleryID.html"
+fun webpUrlFromUrl(url: String) = url.replace("/galleries/", "/webp/") + ".webp"
+
+fun webpReaderFromReader(reader: Reader) : Reader {
+    if (reader is HiyobiReader)
+        return reader
+
+    return Reader(reader.title, reader.readerItems.map {
+        ReaderItem(
+            if (it.galleryInfo?.haswebp == 1) webpUrlFromUrl(it.url) else it.url,
+            it.galleryInfo
+        )
+    })
+}
+
+@Serializable
+data class GalleryInfo(
+    val width: Int,
+    val haswebp: Int,
+    val name: String,
+    val height: Int
+)
+@Serializable
+data class ReaderItem(
+    val url: String,
+    val galleryInfo: GalleryInfo?
+)
+
+@Serializable
+open class Reader(val title: String, val readerItems: List<ReaderItem>)
+
+//Set header `Referer` to reader url to avoid 403 error
+fun getReader(galleryID: Int) : Reader {
+    val readerUrl = "https://hitomi.la/reader/$galleryID.html"
+    val galleryInfoUrl = "https://ltn.hitomi.la/galleries/$galleryID.js"
+
+    val doc = Jsoup.connect(readerUrl).get()
+
+    val title = doc.title()
+
+    val images = doc.select(".img-url").map {
+        protocol + urlFromURL(it.text())
+    }
+
+    val galleryInfo = ArrayList<GalleryInfo?>()
+
+    galleryInfo.addAll(
+        Json(JsonConfiguration.Stable).parse(
+            GalleryInfo.serializer().list,
+            Regex("""\[.+]""").find(
+                URL(galleryInfoUrl).readText()
+            )?.value ?: "[]"
+        )
+    )
+
+    if (images.size > galleryInfo.size)
+        galleryInfo.addAll(arrayOfNulls(images.size - galleryInfo.size))
+
+    return Reader(title, (images zip galleryInfo).map {
+        ReaderItem(it.first, it.second)
+    })
+}

libpupil/src/main/java/xyz/quaver/hitomi/readers.kt

@@ -1,57 +0,0 @@
-package xyz.quaver.hitomi
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.list
-import org.jsoup.Jsoup
-import java.net.URL
-
-fun getReferer(galleryID: Int) = "https://hitomi.la/reader/$galleryID.html"
-
-@Serializable
-data class GalleryInfo(
-    val width: Int,
-    val haswebp: Int,
-    val name: String,
-    val height: Int
-)
-@Serializable
-data class ReaderItem(
-    val url: String,
-    val galleryInfo: GalleryInfo?
-)
-typealias Reader = List<ReaderItem>
-//Set header `Referer` to reader url to avoid 403 error
-fun getReader(galleryID: Int) : Reader {
-    val readerUrl = "https://hitomi.la/reader/$galleryID.html"
-    val galleryInfoUrl = "https://ltn.hitomi.la/galleries/$galleryID.js"
-
-    try {
-        val doc = Jsoup.connect(readerUrl).get()
-
-        val images = doc.select(".img-url").map {
-            protocol + urlFromURL(it.text())
-        }
-
-        val galleryInfo = ArrayList<GalleryInfo?>()
-
-        galleryInfo.addAll(
-            Json(JsonConfiguration.Stable).parse(
-                GalleryInfo.serializer().list,
-                Regex("""\[.+]""").find(
-                    URL(galleryInfoUrl).readText()
-                )?.value ?: "[]"
-            )
-        )
-
-        if (images.size > galleryInfo.size)
-            galleryInfo.addAll(arrayOfNulls(images.size - galleryInfo.size))
-
-        return (images zip galleryInfo).map {
-            ReaderItem(it.first, it.second)
-        }
-    } catch (e: Exception) {
-        return emptyList()
-    }
-}

libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt

@@ -1,9 +1,9 @@
 package xyz.quaver.hiyobi
 
-import kotlinx.io.IOException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.json.content
+import org.jsoup.Jsoup
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.ReaderItem
 import java.net.URL
@@ -12,13 +12,15 @@ import javax.net.ssl.HttpsURLConnection
 const val hiyobi = "xn--9w3b15m8vo.asia"
 const val user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36"
 
-var cookie: String = ""
-get() {
-    if (field.isEmpty())
-        field  = renewCookie()
+class HiyobiReader(title: String, readerItems: List<ReaderItem>) : Reader(title, readerItems)
 
-    return field
-}
+var cookie: String = ""
+    get() {
+        if (field.isEmpty())
+            field  = renewCookie()
+
+        return field
+    }
 
 fun renewCookie() : String {
     val url = "https://$hiyobi/"
@@ -35,26 +37,25 @@ fun renewCookie() : String {
     }
 }
 
-fun getReader(galleryId: Int) : Reader {
-    val url = "https://$hiyobi/data/json/${galleryId}_list.json"
+fun getReader(galleryID: Int) : Reader {
+    val reader = "https://$hiyobi/reader/$galleryID"
+    val url = "https://$hiyobi/data/json/${galleryID}_list.json"
 
-    try {
-        val json = Json(JsonConfiguration.Stable).parseJson(
-            with(URL(url).openConnection() as HttpsURLConnection) {
-                setRequestProperty("User-Agent", user_agent)
-                setRequestProperty("Cookie", cookie)
-                connectTimeout = 2000
-                connect()
+    val title = Jsoup.connect(reader).get().title()
 
-                inputStream.bufferedReader().use { it.readText() }
-            }
-        )
+    val json = Json(JsonConfiguration.Stable).parseJson(
+        with(URL(url).openConnection() as HttpsURLConnection) {
+            setRequestProperty("User-Agent", user_agent)
+            setRequestProperty("Cookie", cookie)
+            connectTimeout = 2000
+            connect()
 
-        return json.jsonArray.map {
-            val name = it.jsonObject["name"]!!.content
-            ReaderItem("https://$hiyobi/data/$galleryId/$name", null)
+            inputStream.bufferedReader().use { it.readText() }
         }
-    } catch (e: Exception) {
-        return emptyList()
-    }
+    )
+
+    return Reader(title, json.jsonArray.map {
+        val name = it.jsonObject["name"]!!.content
+        ReaderItem("https://$hiyobi/data/$galleryID/$name", null)
+    })
 }