Fix normal preview set load

This commit is contained in:
tarsin committed 2023-03-07 10:04:27 +08:00
1 parent 795e42f609
commit a39bc1182a
3 files changed
+7 -13

No files matched your search

@@ -15,12 +15,17 @@
*/
package com.hippo.ehviewer.client
private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
private const val URL_PREFIX_THUMB_EX = "https://exhentai.org/"
object EhCacheKeyFactory {
fun getImageKey(gid: Long, index: Int): String {
return "image:$gid:$index"
}
fun getImageKey(url: String): String {
return url.removePrefix(EhUrl.URL_PREFIX_THUMB_E).removePrefix(EhUrl.URL_PREFIX_THUMB_EX)
return url.removePrefix(URL_PREFIX_THUMB_E)
.removePrefix(URL_PREFIX_THUMB_EX)
.removePrefix("t/")
}
}
@@ -51,8 +51,6 @@ object EhUrl {
const val ORIGIN_EX = REFERER_EX
const val REFERER_E = "https://$DOMAIN_E"
const val ORIGIN_E = REFERER_E
const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
const val URL_PREFIX_THUMB_EX = "https://exhentai.org/t/"
val host: String
get() = when (Settings.gallerySite) {
@@ -127,13 +125,6 @@ object EhUrl {
else -> URL_WATCHED_E
}
val thumbUrlPrefix: String
get() = when (Settings.gallerySite) {
SITE_E -> URL_PREFIX_THUMB_E
SITE_EX -> URL_PREFIX_THUMB_EX
else -> URL_PREFIX_THUMB_E
}
fun getGalleryDetailUrl(gid: Long, token: String?): String {
return getGalleryDetailUrl(gid, token, 0, false)
}
@@ -3,12 +3,10 @@ package com.hippo.ehviewer.coil
import android.content.Context
import coil.request.ImageRequest
import com.hippo.ehviewer.client.EhCacheKeyFactory
import com.hippo.ehviewer.client.EhUrl
fun ImageRequest.Builder.ehUrl(url: String) = apply {
val key = EhCacheKeyFactory.getImageKey(url)
val realUrl = EhUrl.thumbUrlPrefix + key
data(realUrl)
data(url)
memoryCacheKey(key)
diskCacheKey(key)
}