javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 3 Wiki Activity

Local chapter url relative. Other minor changes

Browse Source
This commit is contained in:
len
2017-01-29 20:51:11 +01:00
parent 2b73a9d2a4
commit e8912c5dc9
7 changed files with 95 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class MangaImpl : Manga {
override var id: Long? = null
override var source: Long = 0
override var source: Long = -1
override lateinit var url: String
app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaFileFetcher.kt
+29
View File
@@ -0,0 +1,29 @@
package eu.kanade.tachiyomi.data.glide
import com.bumptech.glide.Priority
import com.bumptech.glide.load.data.DataFetcher
import eu.kanade.tachiyomi.data.database.models.Manga
import java.io.File
import java.io.InputStream
class MangaFileFetcher(private val fetcher: DataFetcher<InputStream>,
private val file: File,
private val manga: Manga) : DataFetcher<InputStream> {
override fun loadData(priority: Priority?): InputStream? {
return fetcher.loadData(priority)
}
override fun getId(): String {
return manga.thumbnail_url + file.lastModified()
}
override fun cancel() {
fetcher.cancel()
}
override fun cleanup() {
fetcher.cleanup()
}
}
app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt
+29 -32
View File
@@ -1,10 +1,8 @@
package eu.kanade.tachiyomi.data.glide
import android.content.Context
import android.net.Uri
import android.util.LruCache
import com.bumptech.glide.Glide
import com.bumptech.glide.Priority
import com.bumptech.glide.load.data.DataFetcher
import com.bumptech.glide.load.model.*
import com.bumptech.glide.load.model.stream.StreamModelLoader
@@ -18,7 +16,7 @@ import java.io.InputStream
/**
* A class for loading a cover associated with a [Manga] that can be present in our own cache.
* Coupled with [MangaDataFetcher], this class allows to implement the following flow:
* Coupled with [MangaUrlFetcher], this class allows to implement the following flow:
*
* - Check in RAM LRU.
* - Check in disk LRU.
@@ -32,23 +30,23 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
/**
* Cover cache where persistent covers are stored.
*/
val coverCache: CoverCache by injectLazy()
private val coverCache: CoverCache by injectLazy()
/**
* Source manager.
*/
val sourceManager: SourceManager by injectLazy()
private val sourceManager: SourceManager by injectLazy()
/**
* Base network loader.
*/
private val baseLoader = Glide.buildModelLoader(GlideUrl::class.java,
private val baseUrlLoader = Glide.buildModelLoader(GlideUrl::class.java,
InputStream::class.java, context)
/**
* Base file loader.
*/
private val baseFileLoader = Glide.buildModelLoader(Uri::class.java,
private val baseFileLoader = Glide.buildModelLoader(File::class.java,
InputStream::class.java, context)
/**
@@ -74,7 +72,7 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
}
/**
* Returns a [MangaDataFetcher] for the given manga or null if the url is empty.
* Returns a fetcher for the given manga or null if the url is empty.
*
* @param manga the model.
* @param width the width of the view where the resource will be loaded.
@@ -86,34 +84,33 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
// Check thumbnail is not null or empty
val url = manga.thumbnail_url
if (url.isNullOrEmpty()) {
if (url == null || url.isEmpty()) {
return null
}
if (url!!.startsWith("file://")) {
val cover = File(url.substring(7))
val id = url + File.separator + cover.lastModified()
val rf = baseFileLoader.getResourceFetcher(Uri.fromFile(cover), width, height)
return object : DataFetcher<InputStream> {
override fun cleanup() = rf.cleanup()
override fun loadData(priority: Priority?): InputStream = rf.loadData(priority)
override fun cancel() = rf.cancel()
override fun getId() = id
}
if (url.startsWith("http")) {
// Obtain the request url and the file for this url from the LRU cache, or calculate it
// and add them to the cache.
val (glideUrl, file) = lruCache.get(url) ?:
Pair(GlideUrl(url, getHeaders(manga)), coverCache.getCoverFile(url)).apply {
lruCache.put(url, this)
}
// Get the resource fetcher for this request url.
val networkFetcher = baseUrlLoader.getResourceFetcher(glideUrl, width, height)
// Return an instance of the fetcher providing the needed elements.
return MangaUrlFetcher(networkFetcher, file, manga)
} else {
// Get the file from the url, removing the scheme if present.
val file = File(url.substringAfter("file://"))
// Get the resource fetcher for the given file.
val fileFetcher = baseFileLoader.getResourceFetcher(file, width, height)
// Return an instance of the fetcher providing the needed elements.
return MangaFileFetcher(fileFetcher, file, manga)
}
// Obtain the request url and the file for this url from the LRU cache, or calculate it
// and add them to the cache.
val (glideUrl, file) = lruCache.get(url) ?:
Pair(GlideUrl(url, getHeaders(manga)), coverCache.getCoverFile(url!!)).apply {
lruCache.put(url, this)
}
// Get the network fetcher for this request url.
val networkFetcher = baseLoader.getResourceFetcher(glideUrl, width, height)
// Return an instance of our fetcher providing the needed elements.
return MangaDataFetcher(networkFetcher, file, manga)
}
/**
app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaDataFetcher.kt → app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaUrlFetcher.kt
+3 -3
View File
@@ -18,9 +18,9 @@ import java.io.InputStream
* @param file the file where this cover should be. It may exists or not.
* @param manga the manga of the cover to load.
*/
class MangaDataFetcher(private val networkFetcher: DataFetcher<InputStream>,
private val file: File,
private val manga: Manga)
class MangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
private val file: File,
private val manga: Manga)
: DataFetcher<InputStream> {
@Throws(Exception::class)