Random Gallery Added

Changed tag search behavior Loading time improved for hitomi.la Bug fixed
2020-06-14 16:53:30 +09:00
parent b3feee6d9d
commit 49ba579a59
19 changed files with 90 additions and 37 deletions
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -52,7 +52,7 @@ import io.fabric.sdk.android.Fabric
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.doSearch
 import xyz.quaver.hitomi.getGalleryIDsFromNozomi
@@ -367,6 +367,29 @@ class MainActivity : AppCompatActivity() {
            }
        }

+        with(main_fab_random) {
+            setImageResource(R.drawable.shuffle_variant)
+            setOnClickListener {
+                runBlocking {
+                    withTimeoutOrNull(100) {
+                        galleryIDs?.await()
+                    }
+                }.let {
+                    if (it?.isEmpty() == false) {
+                        val galleryID = it.random()
+
+                        val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
+                            putExtra("galleryID", galleryID)
+                        }
+
+                        startActivity(intent)
+
+                        histories.add(galleryID)
+                    }
+                }
+            }
+        }
+
        with(main_fab_id) {
            setImageResource(R.drawable.numeric)
            setOnClickListener {
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -30,8 +30,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.settings_activity.*
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
--- a/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
@@ -26,7 +26,6 @@ import android.util.SparseArray
 import androidx.preference.PreferenceManager
 import com.crashlytics.android.Crashlytics
 import kotlinx.coroutines.*
-import kotlinx.io.InputStream
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
@@ -35,10 +34,11 @@ import xyz.quaver.pupil.util.getCachedGallery
 import xyz.quaver.pupil.util.getDownloadDirectory
 import xyz.quaver.pupil.util.isParentOf
 import xyz.quaver.pupil.util.json
+import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
+import java.io.InputStream
 import java.net.URL
-import java.util.concurrent.Executors
 import java.util.concurrent.locks.Lock
 import java.util.concurrent.locks.ReentrantLock

@@ -245,7 +245,7 @@ class Cache(context: Context) : ContextWrapper(context) {
                it.createNewFile()
        }

-        data.use {
+        BufferedInputStream(data).use {
            it.copyTo(FileOutputStream(cache))
        }
    }
--- a/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
@@ -46,11 +46,10 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.ReaderActivity
 import java.io.File
 import java.io.IOException
-import java.util.concurrent.Executors
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.TimeUnit

-@UseExperimental(ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {

    private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -164,7 +163,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
            .connectTimeout(0, TimeUnit.SECONDS)
            .addInterceptor(interceptor)
            .readTimeout(0, TimeUnit.SECONDS)
-            .dispatcher(Dispatcher(Executors.newFixedThreadPool(4)))
+            .dispatcher(Dispatcher().apply {
+                maxRequests = 4
+                maxRequestsPerHost = 4
+            })
            .proxy(proxy)
            .build()

@@ -222,7 +224,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
                        imageUrlFromImage(
                            galleryID,
                            reader.galleryInfo.files[index],
-                            lowQuality
+                            !lowQuality
                        )
                    )
                    addHeader("Referer", getReferer(galleryID))
@@ -240,6 +242,8 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
        }.build()

        client.newCall(request).enqueue(callback)
+
+        Log.i("PUPILD", "DOWNLOADING ($galleryID, $index) from ${request.url()}")
    }

    private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
--- a/app/src/main/java/xyz/quaver/pupil/util/history.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/history.kt
@@ -18,13 +18,14 @@

 package xyz.quaver.pupil.util

-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 import java.io.File

 class Histories(private val file: File) : ArrayList<Int>() {

-    val serializer = Int.serializer().list
+    val serializer: KSerializer<List<Int>> = Int.serializer().list

    init {
        if (!file.exists())
--- a/app/src/main/java/xyz/quaver/pupil/util/lock.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/lock.kt
@@ -22,9 +22,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.core.content.ContextCompat
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 import java.io.File
 import java.security.MessageDigest

--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -22,7 +22,7 @@ import android.annotation.SuppressLint
 import java.util.*
 import kotlin.collections.ArrayList

-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 fun String.wordCapitalize() : String {
    val result = ArrayList<String>()

--- a/app/src/main/res/drawable/shuffle_variant.xml
+++ b/app/src/main/res/drawable/shuffle_variant.xml
@@ -0,0 +1,8 @@
+<!-- drawable/shuffle_variant.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M17,3L22.25,7.5L17,12L22.25,16.5L17,21V18H14.26L11.44,15.18L13.56,13.06L15.5,15H17V12L17,9H15.5L6.5,18H2V15H5.26L14.26,6H17V3M2,6H6.5L9.32,8.82L7.2,10.94L5.26,9H2V6Z" />
+</vector>
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -100,6 +100,13 @@
                app:fab_label="@string/main_jump_title"
                app:fab_size="mini"/>

+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_random"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_fab_random"
+                app:fab_size="mini"/>
+
            <com.github.clans.fab.FloatingActionButton
                android:id="@+id/main_fab_id"
                android:layout_width="wrap_content"
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -140,4 +140,5 @@
    <string name="import_old_galleries_folder_not_readable">フォルダを読めません</string>
    <string name="import_old_galleries_notification">旧ギャラリーインポート中…</string>
    <string name="import_old_galleries_notification_done">インポート完了</string>
+    <string name="main_fab_random">ランダムギャラリーを開く</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -140,4 +140,5 @@
    <string name="import_old_galleries_folder_not_readable">폴더를 읽을 수 없습니다</string>
    <string name="import_old_galleries_notification">이전 버전 갤러리 가져오는 중…</string>
    <string name="import_old_galleries_notification_done">가져오기 완료</string>
+    <string name="main_fab_random">무작위 갤러리 열기</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -69,6 +69,7 @@
    <string name="main_jump_message">Current page: %1$d\nMaximum page: %2$d</string>
    <string name="main_open_gallery_by_id">Open Gallery by ID</string>
    <string name="reader_failed_to_find_gallery">Failed to open gallery</string>
+    <string name="main_fab_random">Open a random gallery</string>
    <string name="main_fab_cancel">Cancel all downloads</string>

    <string name="main_move">Move to page %1$d</string>