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

use webp by default

Browse Source
This commit is contained in:
tom5079
2022-02-01 19:10:54 +09:00
parent 0ed59bb8a9
commit c1de45abce
5 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/xyz/quaver/pupil/Pupil.kt
View File

@@ -81,7 +81,6 @@ private var version = ""
var runtimeReady = false
private set
lateinit var runtime: QuickJs
private set
class Pupil : Application() {
companion object {
@@ -91,7 +90,7 @@ class Pupil : Application() {
init {
CoroutineScope(Dispatchers.IO).launch {
withContext(evaluationContext) {
withContext(Dispatchers.Main) {
runtime = QuickJs.create()
}
while (true) {
@@ -100,11 +99,15 @@ class Pupil : Application() {
if (version != newVersion) {
runtimeReady = false
version = newVersion
evaluationContext.cancelChildren()
withContext(evaluationContext) {
runtime.evaluate(URL("https://tom5079.github.io/PupilSources/assets/js/gg.js").readText())
runtimeReady = true
kotlin.runCatching {
URL("https://tom5079.github.io/PupilSources/assets/js/gg.js").readText()
}.getOrNull()?.also { gg ->
withContext(Dispatchers.Main) {
runtime.evaluate(gg)
version = newVersion
runtimeReady = true
}
}
}
}

23
app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
View File

@@ -128,7 +128,7 @@ const val galleryblockextension = ".html"
const val galleryblockdir = "galleryblock"
const val nozomiextension = ".nozomi"
val evaluationContext = Executors.newSingleThreadExecutor().asCoroutineDispatcher() + Job()
val evaluationContext = Dispatchers.Main + Job()
object gg {
@@ -198,14 +198,15 @@ suspend fun rewriteTnPaths(html: String) {
}
suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
return when {
noWebp ->
urlFromUrlFromHash(galleryID, image)
// image.hasavif != 0 ->
// urlFromUrlFromHash(galleryID, image, "avif", null, "a")
image.haswebp != 0 ->
urlFromUrlFromHash(galleryID, image, "webp", null, "a")
else ->
urlFromUrlFromHash(galleryID, image)
}
return urlFromUrlFromHash(galleryID, image, "webp", null, "a")
// return when {
// noWebp ->
// urlFromUrlFromHash(galleryID, image)
//// image.hasavif != 0 ->
//// urlFromUrlFromHash(galleryID, image, "avif", null, "a")
// image.haswebp != 0 ->
// urlFromUrlFromHash(galleryID, image, "webp", null, "a")
// else ->
// urlFromUrlFromHash(galleryID, image)
// }
}