Update Kotatsu parsers lib
parent
47fffb5541
commit
4acbe85ea1
SSH Key Fingerprint:
SHA256:wH6spYepK/A5erBh7ZyAnr1ru9H4eaMVBEuiw6DSpxI
@ -1,27 +0,0 @@
|
|||||||
package org.xtimms.shirizu.core.cache
|
|
||||||
|
|
||||||
import org.koitharu.kotatsu.parsers.model.Manga
|
|
||||||
import org.koitharu.kotatsu.parsers.model.MangaPage
|
|
||||||
import org.koitharu.kotatsu.parsers.model.MangaSource
|
|
||||||
|
|
||||||
interface ContentCache {
|
|
||||||
|
|
||||||
val isCachingEnabled: Boolean
|
|
||||||
|
|
||||||
suspend fun getDetails(source: MangaSource, url: String): Manga?
|
|
||||||
|
|
||||||
fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>)
|
|
||||||
|
|
||||||
suspend fun getPages(source: MangaSource, url: String): List<MangaPage>?
|
|
||||||
|
|
||||||
fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>)
|
|
||||||
|
|
||||||
suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>?
|
|
||||||
|
|
||||||
fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
|
|
||||||
|
|
||||||
data class Key(
|
|
||||||
val source: MangaSource,
|
|
||||||
val url: String,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package org.xtimms.shirizu.core.cache
|
|
||||||
|
|
||||||
import org.koitharu.kotatsu.parsers.model.Manga
|
|
||||||
import org.koitharu.kotatsu.parsers.model.MangaPage
|
|
||||||
import org.koitharu.kotatsu.parsers.model.MangaSource
|
|
||||||
|
|
||||||
class StubContentCache : ContentCache {
|
|
||||||
|
|
||||||
override val isCachingEnabled: Boolean = false
|
|
||||||
|
|
||||||
override suspend fun getDetails(source: MangaSource, url: String): Manga? = null
|
|
||||||
|
|
||||||
override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) = Unit
|
|
||||||
|
|
||||||
override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? = null
|
|
||||||
|
|
||||||
override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) = Unit
|
|
||||||
|
|
||||||
override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? = null
|
|
||||||
|
|
||||||
override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) = Unit
|
|
||||||
}
|
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
package org.xtimms.shirizu.core.exceptions
|
||||||
|
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
|
||||||
|
class UnsupportedSourceException(
|
||||||
|
message: String?,
|
||||||
|
val manga: Manga?,
|
||||||
|
) : IllegalArgumentException(message)
|
||||||
@ -1,13 +1,72 @@
|
|||||||
package org.xtimms.shirizu.core.model
|
package org.xtimms.shirizu.core.model
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.annotation.StringRes
|
||||||
import org.koitharu.kotatsu.parsers.model.ContentType
|
import org.koitharu.kotatsu.parsers.model.ContentType
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaParserSource
|
||||||
import org.koitharu.kotatsu.parsers.model.MangaSource
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.koitharu.kotatsu.parsers.util.splitTwoParts
|
||||||
|
import org.xtimms.shirizu.R
|
||||||
|
import org.xtimms.shirizu.core.parser.external.ExternalMangaSource
|
||||||
|
import org.xtimms.shirizu.utils.system.getDisplayName
|
||||||
|
import org.xtimms.shirizu.utils.system.toLocale
|
||||||
|
|
||||||
fun MangaSource(name: String): MangaSource {
|
data object LocalMangaSource : MangaSource {
|
||||||
MangaSource.entries.forEach {
|
override val name = "LOCAL"
|
||||||
|
}
|
||||||
|
|
||||||
|
data object UnknownMangaSource : MangaSource {
|
||||||
|
override val name = "UNKNOWN"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun MangaSource(name: String?): MangaSource {
|
||||||
|
when (name ?: return UnknownMangaSource) {
|
||||||
|
UnknownMangaSource.name -> return UnknownMangaSource
|
||||||
|
|
||||||
|
LocalMangaSource.name -> return LocalMangaSource
|
||||||
|
}
|
||||||
|
if (name.startsWith("content:")) {
|
||||||
|
val parts = name.substringAfter(':').splitTwoParts('/') ?: return UnknownMangaSource
|
||||||
|
return ExternalMangaSource(packageName = parts.first, authority = parts.second)
|
||||||
|
}
|
||||||
|
MangaParserSource.entries.forEach {
|
||||||
if (it.name == name) return it
|
if (it.name == name) return it
|
||||||
}
|
}
|
||||||
return MangaSource.DUMMY
|
return UnknownMangaSource
|
||||||
|
}
|
||||||
|
|
||||||
|
fun MangaSource.isNsfw(): Boolean = when (this) {
|
||||||
|
is MangaSourceInfo -> mangaSource.isNsfw()
|
||||||
|
is MangaParserSource -> contentType == ContentType.HENTAI
|
||||||
|
else -> false
|
||||||
}
|
}
|
||||||
|
|
||||||
fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
|
@get:StringRes
|
||||||
|
val ContentType.titleResId
|
||||||
|
get() = when (this) {
|
||||||
|
ContentType.MANGA -> R.string.content_type_manga
|
||||||
|
ContentType.HENTAI -> R.string.hentai
|
||||||
|
ContentType.COMICS -> R.string.comics
|
||||||
|
ContentType.OTHER -> R.string.other_source
|
||||||
|
}
|
||||||
|
|
||||||
|
fun MangaSource.getTitle(context: Context): String = when (this) {
|
||||||
|
is MangaSourceInfo -> mangaSource.getTitle(context)
|
||||||
|
is MangaParserSource -> title
|
||||||
|
LocalMangaSource -> context.getString(R.string.local_storage)
|
||||||
|
is ExternalMangaSource -> resolveName(context)
|
||||||
|
else -> context.getString(R.string.unknown)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun MangaSource.getSummary(context: Context): String? = when (this) {
|
||||||
|
is MangaSourceInfo -> mangaSource.getSummary(context)
|
||||||
|
is MangaParserSource -> {
|
||||||
|
val type = context.getString(contentType.titleResId)
|
||||||
|
val locale = locale.toLocale().getDisplayName(context)
|
||||||
|
context.getString(R.string.source_summary_pattern, type, locale)
|
||||||
|
}
|
||||||
|
|
||||||
|
is ExternalMangaSource -> context.getString(R.string.external_source)
|
||||||
|
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
package org.xtimms.shirizu.core.model
|
||||||
|
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
|
||||||
|
data class MangaSourceInfo(
|
||||||
|
val mangaSource: MangaSource,
|
||||||
|
val isEnabled: Boolean,
|
||||||
|
val isPinned: Boolean,
|
||||||
|
) : MangaSource by mangaSource
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package org.xtimms.shirizu.core.model.parcelable
|
||||||
|
|
||||||
|
import android.os.Parcel
|
||||||
|
import kotlinx.parcelize.Parceler
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.xtimms.shirizu.core.model.MangaSource
|
||||||
|
|
||||||
|
class MangaSourceParceler : Parceler<MangaSource> {
|
||||||
|
|
||||||
|
override fun create(parcel: Parcel): MangaSource = MangaSource(parcel.readString())
|
||||||
|
|
||||||
|
override fun MangaSource.write(parcel: Parcel, flags: Int) {
|
||||||
|
parcel.writeString(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
package org.xtimms.shirizu.core.parser
|
||||||
|
|
||||||
|
import android.graphics.Canvas
|
||||||
|
import org.koitharu.kotatsu.parsers.bitmap.Bitmap
|
||||||
|
import org.koitharu.kotatsu.parsers.bitmap.Rect
|
||||||
|
import java.io.OutputStream
|
||||||
|
import android.graphics.Bitmap as AndroidBitmap
|
||||||
|
import android.graphics.Rect as AndroidRect
|
||||||
|
|
||||||
|
class BitmapWrapper private constructor(
|
||||||
|
private val androidBitmap: AndroidBitmap
|
||||||
|
) : Bitmap {
|
||||||
|
|
||||||
|
private val canvas by lazy { Canvas(androidBitmap) }
|
||||||
|
|
||||||
|
override val height: Int
|
||||||
|
get() = androidBitmap.height
|
||||||
|
|
||||||
|
override val width: Int
|
||||||
|
get() = androidBitmap.width
|
||||||
|
|
||||||
|
override fun drawBitmap(sourceBitmap: Bitmap, src: Rect, dst: Rect) {
|
||||||
|
val androidSourceBitmap = (sourceBitmap as BitmapWrapper).androidBitmap
|
||||||
|
canvas.drawBitmap(androidSourceBitmap, src.toAndroidRect(), dst.toAndroidRect(), null)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun compressTo(output: OutputStream) {
|
||||||
|
androidBitmap.compress(AndroidBitmap.CompressFormat.PNG, 100, output)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun create(width: Int, height: Int): Bitmap = BitmapWrapper(
|
||||||
|
AndroidBitmap.createBitmap(width, height, AndroidBitmap.Config.ARGB_8888),
|
||||||
|
)
|
||||||
|
|
||||||
|
fun create(bitmap: AndroidBitmap): Bitmap = BitmapWrapper(
|
||||||
|
if (bitmap.isMutable) bitmap else bitmap.copy(AndroidBitmap.Config.ARGB_8888, true)
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun Rect.toAndroidRect() = AndroidRect(left, top, right, bottom)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,105 @@
|
|||||||
|
package org.xtimms.shirizu.core.parser
|
||||||
|
|
||||||
|
import android.util.Log
|
||||||
|
import androidx.collection.MutableLongSet
|
||||||
|
import coil.request.CachePolicy
|
||||||
|
import kotlinx.coroutines.CoroutineDispatcher
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.MainCoroutineDispatcher
|
||||||
|
import kotlinx.coroutines.async
|
||||||
|
import kotlinx.coroutines.currentCoroutineContext
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaChapter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaPage
|
||||||
|
import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
|
||||||
|
import org.xtimms.shirizu.BuildConfig
|
||||||
|
import org.xtimms.shirizu.core.cache.MemoryContentCache
|
||||||
|
import org.xtimms.shirizu.core.cache.SafeDeferred
|
||||||
|
import org.xtimms.shirizu.utils.MultiMutex
|
||||||
|
import org.xtimms.shirizu.utils.lang.processLifecycleScope
|
||||||
|
|
||||||
|
abstract class CachingMangaRepository(
|
||||||
|
private val cache: MemoryContentCache,
|
||||||
|
) : MangaRepository {
|
||||||
|
|
||||||
|
private val detailsMutex = MultiMutex<Long>()
|
||||||
|
private val relatedMangaMutex = MultiMutex<Long>()
|
||||||
|
private val pagesMutex = MultiMutex<Long>()
|
||||||
|
|
||||||
|
final override suspend fun getDetails(manga: Manga): Manga = getDetails(manga, CachePolicy.ENABLED)
|
||||||
|
|
||||||
|
final override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = pagesMutex.withLock(chapter.id) {
|
||||||
|
cache.getPages(source, chapter.url)?.let { return it }
|
||||||
|
val pages = asyncSafe {
|
||||||
|
getPagesImpl(chapter).distinctById()
|
||||||
|
}
|
||||||
|
cache.putPages(source, chapter.url, pages)
|
||||||
|
pages
|
||||||
|
}.await()
|
||||||
|
|
||||||
|
final override suspend fun getRelated(seed: Manga): List<Manga> = relatedMangaMutex.withLock(seed.id) {
|
||||||
|
cache.getRelatedManga(source, seed.url)?.let { return it }
|
||||||
|
val related = asyncSafe {
|
||||||
|
getRelatedMangaImpl(seed).filterNot { it.id == seed.id }
|
||||||
|
}
|
||||||
|
cache.putRelatedManga(source, seed.url, related)
|
||||||
|
related
|
||||||
|
}.await()
|
||||||
|
|
||||||
|
suspend fun getDetails(manga: Manga, cachePolicy: CachePolicy): Manga = detailsMutex.withLock(manga.id) {
|
||||||
|
if (cachePolicy.readEnabled) {
|
||||||
|
cache.getDetails(source, manga.url)?.let { return it }
|
||||||
|
}
|
||||||
|
val details = asyncSafe {
|
||||||
|
getDetailsImpl(manga)
|
||||||
|
}
|
||||||
|
if (cachePolicy.writeEnabled) {
|
||||||
|
cache.putDetails(source, manga.url, details)
|
||||||
|
}
|
||||||
|
details
|
||||||
|
}.await()
|
||||||
|
|
||||||
|
suspend fun peekDetails(manga: Manga): Manga? {
|
||||||
|
return cache.getDetails(source, manga.url)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun invalidateCache() {
|
||||||
|
cache.clear(source)
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract suspend fun getDetailsImpl(manga: Manga): Manga
|
||||||
|
|
||||||
|
protected abstract suspend fun getRelatedMangaImpl(seed: Manga): List<Manga>
|
||||||
|
|
||||||
|
protected abstract suspend fun getPagesImpl(chapter: MangaChapter): List<MangaPage>
|
||||||
|
|
||||||
|
@OptIn(ExperimentalStdlibApi::class)
|
||||||
|
private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
|
||||||
|
var dispatcher = currentCoroutineContext()[CoroutineDispatcher.Key]
|
||||||
|
if (dispatcher == null || dispatcher is MainCoroutineDispatcher) {
|
||||||
|
dispatcher = Dispatchers.Default
|
||||||
|
}
|
||||||
|
return SafeDeferred(
|
||||||
|
processLifecycleScope.async(dispatcher) {
|
||||||
|
runCatchingCancellable { block() }
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun List<MangaPage>.distinctById(): List<MangaPage> {
|
||||||
|
if (isEmpty()) {
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
val result = ArrayList<MangaPage>(size)
|
||||||
|
val set = MutableLongSet(size)
|
||||||
|
for (page in this) {
|
||||||
|
if (set.add(page.id)) {
|
||||||
|
result.add(page)
|
||||||
|
} else if (BuildConfig.DEBUG) {
|
||||||
|
Log.w(null, "Duplicate page: $page")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
package org.xtimms.shirizu.core.parser
|
||||||
|
|
||||||
|
import org.koitharu.kotatsu.parsers.model.ContentRating
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaChapter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaListFilter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaPage
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaState
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaTag
|
||||||
|
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||||
|
import org.xtimms.shirizu.core.exceptions.UnsupportedSourceException
|
||||||
|
import java.util.EnumSet
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
|
class EmptyMangaRepository(override val source: MangaSource) : MangaRepository {
|
||||||
|
|
||||||
|
override val sortOrders: Set<SortOrder>
|
||||||
|
get() = EnumSet.allOf(SortOrder::class.java)
|
||||||
|
override val states: Set<MangaState>
|
||||||
|
get() = emptySet()
|
||||||
|
override val contentRatings: Set<ContentRating>
|
||||||
|
get() = emptySet()
|
||||||
|
override var defaultSortOrder: SortOrder
|
||||||
|
get() = SortOrder.NEWEST
|
||||||
|
set(value) = Unit
|
||||||
|
override val isMultipleTagsSupported: Boolean
|
||||||
|
get() = false
|
||||||
|
override val isTagsExclusionSupported: Boolean
|
||||||
|
get() = false
|
||||||
|
override val isSearchSupported: Boolean
|
||||||
|
get() = false
|
||||||
|
|
||||||
|
override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
|
||||||
|
|
||||||
|
override suspend fun getDetails(manga: Manga): Manga = stub(manga)
|
||||||
|
|
||||||
|
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
|
||||||
|
|
||||||
|
override suspend fun getPageUrl(page: MangaPage): String = stub(null)
|
||||||
|
|
||||||
|
override suspend fun getTags(): Set<MangaTag> = stub(null)
|
||||||
|
|
||||||
|
override suspend fun getLocales(): Set<Locale> = stub(null)
|
||||||
|
|
||||||
|
override suspend fun getRelated(seed: Manga): List<Manga> = stub(seed)
|
||||||
|
|
||||||
|
private fun stub(manga: Manga?): Nothing {
|
||||||
|
throw UnsupportedSourceException("This manga source is not supported", manga)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,124 @@
|
|||||||
|
package org.xtimms.shirizu.core.parser
|
||||||
|
|
||||||
|
import android.net.Uri
|
||||||
|
import coil.request.CachePolicy
|
||||||
|
import dagger.Reusable
|
||||||
|
import org.koitharu.kotatsu.parsers.exception.NotFoundException
|
||||||
|
import org.koitharu.kotatsu.parsers.model.ContentType
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaListFilter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaParserSource
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.koitharu.kotatsu.parsers.util.almostEquals
|
||||||
|
import org.koitharu.kotatsu.parsers.util.levenshteinDistance
|
||||||
|
import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
|
||||||
|
import org.koitharu.kotatsu.parsers.util.toRelativeUrl
|
||||||
|
import org.xtimms.shirizu.core.model.MangaSource
|
||||||
|
import org.xtimms.shirizu.core.model.UnknownMangaSource
|
||||||
|
import org.xtimms.shirizu.core.model.isNsfw
|
||||||
|
import org.xtimms.shirizu.data.repository.MangaSourcesRepository
|
||||||
|
import org.xtimms.shirizu.utils.lang.ifNullOrEmpty
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
@Reusable
|
||||||
|
class MangaLinkResolver @Inject constructor(
|
||||||
|
private val repositoryFactory: MangaRepository.Factory,
|
||||||
|
private val sourcesRepository: MangaSourcesRepository,
|
||||||
|
private val dataRepository: MangaDataRepository,
|
||||||
|
) {
|
||||||
|
|
||||||
|
suspend fun resolve(uri: Uri): Manga {
|
||||||
|
return if (uri.scheme == "kotatsu" || uri.host == "kotatsu.app") {
|
||||||
|
resolveAppLink(uri)
|
||||||
|
} else {
|
||||||
|
resolveExternalLink(uri)
|
||||||
|
} ?: throw NotFoundException("Cannot resolve link", uri.toString())
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun resolveAppLink(uri: Uri): Manga? {
|
||||||
|
require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
|
||||||
|
val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
|
||||||
|
val source = MangaSource(sourceName)
|
||||||
|
require(source != UnknownMangaSource) { "Manga source $sourceName is not supported" }
|
||||||
|
val repo = repositoryFactory.create(source)
|
||||||
|
return repo.findExact(
|
||||||
|
url = uri.getQueryParameter("url"),
|
||||||
|
title = uri.getQueryParameter("name"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun resolveExternalLink(uri: Uri): Manga? {
|
||||||
|
dataRepository.findMangaByPublicUrl(uri.toString())?.let {
|
||||||
|
return it
|
||||||
|
}
|
||||||
|
val host = uri.host ?: return null
|
||||||
|
val repo = sourcesRepository.allMangaSources.asSequence()
|
||||||
|
.map { source ->
|
||||||
|
repositoryFactory.create(source) as ParserMangaRepository
|
||||||
|
}.find { repo ->
|
||||||
|
host in repo.domains
|
||||||
|
} ?: return null
|
||||||
|
return repo.findExact(uri.toString().toRelativeUrl(host), null)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun MangaRepository.findExact(url: String?, title: String?): Manga? {
|
||||||
|
if (!title.isNullOrEmpty()) {
|
||||||
|
val list = getList(0, MangaListFilter.Search(title))
|
||||||
|
if (url != null) {
|
||||||
|
list.find { it.url == url }?.let {
|
||||||
|
return it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
list.minByOrNull { it.title.levenshteinDistance(title) }
|
||||||
|
?.takeIf { it.title.almostEquals(title, 0.2f) }
|
||||||
|
?.let { return it }
|
||||||
|
}
|
||||||
|
val seed = getDetailsNoCache(
|
||||||
|
getSeedManga(source, url ?: return null, title),
|
||||||
|
)
|
||||||
|
return runCatchingCancellable {
|
||||||
|
val seedTitle = seed.title.ifEmpty {
|
||||||
|
seed.altTitle
|
||||||
|
}.ifNullOrEmpty {
|
||||||
|
seed.author
|
||||||
|
} ?: return@runCatchingCancellable null
|
||||||
|
val seedList = getList(0, MangaListFilter.Search(seedTitle))
|
||||||
|
seedList.first { x -> x.url == url }
|
||||||
|
}.getOrThrow()
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun MangaRepository.getDetailsNoCache(manga: Manga): Manga {
|
||||||
|
return if (this is ParserMangaRepository) {
|
||||||
|
getDetails(manga, CachePolicy.READ_ONLY)
|
||||||
|
} else {
|
||||||
|
getDetails(manga)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getSeedManga(source: MangaSource, url: String, title: String?) = Manga(
|
||||||
|
id = run {
|
||||||
|
var h = 1125899906842597L
|
||||||
|
source.name.forEach { c ->
|
||||||
|
h = 31 * h + c.code
|
||||||
|
}
|
||||||
|
url.forEach { c ->
|
||||||
|
h = 31 * h + c.code
|
||||||
|
}
|
||||||
|
h
|
||||||
|
},
|
||||||
|
title = title.orEmpty(),
|
||||||
|
altTitle = null,
|
||||||
|
url = url,
|
||||||
|
publicUrl = "",
|
||||||
|
rating = 0.0f,
|
||||||
|
isNsfw = source.isNsfw(),
|
||||||
|
coverUrl = "",
|
||||||
|
tags = emptySet(),
|
||||||
|
state = null,
|
||||||
|
author = null,
|
||||||
|
largeCoverUrl = null,
|
||||||
|
description = null,
|
||||||
|
chapters = null,
|
||||||
|
source = source,
|
||||||
|
)
|
||||||
|
}
|
||||||
@ -0,0 +1,264 @@
|
|||||||
|
package org.xtimms.shirizu.core.parser.external
|
||||||
|
|
||||||
|
import android.content.ContentResolver
|
||||||
|
import android.database.Cursor
|
||||||
|
import androidx.collection.ArraySet
|
||||||
|
import androidx.core.database.getStringOrNull
|
||||||
|
import androidx.core.net.toUri
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.async
|
||||||
|
import kotlinx.coroutines.coroutineScope
|
||||||
|
import kotlinx.coroutines.runInterruptible
|
||||||
|
import org.koitharu.kotatsu.parsers.model.ContentRating
|
||||||
|
import org.koitharu.kotatsu.parsers.model.ContentType
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaChapter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaListFilter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaPage
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaState
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaTag
|
||||||
|
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||||
|
import org.koitharu.kotatsu.parsers.util.find
|
||||||
|
import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
|
||||||
|
import org.koitharu.kotatsu.parsers.util.splitTwoParts
|
||||||
|
import org.xtimms.shirizu.core.cache.MemoryContentCache
|
||||||
|
import org.xtimms.shirizu.core.parser.CachingMangaRepository
|
||||||
|
import org.xtimms.shirizu.utils.lang.ifNullOrEmpty
|
||||||
|
import java.util.EnumSet
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
|
class ExternalMangaRepository(
|
||||||
|
private val contentResolver: ContentResolver,
|
||||||
|
override val source: ExternalMangaSource,
|
||||||
|
cache: MemoryContentCache,
|
||||||
|
) : CachingMangaRepository(cache) {
|
||||||
|
|
||||||
|
private val capabilities by lazy { queryCapabilities() }
|
||||||
|
|
||||||
|
override val sortOrders: Set<SortOrder>
|
||||||
|
get() = capabilities?.availableSortOrders ?: EnumSet.of(SortOrder.ALPHABETICAL)
|
||||||
|
override val states: Set<MangaState>
|
||||||
|
get() = capabilities?.availableStates.orEmpty()
|
||||||
|
override val contentRatings: Set<ContentRating>
|
||||||
|
get() = capabilities?.availableContentRating.orEmpty()
|
||||||
|
override var defaultSortOrder: SortOrder
|
||||||
|
get() = capabilities?.defaultSortOrder ?: SortOrder.ALPHABETICAL
|
||||||
|
set(value) = Unit
|
||||||
|
override val isMultipleTagsSupported: Boolean
|
||||||
|
get() = capabilities?.isMultipleTagsSupported ?: true
|
||||||
|
override val isTagsExclusionSupported: Boolean
|
||||||
|
get() = capabilities?.isTagsExclusionSupported ?: false
|
||||||
|
override val isSearchSupported: Boolean
|
||||||
|
get() = capabilities?.isSearchSupported ?: true
|
||||||
|
|
||||||
|
override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> =
|
||||||
|
runInterruptible(Dispatchers.Default) {
|
||||||
|
val uri = "content://${source.authority}/manga".toUri().buildUpon()
|
||||||
|
uri.appendQueryParameter("offset", offset.toString())
|
||||||
|
when (filter) {
|
||||||
|
is MangaListFilter.Advanced -> {
|
||||||
|
filter.tags.forEach { uri.appendQueryParameter("tag_include", it.key) }
|
||||||
|
filter.tagsExclude.forEach { uri.appendQueryParameter("tag_exclude", it.key) }
|
||||||
|
filter.states.forEach { uri.appendQueryParameter("state", it.name) }
|
||||||
|
filter.locale?.let { uri.appendQueryParameter("locale", it.language) }
|
||||||
|
filter.contentRating.forEach { uri.appendQueryParameter("content_rating", it.name) }
|
||||||
|
}
|
||||||
|
|
||||||
|
is MangaListFilter.Search -> {
|
||||||
|
uri.appendQueryParameter("query", filter.query)
|
||||||
|
}
|
||||||
|
|
||||||
|
null -> Unit
|
||||||
|
}
|
||||||
|
contentResolver.query(uri.build(), null, null, null, filter?.sortOrder?.name)?.use { cursor ->
|
||||||
|
val result = ArrayList<Manga>(cursor.count)
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
do {
|
||||||
|
result += cursor.getManga()
|
||||||
|
} while (cursor.moveToNext())
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}.orEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getDetailsImpl(manga: Manga): Manga = coroutineScope {
|
||||||
|
val chapters = async { queryChapters(manga.url) }
|
||||||
|
val details = queryDetails(manga.url)
|
||||||
|
Manga(
|
||||||
|
id = manga.id,
|
||||||
|
title = details.title.ifBlank { manga.title },
|
||||||
|
altTitle = details.altTitle.ifNullOrEmpty { manga.altTitle },
|
||||||
|
url = details.url.ifEmpty { manga.url },
|
||||||
|
publicUrl = details.publicUrl.ifEmpty { manga.publicUrl },
|
||||||
|
rating = maxOf(details.rating, manga.rating),
|
||||||
|
isNsfw = details.isNsfw,
|
||||||
|
coverUrl = details.coverUrl.ifEmpty { manga.coverUrl },
|
||||||
|
tags = details.tags + manga.tags,
|
||||||
|
state = details.state ?: manga.state,
|
||||||
|
author = details.author.ifNullOrEmpty { manga.author },
|
||||||
|
largeCoverUrl = details.largeCoverUrl.ifNullOrEmpty { manga.largeCoverUrl },
|
||||||
|
description = details.description.ifNullOrEmpty { manga.description },
|
||||||
|
chapters = chapters.await(),
|
||||||
|
source = source,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getPagesImpl(chapter: MangaChapter): List<MangaPage> = runInterruptible(Dispatchers.Default) {
|
||||||
|
val uri = "content://${source.authority}/chapters".toUri()
|
||||||
|
.buildUpon()
|
||||||
|
.appendPath(chapter.url)
|
||||||
|
.build()
|
||||||
|
contentResolver.query(uri, null, null, null, null)?.use { cursor ->
|
||||||
|
val result = ArrayList<MangaPage>(cursor.count)
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
do {
|
||||||
|
result += MangaPage(
|
||||||
|
id = cursor.getLong(0),
|
||||||
|
url = cursor.getString(1),
|
||||||
|
preview = cursor.getStringOrNull(2),
|
||||||
|
source = source,
|
||||||
|
)
|
||||||
|
} while (cursor.moveToNext())
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}.orEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getPageUrl(page: MangaPage): String = page.url
|
||||||
|
|
||||||
|
override suspend fun getTags(): Set<MangaTag> = runInterruptible(Dispatchers.Default) {
|
||||||
|
val uri = "content://${source.authority}/tags".toUri()
|
||||||
|
contentResolver.query(uri, null, null, null, null)?.use { cursor ->
|
||||||
|
val result = ArraySet<MangaTag>(cursor.count)
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
do {
|
||||||
|
result += MangaTag(
|
||||||
|
key = cursor.getString(0),
|
||||||
|
title = cursor.getString(1),
|
||||||
|
source = source,
|
||||||
|
)
|
||||||
|
} while (cursor.moveToNext())
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}.orEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getLocales(): Set<Locale> = emptySet()
|
||||||
|
|
||||||
|
override suspend fun getRelatedMangaImpl(seed: Manga): List<Manga> = emptyList() // TODO
|
||||||
|
|
||||||
|
private suspend fun queryDetails(url: String): Manga = runInterruptible(Dispatchers.Default) {
|
||||||
|
val uri = "content://${source.authority}/manga".toUri()
|
||||||
|
.buildUpon()
|
||||||
|
.appendPath(url)
|
||||||
|
.build()
|
||||||
|
checkNotNull(
|
||||||
|
contentResolver.query(uri, null, null, null, null)?.use { cursor ->
|
||||||
|
cursor.moveToFirst()
|
||||||
|
cursor.getManga()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun queryChapters(url: String): List<MangaChapter>? = runInterruptible(Dispatchers.Default) {
|
||||||
|
val uri = "content://${source.authority}/manga/chapters".toUri()
|
||||||
|
.buildUpon()
|
||||||
|
.appendPath(url)
|
||||||
|
.build()
|
||||||
|
contentResolver.query(uri, null, null, null, null)?.use { cursor ->
|
||||||
|
val result = ArrayList<MangaChapter>(cursor.count)
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
do {
|
||||||
|
result += MangaChapter(
|
||||||
|
id = cursor.getLong(0),
|
||||||
|
name = cursor.getString(1),
|
||||||
|
number = cursor.getFloat(2),
|
||||||
|
volume = cursor.getInt(3),
|
||||||
|
url = cursor.getString(4),
|
||||||
|
scanlator = cursor.getStringOrNull(5),
|
||||||
|
uploadDate = cursor.getLong(6),
|
||||||
|
branch = cursor.getStringOrNull(7),
|
||||||
|
source = source,
|
||||||
|
)
|
||||||
|
} while (cursor.moveToNext())
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun Cursor.getManga() = Manga(
|
||||||
|
id = getLong(0),
|
||||||
|
title = getString(1),
|
||||||
|
altTitle = getStringOrNull(2),
|
||||||
|
url = getString(3),
|
||||||
|
publicUrl = getString(4),
|
||||||
|
rating = getFloat(5),
|
||||||
|
isNsfw = getInt(6) > 1,
|
||||||
|
coverUrl = getString(7),
|
||||||
|
tags = getStringOrNull(8)?.split(':')?.mapNotNullToSet {
|
||||||
|
val parts = it.splitTwoParts('=') ?: return@mapNotNullToSet null
|
||||||
|
MangaTag(key = parts.first, title = parts.second, source = source)
|
||||||
|
}.orEmpty(),
|
||||||
|
state = getStringOrNull(9)?.let { MangaState.entries.find(it) },
|
||||||
|
author = optString(10),
|
||||||
|
largeCoverUrl = optString(11),
|
||||||
|
description = optString(12),
|
||||||
|
chapters = emptyList(),
|
||||||
|
source = source,
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun Cursor.optString(columnIndex: Int): String? {
|
||||||
|
return if (isNull(columnIndex)) {
|
||||||
|
null
|
||||||
|
} else {
|
||||||
|
getString(columnIndex)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun queryCapabilities(): MangaSourceCapabilities? {
|
||||||
|
val uri = "content://${source.authority}/capabilities".toUri()
|
||||||
|
return contentResolver.query(uri, null, null, null, null)?.use { cursor ->
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
MangaSourceCapabilities(
|
||||||
|
availableSortOrders = cursor.getStringOrNull(0)
|
||||||
|
?.split(',')
|
||||||
|
?.mapNotNullTo(EnumSet.noneOf(SortOrder::class.java)) {
|
||||||
|
SortOrder.entries.find(it)
|
||||||
|
}.orEmpty(),
|
||||||
|
availableStates = cursor.getStringOrNull(1)
|
||||||
|
?.split(',')
|
||||||
|
?.mapNotNullTo(EnumSet.noneOf(MangaState::class.java)) {
|
||||||
|
MangaState.entries.find(it)
|
||||||
|
}.orEmpty(),
|
||||||
|
availableContentRating = cursor.getStringOrNull(2)
|
||||||
|
?.split(',')
|
||||||
|
?.mapNotNullTo(EnumSet.noneOf(ContentRating::class.java)) {
|
||||||
|
ContentRating.entries.find(it)
|
||||||
|
}.orEmpty(),
|
||||||
|
isMultipleTagsSupported = cursor.getInt(3) > 1,
|
||||||
|
isTagsExclusionSupported = cursor.getInt(4) > 1,
|
||||||
|
isSearchSupported = cursor.getInt(5) > 1,
|
||||||
|
contentType = ContentType.entries.find(cursor.getString(6)) ?: ContentType.OTHER,
|
||||||
|
defaultSortOrder = cursor.getStringOrNull(7)?.let {
|
||||||
|
SortOrder.entries.find(it)
|
||||||
|
} ?: SortOrder.ALPHABETICAL,
|
||||||
|
sourceLocale = cursor.getStringOrNull(8)?.let { Locale(it) } ?: Locale.ROOT,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class MangaSourceCapabilities(
|
||||||
|
val availableSortOrders: Set<SortOrder>,
|
||||||
|
val availableStates: Set<MangaState>,
|
||||||
|
val availableContentRating: Set<ContentRating>,
|
||||||
|
val isMultipleTagsSupported: Boolean,
|
||||||
|
val isTagsExclusionSupported: Boolean,
|
||||||
|
val isSearchSupported: Boolean,
|
||||||
|
val contentType: ContentType,
|
||||||
|
val defaultSortOrder: SortOrder,
|
||||||
|
val sourceLocale: Locale,
|
||||||
|
)
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
package org.xtimms.shirizu.core.parser.external
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
|
||||||
|
data class ExternalMangaSource(
|
||||||
|
val packageName: String,
|
||||||
|
val authority: String,
|
||||||
|
) : MangaSource {
|
||||||
|
|
||||||
|
override val name: String
|
||||||
|
get() = "content:$packageName/$authority"
|
||||||
|
|
||||||
|
private var cachedName: String? = null
|
||||||
|
|
||||||
|
fun isAvailable(context: Context): Boolean {
|
||||||
|
return context.packageManager.resolveContentProvider(authority, 0)?.isEnabled == true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun resolveName(context: Context): String {
|
||||||
|
cachedName?.let {
|
||||||
|
return it
|
||||||
|
}
|
||||||
|
val pm = context.packageManager
|
||||||
|
val info = pm.resolveContentProvider(authority, 0)
|
||||||
|
return info?.loadLabel(pm)?.toString()?.also {
|
||||||
|
cachedName = it
|
||||||
|
} ?: authority
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package org.xtimms.shirizu.sections.details
|
|
||||||
|
|
||||||
import org.xtimms.shirizu.core.base.state.UiState
|
|
||||||
import org.xtimms.shirizu.sections.details.data.MangaDetails
|
|
||||||
|
|
||||||
data class DetailsUiState(
|
|
||||||
val details: MangaDetails? = null,
|
|
||||||
override val isLoading: Boolean = false,
|
|
||||||
override val message: String? = null,
|
|
||||||
) : UiState() {
|
|
||||||
override fun setLoading(value: Boolean) = copy(isLoading = value)
|
|
||||||
override fun setMessage(value: String?) = copy(message = value)
|
|
||||||
}
|
|
||||||
@ -1,6 +1,7 @@
|
|||||||
package org.xtimms.shirizu.sections.library.history
|
package org.xtimms.shirizu.sections.library.history
|
||||||
|
|
||||||
enum class SortOption {
|
enum class SortOption(id: Int) {
|
||||||
ALPHABETICAL,
|
ALPHABETICAL(0),
|
||||||
DATE_ADDED,
|
DATE_ADDED(1),
|
||||||
|
PROGRESS(2)
|
||||||
}
|
}
|
||||||
@ -0,0 +1,114 @@
|
|||||||
|
package org.xtimms.shirizu.sections.profile
|
||||||
|
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.IntrinsicSize
|
||||||
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.automirrored.outlined.HelpOutline
|
||||||
|
import androidx.compose.material.icons.outlined.HelpOutline
|
||||||
|
import androidx.compose.material.icons.outlined.Settings
|
||||||
|
import androidx.compose.material3.HorizontalDivider
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import coil.compose.AsyncImage
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaChapter
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.xtimms.shirizu.R
|
||||||
|
import org.xtimms.shirizu.core.ShirizuAsyncImage
|
||||||
|
import org.xtimms.shirizu.core.components.PreferenceItem
|
||||||
|
import org.xtimms.shirizu.core.components.PreferenceSubtitle
|
||||||
|
import org.xtimms.shirizu.sections.shelf.ShelfCategory
|
||||||
|
import org.xtimms.shirizu.sections.stats.ChaptersChart
|
||||||
|
import org.xtimms.shirizu.sections.stats.TimeCard
|
||||||
|
import org.xtimms.shirizu.sections.stats.categories.CategoriesChart
|
||||||
|
import org.xtimms.shirizu.ui.theme.ShirizuTheme
|
||||||
|
import org.xtimms.shirizu.utils.composable.bodyWidth
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun ProfileScreen(
|
||||||
|
modifier: Modifier = Modifier
|
||||||
|
) {
|
||||||
|
LazyColumn(
|
||||||
|
modifier = modifier.bodyWidth(),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
) {
|
||||||
|
item {
|
||||||
|
AsyncImage(
|
||||||
|
model = "https://avatars.githubusercontent.com/u/61558546?v=4",
|
||||||
|
contentDescription = "profile",
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(16.dp)
|
||||||
|
.clip(RoundedCornerShape(100))
|
||||||
|
.size(100.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
Text(text = "Xtimms", style = MaterialTheme.typography.titleLarge)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
Text(text = "My status", style = MaterialTheme.typography.bodyMedium)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
HorizontalDivider(modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp))
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
PreferenceSubtitle(text = stringResource(id = R.string.statistics))
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
TimeCard(
|
||||||
|
modifier = Modifier
|
||||||
|
.height(IntrinsicSize.Min)
|
||||||
|
.padding(horizontal = 16.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
CategoriesChart(
|
||||||
|
modifier = Modifier.padding(16.dp),
|
||||||
|
categories = listOf(
|
||||||
|
ShelfCategory(1, "Test 1", 3),
|
||||||
|
ShelfCategory(2, "Test 2", 4),
|
||||||
|
ShelfCategory(3, "Test 3", 6),
|
||||||
|
ShelfCategory(4, "Test 4", 7),
|
||||||
|
ShelfCategory(5, "Test 5", 13),
|
||||||
|
ShelfCategory(6, "Test 6", 12),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
PreferenceSubtitle(text = stringResource(id = R.string.menu))
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
PreferenceItem(
|
||||||
|
icon = Icons.Outlined.Settings,
|
||||||
|
title = stringResource(id = R.string.settings)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
PreferenceItem(
|
||||||
|
icon = Icons.AutoMirrored.Outlined.HelpOutline,
|
||||||
|
title = stringResource(id = R.string.help_centre)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Preview(showBackground = true)
|
||||||
|
@Composable
|
||||||
|
private fun ProfileScreenPreview() {
|
||||||
|
ShirizuTheme {
|
||||||
|
ProfileScreen()
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
package org.xtimms.shirizu.sections.profile
|
||||||
|
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.outlined.AccountCircle
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.SnackbarHostState
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.graphics.vector.rememberVectorPainter
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import cafe.adriel.voyager.navigator.tab.TabOptions
|
||||||
|
import org.xtimms.shirizu.R
|
||||||
|
import org.xtimms.shirizu.core.ShirizuAsyncImage
|
||||||
|
import org.xtimms.shirizu.core.components.Scaffold
|
||||||
|
import org.xtimms.shirizu.utils.composable.bodyWidth
|
||||||
|
import org.xtimms.shirizu.utils.lang.Tab
|
||||||
|
|
||||||
|
object ProfileTab : Tab {
|
||||||
|
|
||||||
|
private val snackbarHostState = SnackbarHostState()
|
||||||
|
|
||||||
|
override val options: TabOptions
|
||||||
|
@Composable
|
||||||
|
get() {
|
||||||
|
val image = Icons.Outlined.AccountCircle
|
||||||
|
return TabOptions(
|
||||||
|
index = 3u,
|
||||||
|
title = stringResource(R.string.profile),
|
||||||
|
icon = rememberVectorPainter(image),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
override fun Content() {
|
||||||
|
Scaffold(
|
||||||
|
snackbarHost = { snackbarHostState }
|
||||||
|
) {
|
||||||
|
ProfileScreen()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,101 +0,0 @@
|
|||||||
package org.xtimms.shirizu.sections.settings.sources
|
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
|
||||||
import androidx.compose.foundation.layout.asPaddingValues
|
|
||||||
import androidx.compose.foundation.layout.navigationBars
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.outlined.Apps
|
|
||||||
import androidx.compose.material.icons.outlined.NoAdultContent
|
|
||||||
import androidx.compose.material.icons.outlined.SettingsApplications
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|
||||||
import org.xtimms.shirizu.R
|
|
||||||
import org.xtimms.shirizu.core.components.PreferenceItem
|
|
||||||
import org.xtimms.shirizu.core.components.PreferenceSwitch
|
|
||||||
import org.xtimms.shirizu.core.components.ScaffoldWithTopAppBar
|
|
||||||
import org.xtimms.shirizu.core.prefs.AppSettings
|
|
||||||
import org.xtimms.shirizu.core.prefs.NSFW
|
|
||||||
|
|
||||||
const val SOURCES_DESTINATION = "sources"
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SourcesView(
|
|
||||||
viewModel: SourcesSettingsViewModel = hiltViewModel(),
|
|
||||||
navigateBack: () -> Unit,
|
|
||||||
navigateToSourcesCatalog: () -> Unit,
|
|
||||||
navigateToSourcesManagement: () -> Unit,
|
|
||||||
) {
|
|
||||||
|
|
||||||
val context = LocalContext.current
|
|
||||||
val availableSourcesCount = viewModel.availableSourcesCount.collectAsState(-1).value
|
|
||||||
val enabledSourcesCount = viewModel.enabledSourcesCount.collectAsState(-1).value
|
|
||||||
val state by viewModel.viewStateFlow.collectAsStateWithLifecycle()
|
|
||||||
|
|
||||||
var isNSFWEnabled by remember {
|
|
||||||
mutableStateOf(AppSettings.isNSFWEnabled())
|
|
||||||
}
|
|
||||||
|
|
||||||
ScaffoldWithTopAppBar(
|
|
||||||
title = stringResource(R.string.manga_sources),
|
|
||||||
navigateBack = navigateBack
|
|
||||||
) { padding ->
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier.padding(padding),
|
|
||||||
contentPadding = PaddingValues(
|
|
||||||
bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
item {
|
|
||||||
PreferenceItem(
|
|
||||||
title = stringResource(id = R.string.manage_sources),
|
|
||||||
description = if (enabledSourcesCount >= 0) {
|
|
||||||
context.resources.getQuantityString(
|
|
||||||
R.plurals.items,
|
|
||||||
enabledSourcesCount,
|
|
||||||
enabledSourcesCount
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
},
|
|
||||||
icon = Icons.Outlined.SettingsApplications,
|
|
||||||
onClick = { navigateToSourcesManagement() }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
item {
|
|
||||||
PreferenceItem(
|
|
||||||
title = stringResource(id = R.string.sources_catalog),
|
|
||||||
description = if (availableSourcesCount >= 0) {
|
|
||||||
stringResource(R.string.available_d, availableSourcesCount)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
},
|
|
||||||
icon = Icons.Outlined.Apps,
|
|
||||||
onClick = { navigateToSourcesCatalog() }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
item {
|
|
||||||
PreferenceSwitch(
|
|
||||||
title = stringResource(id = R.string.disable_nsfw),
|
|
||||||
description = stringResource(id = R.string.disable_nsfw_desc),
|
|
||||||
icon = Icons.Outlined.NoAdultContent,
|
|
||||||
isChecked = isNSFWEnabled
|
|
||||||
) {
|
|
||||||
isNSFWEnabled = !isNSFWEnabled
|
|
||||||
AppSettings.updateValue(NSFW, isNSFWEnabled)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
package org.xtimms.shirizu.sections.settings.sources.catalog
|
|
||||||
|
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.outlined.SearchOff
|
|
||||||
import androidx.room.InvalidationTracker
|
|
||||||
import dagger.assisted.Assisted
|
|
||||||
import dagger.assisted.AssistedFactory
|
|
||||||
import dagger.assisted.AssistedInject
|
|
||||||
import dagger.hilt.android.ViewModelLifecycle
|
|
||||||
import dagger.hilt.android.lifecycle.RetainedLifecycle
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.cancelAndJoin
|
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.update
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.koitharu.kotatsu.parsers.model.ContentType
|
|
||||||
import org.xtimms.shirizu.R
|
|
||||||
import org.xtimms.shirizu.core.database.TABLE_SOURCES
|
|
||||||
import org.xtimms.shirizu.core.database.ShirizuDatabase
|
|
||||||
import org.xtimms.shirizu.core.database.removeObserverAsync
|
|
||||||
import org.xtimms.shirizu.data.repository.MangaSourcesRepository
|
|
||||||
import org.xtimms.shirizu.utils.lang.lifecycleScope
|
|
||||||
|
|
||||||
class SourcesCatalogListProducer @AssistedInject constructor(
|
|
||||||
@Assisted private val locale: String?,
|
|
||||||
@Assisted private val contentType: ContentType,
|
|
||||||
@Assisted lifecycle: ViewModelLifecycle,
|
|
||||||
private val repository: MangaSourcesRepository,
|
|
||||||
private val database: ShirizuDatabase,
|
|
||||||
) : InvalidationTracker.Observer(TABLE_SOURCES), RetainedLifecycle.OnClearedListener {
|
|
||||||
|
|
||||||
private val scope = lifecycle.lifecycleScope
|
|
||||||
|
|
||||||
private var query: String? = null
|
|
||||||
val list = MutableStateFlow(emptyList<SourceCatalogItemModel>())
|
|
||||||
|
|
||||||
private var job = scope.launch(Dispatchers.Default) {
|
|
||||||
list.value = buildList()
|
|
||||||
}
|
|
||||||
|
|
||||||
init {
|
|
||||||
scope.launch(Dispatchers.Default) {
|
|
||||||
database.invalidationTracker.addObserver(this@SourcesCatalogListProducer)
|
|
||||||
}
|
|
||||||
lifecycle.addOnClearedListener(this)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCleared() {
|
|
||||||
database.invalidationTracker.removeObserverAsync(this)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onInvalidated(tables: Set<String>) {
|
|
||||||
val prevJob = job
|
|
||||||
job = scope.launch(Dispatchers.Default) {
|
|
||||||
prevJob.cancelAndJoin()
|
|
||||||
list.update { buildList() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setQuery(value: String?) {
|
|
||||||
this.query = value
|
|
||||||
onInvalidated(emptySet())
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun buildList(): List<SourceCatalogItemModel> {
|
|
||||||
val sources = repository.getDisabledSources().toMutableList()
|
|
||||||
when (val q = query) {
|
|
||||||
null -> sources.retainAll { it.contentType == contentType && it.locale == locale }
|
|
||||||
"" -> return emptyList()
|
|
||||||
else -> sources.retainAll { it.title.contains(q, ignoreCase = true) }
|
|
||||||
}
|
|
||||||
sources.sortBy { it.title }
|
|
||||||
return sources.map {
|
|
||||||
SourceCatalogItemModel(
|
|
||||||
source = it,
|
|
||||||
showSummary = query != null,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@AssistedFactory
|
|
||||||
interface Factory {
|
|
||||||
|
|
||||||
fun create(
|
|
||||||
locale: String?,
|
|
||||||
contentType: ContentType,
|
|
||||||
lifecycle: ViewModelLifecycle,
|
|
||||||
): SourcesCatalogListProducer
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
package org.xtimms.shirizu.sections.settings.sources.catalog
|
|
||||||
|
|
||||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.pager.rememberPagerState
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
|
||||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|
||||||
import coil.ImageLoader
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import org.xtimms.shirizu.R
|
|
||||||
import org.xtimms.shirizu.core.components.ScaffoldWithClassicTopAppBar
|
|
||||||
|
|
||||||
const val CATALOG_DESTINATION = "catalog"
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SourcesCatalogView(
|
|
||||||
coil: ImageLoader,
|
|
||||||
sourcesCatalogViewModel: SourcesCatalogViewModel = hiltViewModel(),
|
|
||||||
navigateBack: () -> Unit,
|
|
||||||
) {
|
|
||||||
|
|
||||||
val categories by sourcesCatalogViewModel.content.collectAsStateWithLifecycle(emptyList())
|
|
||||||
|
|
||||||
ScaffoldWithClassicTopAppBar(
|
|
||||||
title = stringResource(R.string.sources_catalog),
|
|
||||||
navigateBack = navigateBack
|
|
||||||
) { padding ->
|
|
||||||
Column(
|
|
||||||
modifier = Modifier.padding(padding)
|
|
||||||
) {
|
|
||||||
val pagerState = rememberPagerState(0) { categories.size }
|
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
if (categories.isNotEmpty()) {
|
|
||||||
SourcesCatalogTabs(
|
|
||||||
categories = categories,
|
|
||||||
pagerState = pagerState,
|
|
||||||
) { scope.launch { pagerState.animateScrollToPage(it) } }
|
|
||||||
}
|
|
||||||
|
|
||||||
SourcesCatalogPager(
|
|
||||||
coil = coil,
|
|
||||||
state = pagerState,
|
|
||||||
contentPadding = padding,
|
|
||||||
searchQuery = null,
|
|
||||||
getSourcesForPage = { categories }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
package org.xtimms.shirizu.sections.settings.sources.catalog
|
|
||||||
|
|
||||||
import androidx.annotation.MainThread
|
|
||||||
import androidx.lifecycle.viewModelScope
|
|
||||||
import dagger.hilt.android.internal.lifecycle.RetainedLifecycleImpl
|
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.SharingStarted
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import kotlinx.coroutines.flow.combine
|
|
||||||
import kotlinx.coroutines.flow.flatMapLatest
|
|
||||||
import kotlinx.coroutines.flow.map
|
|
||||||
import kotlinx.coroutines.flow.stateIn
|
|
||||||
import kotlinx.coroutines.plus
|
|
||||||
import org.koitharu.kotatsu.parsers.model.ContentType
|
|
||||||
import org.koitharu.kotatsu.parsers.model.MangaSource
|
|
||||||
import org.koitharu.kotatsu.parsers.util.mapToSet
|
|
||||||
import org.xtimms.shirizu.R
|
|
||||||
import org.xtimms.shirizu.core.base.viewmodel.KotatsuBaseViewModel
|
|
||||||
import org.xtimms.shirizu.core.prefs.AppSettings
|
|
||||||
import org.xtimms.shirizu.data.repository.MangaSourcesRepository
|
|
||||||
import org.xtimms.shirizu.utils.ReversibleAction
|
|
||||||
import org.xtimms.shirizu.utils.lang.MutableEventFlow
|
|
||||||
import org.xtimms.shirizu.utils.lang.call
|
|
||||||
import java.util.EnumMap
|
|
||||||
import java.util.EnumSet
|
|
||||||
import java.util.Locale
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@HiltViewModel
|
|
||||||
class SourcesCatalogViewModel @Inject constructor(
|
|
||||||
private val repository: MangaSourcesRepository,
|
|
||||||
private val listProducerFactory: SourcesCatalogListProducer.Factory,
|
|
||||||
) : KotatsuBaseViewModel() {
|
|
||||||
|
|
||||||
private val lifecycle = RetainedLifecycleImpl()
|
|
||||||
private var searchQuery: String? = null
|
|
||||||
val onActionDone = MutableEventFlow<ReversibleAction>()
|
|
||||||
val locales = repository.allMangaSources.mapToSet { it.locale }
|
|
||||||
val locale = MutableStateFlow(Locale.getDefault().language.takeIf { it in locales })
|
|
||||||
|
|
||||||
private val listProducers = locale.map { lc ->
|
|
||||||
createListProducers(lc)
|
|
||||||
}.stateIn(viewModelScope, SharingStarted.Eagerly, createListProducers(locale.value))
|
|
||||||
|
|
||||||
@OptIn(ExperimentalCoroutinesApi::class)
|
|
||||||
val content: StateFlow<List<SourceCatalogPage>> = listProducers.flatMapLatest {
|
|
||||||
val flows = it.entries.map { (type, producer) -> producer.list.map { x -> SourceCatalogPage(type, x) } }
|
|
||||||
combine<SourceCatalogPage, List<SourceCatalogPage>>(flows, Array<SourceCatalogPage>::toList)
|
|
||||||
}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
|
|
||||||
|
|
||||||
override fun onCleared() {
|
|
||||||
super.onCleared()
|
|
||||||
lifecycle.dispatchOnCleared()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun performSearch(query: String?) {
|
|
||||||
searchQuery = query
|
|
||||||
listProducers.value.forEach { (_, v) -> v.setQuery(query) }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setLocale(value: String?) {
|
|
||||||
locale.value = value
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addSource(source: MangaSource) {
|
|
||||||
launchJob(Dispatchers.Default) {
|
|
||||||
val rollback = repository.setSourceEnabled(source, true)
|
|
||||||
onActionDone.call(ReversibleAction(R.string.source_enabled, rollback))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@MainThread
|
|
||||||
private fun createListProducers(lc: String?): Map<ContentType, SourcesCatalogListProducer> {
|
|
||||||
val types = EnumSet.allOf(ContentType::class.java)
|
|
||||||
if (AppSettings.isNSFWEnabled()) {
|
|
||||||
types.remove(ContentType.HENTAI)
|
|
||||||
}
|
|
||||||
return types.associateWithTo(EnumMap(ContentType::class.java)) { type ->
|
|
||||||
listProducerFactory.create(lc, type, lifecycle).also {
|
|
||||||
it.setQuery(searchQuery)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue