user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed image loading error

Browse Source
This commit is contained in:
Pupil
2020-02-22 09:30:24 +09:00
parent b967bf9a26
commit c0e7c87ca4
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/release/output.json
View File

@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6-alpha6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6-alpha7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

2
app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
View File

@@ -58,7 +58,7 @@ class ReaderAdapter(private val context: Context,
} }
val modelProvider = object: ListPreloader.PreloadModelProvider<File> { val modelProvider = object: ListPreloader.PreloadModelProvider<File> {
override fun getPreloadItems(position: Int): MutableList<File> { override fun getPreloadItems(position: Int): MutableList<File> {
return listOf(Cache(context).getImages(galleryID)?.get(position)).filterNotNullTo(mutableListOf()) return listOf(Cache(context).getImages(galleryID)?.getOrNull(position)).filterNotNullTo(mutableListOf())
} }
override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? { override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {

2
app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
View File

@@ -300,7 +300,7 @@ class ReaderActivity : AppCompatActivity() {
} }
} }
//addOnScrollListener((adapter as ReaderAdapter).preloader) addOnScrollListener((adapter as ReaderAdapter).preloader)
addOnScrollListener(object: RecyclerView.OnScrollListener() { addOnScrollListener(object: RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
super.onScrolled(recyclerView, dx, dy) super.onScrolled(recyclerView, dx, dy)

17
app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
View File

@@ -178,24 +178,27 @@ class Cache(context: Context) : ContextWrapper(context) {
return reader return reader
} }
val imageNameRegex = Regex("""^\d+\..+$""")
fun getImages(galleryID: Int): List<File?>? { fun getImages(galleryID: Int): List<File?>? {
val gallery = getCachedGallery(galleryID) val gallery = getCachedGallery(galleryID)
val reader = getReaderOrNull(galleryID) ?: return null
val images = gallery.listFiles() ?: return null
return reader.galleryInfo.indices.map { index -> return gallery.list { _, name ->
images.firstOrNull { file -> file.name.startsWith("%05d".format(index)) } imageNameRegex.matches(name)
}?.map {
File(gallery, it)
} }
} }
val imageExts = listOf( val imageExtensions = listOf(
"png",
"jpg", "jpg",
"webp" "webp",
"gif"
) )
fun getImage(galleryID: Int, index: Int): File? { fun getImage(galleryID: Int, index: Int): File? {
val gallery = getCachedGallery(galleryID) val gallery = getCachedGallery(galleryID)
for (ext in imageExts) { for (ext in imageExtensions) {
File(gallery, "%05d.$ext".format(index)).let { File(gallery, "%05d.$ext".format(index)).let {
if (it.exists()) if (it.exists())
return it return it

5
app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
View File

@@ -23,7 +23,6 @@ import android.content.Context
import android.content.ContextWrapper import android.content.ContextWrapper
import android.content.Intent import android.content.Intent
import android.content.SharedPreferences import android.content.SharedPreferences
import android.util.Log
import android.util.SparseArray import android.util.SparseArray
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
@@ -253,15 +252,13 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
val cache = Cache(this@DownloadWorker).getImages(galleryID) val cache = Cache(this@DownloadWorker).getImages(galleryID)
progress.put(galleryID, reader.galleryInfo.indices.map { index -> progress.put(galleryID, reader.galleryInfo.indices.map { index ->
if (cache?.get(index) != null) if (cache?.getOrNull(index) != null)
Float.POSITIVE_INFINITY Float.POSITIVE_INFINITY
else else
0F 0F
}.toMutableList()) }.toMutableList())
exception.put(galleryID, reader.galleryInfo.map { null }.toMutableList()) exception.put(galleryID, reader.galleryInfo.map { null }.toMutableList())
Log.i("PUPILD", "READER HERE!")
if (notification[galleryID] == null) if (notification[galleryID] == null)
initNotification(galleryID) initNotification(galleryID)

2
libpupil/src/main/java/xyz/quaver/hitomi/search.kt
View File

@@ -169,7 +169,6 @@ fun getSuggestionsFromData(field: String, data: Pair<Long, Int>) : List<Suggesti
} }
fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List<Int> { fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List<Int> {
print("PUPILD: NOZOMI REQUEST: $area:$tag ($language)")
val nozomiAddress = val nozomiAddress =
when(area) { when(area) {
null -> "$protocol//$domain/$compressed_nozomi_prefix/$tag-$language$nozomiextension" null -> "$protocol//$domain/$compressed_nozomi_prefix/$tag-$language$nozomiextension"
@@ -189,7 +188,6 @@ fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List
while (arrayBuffer.hasRemaining()) while (arrayBuffer.hasRemaining())
nozomi.add(arrayBuffer.int) nozomi.add(arrayBuffer.int)
print("PUPILD: NOZOMI REQUEST END: $area:$tag ($language)")
return nozomi return nozomi
} }