Fuck hitomi

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -58,38 +58,12 @@ data class OldGalleryBlock(
     val relatedTags: List<String>
 )
 
-@Serializable
-data class OldReader(val code: String, val galleryInfo: GalleryInfo)
-
-@Serializable
-data class OldMetadata(
-    var galleryBlock: OldGalleryBlock? = null,
-    var reader: OldReader? = null,
-    var imageList: MutableList<String?>? = null
-) {
-    fun copy(): OldMetadata = OldMetadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
-}
-
 @Serializable
 data class Metadata(
     var galleryBlock: GalleryBlock? = null,
     var galleryInfo: GalleryInfo? = null,
     var imageList: MutableList<String?>? = null
 ) {
-    constructor(old: OldMetadata) : this(old.galleryBlock?.let { galleryBlock -> GalleryBlock(
-        galleryBlock.id,
-        galleryBlock.galleryUrl,
-        galleryBlock.thumbnails,
-        galleryBlock.title,
-        galleryBlock.artists,
-        galleryBlock.series,
-        galleryBlock.type,
-        galleryBlock.language,
-        galleryBlock.relatedTags) },
-        old.reader?.galleryInfo,
-        old.imageList
-    )
-
     fun copy(): Metadata = Metadata(galleryBlock, galleryInfo, imageList?.let { MutableList(it.size) { i -> it[i] } })
 }
 
@@ -116,11 +90,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
 
     var metadata = kotlin.runCatching {
         findFile(".metadata")?.readText()?.let { metadata ->
-            kotlin.runCatching {
-                Json.decodeFromString<Metadata>(metadata)
-            }.getOrElse {
-                Metadata(Json.decodeFromString<OldMetadata>(metadata))
-            }
+            Json.decodeFromString<Metadata>(metadata)
         }
     }.getOrNull() ?: Metadata()
 

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -25,9 +25,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.getReferer
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
-import xyz.quaver.pupil.userAgent
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -79,7 +77,8 @@ fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
 val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
     "-id-" to { id.toString() },
     "-title-" to { title },
-    "-artist-" to { artists.joinToString() }
+    "-artist-" to { artists.joinToString() },
+    "-group-" to { groups.joinToString() }
     // TODO
 )
 /**
@@ -100,7 +99,7 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
     }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 
 suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    val galleryID = this.id ?: 0
+    val galleryID = this.id.toIntOrNull() ?: 0
     val lowQuality = Preferences["low_quality", true]
 
     return this.files.map {
@@ -115,7 +114,6 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
                 .getOrDefault("https://a/")
             )
             .header("Referer", "https://hitomi.la/")
-            .header("User-Agent", userAgent)
     }
 }