Migrate to coil3
parent
681c80dc3e
commit
436168b940
GPG Key ID:
676DEE768C17A9D7
@ -1,50 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.core.image
|
|
||||||
|
|
||||||
import android.graphics.BitmapFactory
|
|
||||||
import coil.decode.DecodeResult
|
|
||||||
import coil.decode.Decoder
|
|
||||||
import coil.decode.ImageSource
|
|
||||||
import coil.request.Options
|
|
||||||
import coil.size.Dimension
|
|
||||||
import coil.size.Scale
|
|
||||||
import coil.size.Size
|
|
||||||
import coil.size.isOriginal
|
|
||||||
import coil.size.pxOrElse
|
|
||||||
import kotlinx.coroutines.runInterruptible
|
|
||||||
import kotlinx.coroutines.sync.Semaphore
|
|
||||||
import kotlinx.coroutines.sync.withPermit
|
|
||||||
import org.jetbrains.annotations.Blocking
|
|
||||||
|
|
||||||
abstract class BaseCoilDecoder(
|
|
||||||
protected val source: ImageSource,
|
|
||||||
protected val options: Options,
|
|
||||||
private val parallelismLock: Semaphore,
|
|
||||||
) : Decoder {
|
|
||||||
|
|
||||||
final override suspend fun decode(): DecodeResult = parallelismLock.withPermit {
|
|
||||||
runInterruptible { BitmapFactory.Options().decode() }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Blocking
|
|
||||||
protected abstract fun BitmapFactory.Options.decode(): DecodeResult
|
|
||||||
|
|
||||||
protected companion object {
|
|
||||||
|
|
||||||
const val DEFAULT_PARALLELISM = 4
|
|
||||||
|
|
||||||
inline fun Size.widthPx(scale: Scale, original: () -> Int): Int {
|
|
||||||
return if (isOriginal) original() else width.toPx(scale)
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun Size.heightPx(scale: Scale, original: () -> Int): Int {
|
|
||||||
return if (isOriginal) original() else height.toPx(scale)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Dimension.toPx(scale: Scale) = pxOrElse {
|
|
||||||
when (scale) {
|
|
||||||
Scale.FILL -> Int.MIN_VALUE
|
|
||||||
Scale.FIT -> Int.MAX_VALUE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
package org.koitharu.kotatsu.core.image
|
||||||
|
|
||||||
|
import android.net.Uri
|
||||||
|
import android.webkit.MimeTypeMap
|
||||||
|
import coil3.ImageLoader
|
||||||
|
import coil3.decode.DataSource
|
||||||
|
import coil3.decode.ImageSource
|
||||||
|
import coil3.fetch.Fetcher
|
||||||
|
import coil3.fetch.SourceFetchResult
|
||||||
|
import coil3.request.Options
|
||||||
|
import coil3.toAndroidUri
|
||||||
|
import kotlinx.coroutines.runInterruptible
|
||||||
|
import okio.Path.Companion.toPath
|
||||||
|
import okio.openZip
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.isZipUri
|
||||||
|
import coil3.Uri as CoilUri
|
||||||
|
|
||||||
|
class CbzFetcher(
|
||||||
|
private val uri: Uri,
|
||||||
|
private val options: Options,
|
||||||
|
) : Fetcher {
|
||||||
|
|
||||||
|
override suspend fun fetch() = runInterruptible {
|
||||||
|
val filePath = uri.schemeSpecificPart.toPath()
|
||||||
|
val entryName = requireNotNull(uri.fragment)
|
||||||
|
SourceFetchResult(
|
||||||
|
source = ImageSource(entryName.toPath(), options.fileSystem.openZip(filePath)),
|
||||||
|
mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(entryName.substringAfterLast('.', "")),
|
||||||
|
dataSource = DataSource.DISK,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
class Factory : Fetcher.Factory<CoilUri> {
|
||||||
|
|
||||||
|
override fun create(
|
||||||
|
data: CoilUri,
|
||||||
|
options: Options,
|
||||||
|
imageLoader: ImageLoader
|
||||||
|
): Fetcher? {
|
||||||
|
val androidUri = data.toAndroidUri()
|
||||||
|
return if (androidUri.isZipUri()) {
|
||||||
|
CbzFetcher(androidUri, options)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
package org.koitharu.kotatsu.core.image
|
||||||
|
|
||||||
|
import coil3.intercept.Interceptor
|
||||||
|
import coil3.network.httpHeaders
|
||||||
|
import coil3.request.ImageResult
|
||||||
|
import org.koitharu.kotatsu.core.network.CommonHeaders
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.mangaSourceKey
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaParserSource
|
||||||
|
|
||||||
|
class MangaSourceHeaderInterceptor : Interceptor {
|
||||||
|
|
||||||
|
override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
|
||||||
|
val mangaSource = chain.request.extras[mangaSourceKey] as? MangaParserSource ?: return chain.proceed()
|
||||||
|
val request = chain.request
|
||||||
|
val newHeaders = request.httpHeaders.newBuilder()
|
||||||
|
.set(CommonHeaders.MANGA_SOURCE, mangaSource.name)
|
||||||
|
.build()
|
||||||
|
val newRequest = request.newBuilder()
|
||||||
|
.httpHeaders(newHeaders)
|
||||||
|
.build()
|
||||||
|
return chain.withRequest(newRequest).proceed()
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,57 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.local.data
|
|
||||||
|
|
||||||
import android.net.Uri
|
|
||||||
import android.webkit.MimeTypeMap
|
|
||||||
import coil.ImageLoader
|
|
||||||
import coil.decode.DataSource
|
|
||||||
import coil.decode.ImageSource
|
|
||||||
import coil.fetch.Fetcher
|
|
||||||
import coil.fetch.SourceResult
|
|
||||||
import coil.request.Options
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.runInterruptible
|
|
||||||
import okhttp3.internal.closeQuietly
|
|
||||||
import okio.buffer
|
|
||||||
import okio.source
|
|
||||||
import org.koitharu.kotatsu.local.data.util.withExtraCloseable
|
|
||||||
import java.util.zip.ZipFile
|
|
||||||
|
|
||||||
class CbzFetcher(
|
|
||||||
private val uri: Uri,
|
|
||||||
private val options: Options
|
|
||||||
) : Fetcher {
|
|
||||||
|
|
||||||
override suspend fun fetch() = runInterruptible(Dispatchers.IO) {
|
|
||||||
val zip = ZipFile(uri.schemeSpecificPart)
|
|
||||||
try {
|
|
||||||
val entry = zip.getEntry(uri.fragment)
|
|
||||||
val ext = MimeTypeMap.getFileExtensionFromUrl(entry.name)
|
|
||||||
val bufferedSource = zip.getInputStream(entry).source().withExtraCloseable(zip).buffer()
|
|
||||||
SourceResult(
|
|
||||||
source = ImageSource(
|
|
||||||
source = bufferedSource,
|
|
||||||
context = options.context,
|
|
||||||
metadata = CbzMetadata(uri),
|
|
||||||
),
|
|
||||||
mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext),
|
|
||||||
dataSource = DataSource.DISK,
|
|
||||||
)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
zip.closeQuietly()
|
|
||||||
throw e
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class Factory : Fetcher.Factory<Uri> {
|
|
||||||
|
|
||||||
override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher? {
|
|
||||||
return if (data.scheme == "cbz") {
|
|
||||||
CbzFetcher(data, options)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class CbzMetadata(val uri: Uri) : ImageSource.Metadata()
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.local.data.util
|
|
||||||
|
|
||||||
import okhttp3.internal.closeQuietly
|
|
||||||
import okio.Closeable
|
|
||||||
import okio.Source
|
|
||||||
|
|
||||||
private class ExtraCloseableSource(
|
|
||||||
private val delegate: Source,
|
|
||||||
private val extraCloseable: Closeable,
|
|
||||||
) : Source by delegate {
|
|
||||||
|
|
||||||
override fun close() {
|
|
||||||
try {
|
|
||||||
delegate.close()
|
|
||||||
} finally {
|
|
||||||
extraCloseable.closeQuietly()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun Source.withExtraCloseable(closeable: Closeable): Source = ExtraCloseableSource(this, closeable)
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue