Merge pull request #33 from tom5079/Pupil-29

Pupil-29

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)
 

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

@@ -18,8 +18,14 @@
 
 package xyz.quaver.pupil.util
 
+import android.content.Context
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.internal.EnumSerializer
 import kotlinx.serialization.json.*
+import xyz.quaver.availableInHiyobi
+import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.BuildConfig
+import java.io.File
 import java.net.URL
 
 fun getReleases(url: String) : JsonArray {
@@ -61,4 +67,50 @@ fun getApkUrl(releases: JsonObject) : Pair<String?, String?>? {
         else
             Pair(it.jsonObject["browser_download_url"]?.content, it.jsonObject["name"]?.content)
     }
+}
+
+fun getOldReaderGalleries(context: Context) : List<File> {
+    val oldGallery = mutableListOf<File>()
+
+    listOf(
+        getDownloadDirectory(context),
+        File(context.cacheDir, "imageCache")
+    ).forEach { root ->
+        root.listFiles()?.forEach { gallery ->
+            File(gallery, "reader.json").let { readerFile ->
+                if (!readerFile.exists())
+                    return@let
+
+                Json(JsonConfiguration.Stable).parseJson(readerFile.readText()).jsonObject.let { reader ->
+                    if (!reader.contains("code"))
+                        oldGallery.add(gallery)
+                }
+            }
+        }
+    }
+
+    return oldGallery
+}
+
+@UseExperimental(InternalSerializationApi::class)
+fun updateOldReaderGalleries(context: Context) {
+
+    val json = Json(JsonConfiguration.Stable)
+
+   getOldReaderGalleries(context).forEach { gallery ->
+       val reader = json.parseJson(File(gallery, "reader.json").readText())
+           .jsonObject.toMutableMap()
+
+       val codeSerializer = EnumSerializer(Reader.Code::class)
+
+       reader["code"] = when {
+           (File(gallery, "images").list()?.
+               all { !it.endsWith("webp") } ?: return@forEach) &&
+                   availableInHiyobi(gallery.name.toInt()) -> json.toJson(codeSerializer, Reader.Code.HIYOBI)
+           else -> json.toJson(codeSerializer, Reader.Code.HITOMI)
+       }
+
+       File(gallery, "reader.json").writeText(JsonObject(reader).toString())
+   }
+
 }