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

Merge pull request #81 from tom5079/Pupil-78

Browse Source 
Pupil-78 Shorten the timout when hiyobi is down
This commit is contained in:
Pupil
2020-06-20 13:16:57 +09:00
committed by GitHub
parent 01a01d481d 349da7aa81
commit 8adc4405c5
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ import java.io.File
import java.io.FileOutputStream
import java.io.InputStream
import java.net.URL
import java.util.*
import java.util.concurrent.locks.Lock
import java.util.concurrent.locks.ReentrantLock
@@ -166,8 +167,8 @@ class Cache(context: Context) : ContextWrapper(context) {
val mirrors = preference.getString("mirrors", null)?.split('>') ?: listOf()
val sources = mapOf(
Code.HITOMI to { xyz.quaver.hitomi.getReader(galleryID) },
Code.HIYOBI to { xyz.quaver.hiyobi.getReader(galleryID) }
Code.HITOMI to { Log.i("PUPILD", "READER - HITOMI"); xyz.quaver.hitomi.getReader(galleryID) },
Code.HIYOBI to { Log.i("PUPILD", "READER - HIYOBI"); xyz.quaver.hiyobi.getReader(galleryID) }
).let {
if (mirrors.isNotEmpty())
it.toSortedMap(
@@ -180,23 +181,25 @@ class Cache(context: Context) : ContextWrapper(context) {
}
val reader = if (metadata?.reader == null) {
CoroutineScope(Dispatchers.IO).async {
var retval: Reader? = null
var retval: Reader? = null
for (source in sources) {
retval = try {
source.value.invoke()
} catch (e: Exception) {
FirebaseCrashlytics.getInstance().recordException(e)
null
for (source in sources) {
retval = try {
withContext(Dispatchers.IO) {
withTimeoutOrNull(1000) {
source.value.invoke()
}
}
if (retval != null)
break
} catch (e: Exception) {
FirebaseCrashlytics.getInstance().recordException(e)
null
}
retval
}.await() ?: return null
if (retval != null)
break
}
retval
} else
metadata.reader