diff --git a/.editorconfig b/.editorconfig
index e52454a9d..e99fe5d60 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,10 +8,12 @@ indent_style = tab
insert_final_newline = false
max_line_length = 120
tab_width = 4
+# noinspection EditorConfigKeyCorrectness
+disabled_rules=no-wildcard-imports,no-unused-imports
[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
ij_continuation_indent_size = 4
-[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
+[{*.kt,*.kts}]
ij_kotlin_allow_trailing_comma = true
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index a20140654..02304a073 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ["https://money.yandex.ru/to/410012543938752"]
+custom: ["https://yoomoney.ru/to/410012543938752"]
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bcabc0089..8ce1bb2e4 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/ktlint.xml b/.idea/ktlint.xml
new file mode 100644
index 000000000..e1ecd151a
--- /dev/null
+++ b/.idea/ktlint.xml
@@ -0,0 +1,7 @@
+
+
+
+ true
+ false
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index bf0ab9fee..b079e87af 100644
--- a/README.md
+++ b/README.md
@@ -25,15 +25,25 @@ Download APK from Github Releases:
* Tablet-optimized material design UI
* Standard and Webtoon-optimized reader
* Notifications about new chapters with updates feed
+* Available in multiple languages
+* Password protect access to the app
### Screenshots
-|  |  |  |
-|---|---|---|
-|  |  |  |
+|  |  |  |
+|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
+|  |  |  |
|  |  |
-|---|---|
+|-----------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
+
+### Localization
+
+
+
+
+
+Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages, please head over to the Weblate project page
### License
[](http://www.gnu.org/licenses/gpl-3.0.en.html)
diff --git a/app/build.gradle b/app/build.gradle
index 451235f9e..1225098d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,16 +6,16 @@ plugins {
}
android {
- compileSdkVersion 31
- buildToolsVersion '30.0.3'
+ compileSdkVersion 32
+ buildToolsVersion '32.0.0'
namespace 'org.koitharu.kotatsu'
defaultConfig {
applicationId 'org.koitharu.kotatsu'
minSdkVersion 21
- targetSdkVersion 31
- versionCode 381
- versionName '2.1.5'
+ targetSdkVersion 32
+ versionCode 400
+ versionName '3.0'
generatedDensities = []
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -49,15 +49,14 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
freeCompilerArgs += [
- '-Xjvm-default=enable',
- '-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
- '-Xopt-in=kotlinx.coroutines.FlowPreview',
- '-Xopt-in=kotlin.contracts.ExperimentalContracts',
+ '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+ '-opt-in=kotlinx.coroutines.FlowPreview',
+ '-opt-in=kotlin.contracts.ExperimentalContracts',
]
}
lint {
abortOnError false
- disable 'MissingTranslation'
+ disable 'MissingTranslation', 'PrivateResource'
}
testOptions {
unitTests.includeAndroidResources = true
@@ -66,8 +65,12 @@ android {
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+ implementation('com.github.nv95:kotatsu-parsers:0ee689cd2f') {
+ exclude group: 'org.json', module: 'json'
+ }
+
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.activity:activity-ktx:1.4.0'
@@ -83,7 +86,7 @@ dependencies {
implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.work:work-runtime-ktx:2.7.1'
- implementation 'com.google.android.material:material:1.6.0-alpha03'
+ implementation 'com.google.android.material:material:1.6.0-beta01'
//noinspection LifecycleAnnotationProcessorWithJava8
kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
@@ -93,12 +96,11 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'com.squareup.okio:okio:3.0.0'
- implementation 'org.jsoup:jsoup:1.14.3'
- implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.1'
- implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.1'
+ implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
+ implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
- implementation 'io.insert-koin:koin-android:3.1.5'
+ implementation 'io.insert-koin:koin-android:3.1.6'
implementation 'io.coil-kt:coil-base:1.4.0'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
implementation 'com.github.solkin:disk-lru-cache:1.4'
@@ -106,10 +108,7 @@ dependencies {
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
testImplementation 'junit:junit:4.13.2'
- testImplementation 'com.google.truth:truth:1.1.3'
- testImplementation 'org.json:json:20211205'
- testImplementation 'io.webfolder:quickjs:1.1.0'
- testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0'
+ testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
testImplementation 'io.insert-koin:koin-test-junit4:3.1.5'
androidTestImplementation 'androidx.test:runner:1.4.0'
@@ -117,5 +116,4 @@ dependencies {
androidTestImplementation 'androidx.test:core-ktx:1.4.0'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
androidTestImplementation 'androidx.room:room-testing:2.4.2'
- androidTestImplementation 'com.google.truth:truth:1.1.3'
}
\ No newline at end of file
diff --git a/app/src/debug/res/values/bools.xml b/app/src/debug/res/values/bools.xml
index fc8a7be3d..037cba998 100644
--- a/app/src/debug/res/values/bools.xml
+++ b/app/src/debug/res/values/bools.xml
@@ -1,4 +1,4 @@
-
- false
+
+ false
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d177b69df..d5402bdd5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,20 +8,23 @@
-
+
@@ -50,17 +53,12 @@
+
-
-
-
-
-
@@ -105,6 +103,7 @@
android:windowSoftInputMode="adjustResize" />
diff --git a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
index b7c912d19..8d8252937 100644
--- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt
@@ -7,11 +7,9 @@ import androidx.fragment.app.strictmode.FragmentStrictMode
import org.koin.android.ext.android.get
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.startKoin
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
import org.koitharu.kotatsu.core.db.databaseModule
import org.koitharu.kotatsu.core.github.githubModule
import org.koitharu.kotatsu.core.network.networkModule
-import org.koitharu.kotatsu.core.parser.parserModule
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.ui.AppCrashHandler
import org.koitharu.kotatsu.core.ui.uiModule
@@ -23,6 +21,7 @@ import org.koitharu.kotatsu.local.domain.LocalMangaRepository
import org.koitharu.kotatsu.local.localModule
import org.koitharu.kotatsu.main.mainModule
import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.reader.readerModule
import org.koitharu.kotatsu.remotelist.remoteListModule
import org.koitharu.kotatsu.search.searchModule
@@ -57,7 +56,6 @@ class KotatsuApp : Application() {
databaseModule,
githubModule,
uiModule,
- parserModule,
mainModule,
searchModule,
localModule,
@@ -97,6 +95,7 @@ class KotatsuApp : Application() {
.detectWrongFragmentContainer()
.detectRetainInstanceUsage()
.detectSetUserVisibleHint()
+ .detectFragmentTagUsage()
.build()
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
index e51857f55..179d87868 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaDataRepository.kt
@@ -2,22 +2,19 @@ package org.koitharu.kotatsu.base.domain
import androidx.room.withTransaction
import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.core.db.entity.*
import org.koitharu.kotatsu.core.prefs.ReaderMode
-import org.koitharu.kotatsu.utils.ext.mapToSet
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
class MangaDataRepository(private val db: MangaDatabase) {
suspend fun savePreferences(manga: Manga, mode: ReaderMode) {
- val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
+ val tags = manga.tags.toEntities()
db.withTransaction {
db.tagsDao.upsert(tags)
- db.mangaDao.upsert(MangaEntity.from(manga), tags)
+ db.mangaDao.upsert(manga.toEntity(), tags)
db.preferencesDao.upsert(
MangaPrefsEntity(
mangaId = manga.id,
@@ -37,21 +34,19 @@ class MangaDataRepository(private val db: MangaDatabase) {
suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
intent.manga != null -> intent.manga
- intent.mangaId != MangaIntent.ID_NONE -> db.mangaDao.find(intent.mangaId)?.toManga()
+ intent.mangaId != 0L -> findMangaById(intent.mangaId)
else -> null // TODO resolve uri
}
suspend fun storeManga(manga: Manga) {
- val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
+ val tags = manga.tags.toEntities()
db.withTransaction {
db.tagsDao.upsert(tags)
- db.mangaDao.upsert(MangaEntity.from(manga), tags)
+ db.mangaDao.upsert(manga.toEntity(), tags)
}
}
suspend fun findTags(source: MangaSource): Set {
- return db.tagsDao.findTags(source.name).mapToSet {
- it.toMangaTag()
- }
+ return db.tagsDao.findTags(source.name).toMangaTags()
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
index cfd7d7b4f..fccd1e9fd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaIntent.kt
@@ -3,7 +3,8 @@ package org.koitharu.kotatsu.base.domain
import android.content.Intent
import android.net.Uri
import android.os.Bundle
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.parsers.model.Manga
class MangaIntent private constructor(
val manga: Manga?,
@@ -12,13 +13,13 @@ class MangaIntent private constructor(
) {
constructor(intent: Intent?) : this(
- manga = intent?.getParcelableExtra(KEY_MANGA),
+ manga = intent?.getParcelableExtra(KEY_MANGA)?.manga,
mangaId = intent?.getLongExtra(KEY_ID, ID_NONE) ?: ID_NONE,
uri = intent?.data
)
constructor(args: Bundle?) : this(
- manga = args?.getParcelable(KEY_MANGA),
+ manga = args?.getParcelable(KEY_MANGA)?.manga,
mangaId = args?.getLong(KEY_ID, ID_NONE) ?: ID_NONE,
uri = null
)
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
deleted file mode 100644
index eb941a696..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaLoaderContext.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.koitharu.kotatsu.base.domain
-
-import android.annotation.SuppressLint
-import android.webkit.WebView
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koitharu.kotatsu.core.exceptions.GraphQLException
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.parseJson
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-open class MangaLoaderContext(
- private val okHttp: OkHttpClient,
- val cookieJar: CookieJar,
-) : KoinComponent {
-
- suspend fun httpGet(url: String, headers: Headers? = null): Response {
- val request = Request.Builder()
- .get()
- .url(url)
- if (headers != null) {
- request.headers(headers)
- }
- return okHttp.newCall(request.build()).await()
- }
-
- suspend fun httpPost(
- url: String,
- form: Map,
- ): Response {
- val body = FormBody.Builder()
- form.forEach { (k, v) ->
- body.addEncoded(k, v)
- }
- val request = Request.Builder()
- .post(body.build())
- .url(url)
- return okHttp.newCall(request.build()).await()
- }
-
- suspend fun httpPost(
- url: String,
- payload: String,
- ): Response {
- val body = FormBody.Builder()
- payload.split('&').forEach {
- val pos = it.indexOf('=')
- if (pos != -1) {
- val k = it.substring(0, pos)
- val v = it.substring(pos + 1)
- body.addEncoded(k, v)
- }
- }
- val request = Request.Builder()
- .post(body.build())
- .url(url)
- return okHttp.newCall(request.build()).await()
- }
-
- suspend fun graphQLQuery(endpoint: String, query: String): JSONObject {
- val body = JSONObject()
- body.put("operationName", null)
- body.put("variables", JSONObject())
- body.put("query", "{${query}}")
- val mediaType = "application/json; charset=utf-8".toMediaType()
- val requestBody = body.toString().toRequestBody(mediaType)
- val request = Request.Builder()
- .post(requestBody)
- .url(endpoint)
- val json = okHttp.newCall(request.build()).await().parseJson()
- json.optJSONArray("errors")?.let {
- if (it.length() != 0) {
- throw GraphQLException(it)
- }
- }
- return json
- }
-
- @SuppressLint("SetJavaScriptEnabled")
- open suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
- val webView = WebView(get())
- webView.settings.javaScriptEnabled = true
- suspendCoroutine { cont ->
- webView.evaluateJavascript(script) { result ->
- cont.resume(result?.takeUnless { it == "null" })
- }
- }
- }
-
- open fun getSettings(source: MangaSource) = SourceSettings(get(), source)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
index 52956c902..09a970eee 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
@@ -10,11 +10,11 @@ import okhttp3.Request
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.MangaPage
import org.koitharu.kotatsu.core.network.CommonHeaders
import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.medianOrNull
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.medianOrNull
import java.io.InputStream
import java.util.zip.ZipFile
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt
index c364071bf..e1e328c8f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/AlertDialogFragment.kt
@@ -42,4 +42,4 @@ abstract class AlertDialogFragment : DialogFragment() {
protected fun bindingOrNull(): B? = viewBinding
protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
index c14d81151..54cae9713 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
@@ -7,23 +7,27 @@ import android.view.KeyEvent
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
+import androidx.annotation.CallSuper
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.ActionBarContextView
import androidx.appcompat.widget.Toolbar
import androidx.core.app.ActivityCompat
-import androidx.core.graphics.Insets
-import androidx.core.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
import androidx.viewbinding.ViewBinding
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
import org.koin.android.ext.android.get
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
import org.koitharu.kotatsu.core.prefs.AppSettings
-abstract class BaseActivity : AppCompatActivity(), OnApplyWindowInsetsListener {
+abstract class BaseActivity : AppCompatActivity(),
+ WindowInsetsDelegate.WindowInsetsListener {
protected lateinit var binding: B
private set
@@ -31,7 +35,10 @@ abstract class BaseActivity : AppCompatActivity(), OnApplyWindo
@Suppress("LeakingThis")
protected val exceptionResolver = ExceptionResolver(this)
- private var lastInsets: Insets = Insets.NONE
+ @Suppress("LeakingThis")
+ protected val insetsDelegate = WindowInsetsDelegate(this)
+
+ val actionModeDelegate = ActionModeDelegate()
override fun onCreate(savedInstanceState: Bundle?) {
val settings = get()
@@ -41,6 +48,7 @@ abstract class BaseActivity : AppCompatActivity(), OnApplyWindo
}
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, false)
+ insetsDelegate.handleImeInsets = true
}
@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
@@ -60,28 +68,7 @@ abstract class BaseActivity : AppCompatActivity(), OnApplyWindo
super.setContentView(binding.root)
val toolbar = (binding.root.findViewById(R.id.toolbar) as? Toolbar)
toolbar?.let(this::setSupportActionBar)
- ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
-
- val toolbarParams = (binding.root.findViewById(R.id.toolbar_card) ?: toolbar)
- ?.layoutParams as? AppBarLayout.LayoutParams
- if (toolbarParams != null) {
- if (get().isToolbarHideWhenScrolling) {
- toolbarParams.scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS or SCROLL_FLAG_SNAP
- } else {
- toolbarParams.scrollFlags = SCROLL_FLAG_NO_SCROLL
- }
- }
- }
-
- override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
- val baseInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
- val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
- val newInsets = Insets.max(baseInsets, imeInsets)
- if (newInsets != lastInsets) {
- onWindowInsetsChanged(newInsets)
- lastInsets = newInsets
- }
- return insets
+ insetsDelegate.onViewCreated(binding.root)
}
override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
@@ -97,8 +84,6 @@ abstract class BaseActivity : AppCompatActivity(), OnApplyWindo
return super.onKeyDown(keyCode, event)
}
- protected abstract fun onWindowInsetsChanged(insets: Insets)
-
private fun setupToolbar() {
(findViewById(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
}
@@ -109,8 +94,10 @@ abstract class BaseActivity : AppCompatActivity(), OnApplyWindo
return isNight && get().isAmoledTheme
}
+ @CallSuper
override fun onSupportActionModeStarted(mode: ActionMode) {
super.onSupportActionModeStarted(mode)
+ actionModeDelegate.onSupportActionModeStarted(mode)
val insets = ViewCompat.getRootWindowInsets(binding.root)
?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return
val view = findViewById(androidx.appcompat.R.id.action_mode_bar)
@@ -119,6 +106,12 @@ abstract class BaseActivity : AppCompatActivity(), OnApplyWindo
}
}
+ @CallSuper
+ override fun onSupportActionModeFinished(mode: ActionMode) {
+ super.onSupportActionModeFinished(mode)
+ actionModeDelegate.onSupportActionModeFinished(mode)
+ }
+
override fun onBackPressed() {
if ( // https://issuetracker.google.com/issues/139738913
Build.VERSION.SDK_INT == Build.VERSION_CODES.Q &&
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
index d65e031fa..0672b880f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -9,11 +9,11 @@ import android.view.ViewGroup.LayoutParams
import androidx.appcompat.app.AppCompatDialog
import androidx.core.view.updateLayoutParams
import androidx.viewbinding.ViewBinding
+import com.google.android.material.R as materialR
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import org.koitharu.kotatsu.R
-import com.google.android.material.R as materialR
abstract class BaseBottomSheet : BottomSheetDialogFragment() {
@@ -42,7 +42,7 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return if (resources.getBoolean(R.bool.is_tablet)) {
- AppCompatDialog(context, theme)
+ AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
} else super.onCreateDialog(savedInstanceState)
}
@@ -60,4 +60,4 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() {
}
b.isDraggable = !isLocked
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
index 25ca6a503..17c8931b1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseFragment.kt
@@ -1,19 +1,18 @@
package org.koitharu.kotatsu.base.ui
-import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import androidx.core.graphics.Insets
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
import androidx.fragment.app.Fragment
import androidx.viewbinding.ViewBinding
+import org.koitharu.kotatsu.base.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-abstract class BaseFragment : Fragment(), OnApplyWindowInsetsListener {
+abstract class BaseFragment :
+ Fragment(),
+ WindowInsetsDelegate.WindowInsetsListener {
private var viewBinding: B? = null
@@ -23,7 +22,11 @@ abstract class BaseFragment : Fragment(), OnApplyWindowInsetsLi
@Suppress("LeakingThis")
protected val exceptionResolver = ExceptionResolver(this)
- private var lastInsets: Insets = Insets.NONE
+ @Suppress("LeakingThis")
+ protected val insetsDelegate = WindowInsetsDelegate(this)
+
+ protected val actionModeDelegate: ActionModeDelegate
+ get() = (requireActivity() as BaseActivity<*>).actionModeDelegate
override fun onCreateView(
inflater: LayoutInflater,
@@ -37,36 +40,16 @@ abstract class BaseFragment : Fragment(), OnApplyWindowInsetsLi
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- lastInsets = Insets.NONE
- ViewCompat.setOnApplyWindowInsetsListener(view, this)
+ insetsDelegate.onViewCreated(view)
}
override fun onDestroyView() {
viewBinding = null
+ insetsDelegate.onDestroyView()
super.onDestroyView()
}
- open fun getTitle(): CharSequence? = null
-
- override fun onAttach(context: Context) {
- super.onAttach(context)
- getTitle()?.let {
- activity?.title = it
- }
- }
-
- override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
- val newInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
- if (newInsets != lastInsets) {
- onWindowInsetsChanged(newInsets)
- lastInsets = newInsets
- }
- return insets
- }
-
protected fun bindingOrNull() = viewBinding
protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
-
- protected abstract fun onWindowInsetsChanged(insets: Insets)
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
index 4d6a307cb..2125d044c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BasePreferenceFragment.kt
@@ -2,38 +2,61 @@ package org.koitharu.kotatsu.base.ui
import android.os.Bundle
import android.view.View
+import androidx.annotation.CallSuper
import androidx.annotation.StringRes
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.graphics.Insets
import androidx.core.view.updatePadding
+import androidx.fragment.app.Fragment
import androidx.preference.PreferenceFragmentCompat
+import androidx.recyclerview.widget.RecyclerView
import org.koin.android.ext.android.inject
+import org.koitharu.kotatsu.base.ui.util.RecyclerViewOwner
+import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.SettingsHeadersFragment
-abstract class BasePreferenceFragment(@StringRes private val titleId: Int) : PreferenceFragmentCompat(),
- OnApplyWindowInsetsListener {
+abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
+ PreferenceFragmentCompat(),
+ WindowInsetsDelegate.WindowInsetsListener,
+ RecyclerViewOwner {
protected val settings by inject(mode = LazyThreadSafetyMode.NONE)
+ @Suppress("LeakingThis")
+ protected val insetsDelegate = WindowInsetsDelegate(this)
+
+ override val recyclerView: RecyclerView
+ get() = listView
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
listView.clipToPadding = false
- ViewCompat.setOnApplyWindowInsetsListener(view, this)
+ insetsDelegate.onViewCreated(view)
+ }
+
+ override fun onDestroyView() {
+ insetsDelegate.onDestroyView()
+ super.onDestroyView()
}
override fun onResume() {
super.onResume()
- activity?.setTitle(titleId)
+ if (titleId != 0) {
+ setTitle(getString(titleId))
+ }
}
- override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat): WindowInsetsCompat {
- val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+ @CallSuper
+ override fun onWindowInsetsChanged(insets: Insets) {
listView.updatePadding(
- left = systemBars.left,
- right = systemBars.right,
- bottom = systemBars.bottom
+ bottom = insets.bottom
)
- return insets
}
-}
+
+ @Suppress("UsePropertyAccessSyntax")
+ protected fun setTitle(title: CharSequence) {
+ (parentFragment as? SettingsHeadersFragment)?.setTitle(title)
+ ?: activity?.setTitle(title)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
index 8d1c5e279..50d8fe803 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
@@ -3,11 +3,11 @@ package org.koitharu.kotatsu.base.ui
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
import kotlinx.coroutines.*
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.utils.SingleLiveEvent
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
abstract class BaseViewModel : ViewModel() {
@@ -33,7 +33,7 @@ abstract class BaseViewModel : ViewModel() {
}
}
- protected fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
+ private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
if (BuildConfig.DEBUG) {
throwable.printStackTrace()
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt
new file mode 100644
index 000000000..ac624d3c6
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/AbstractSelectionItemDecoration.kt
@@ -0,0 +1,111 @@
+package org.koitharu.kotatsu.base.ui.list.decor
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.RectF
+import android.view.View
+import androidx.core.view.children
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_ID
+
+abstract class AbstractSelectionItemDecoration : RecyclerView.ItemDecoration() {
+
+ private val bounds = Rect()
+ private val boundsF = RectF()
+ private val selection = HashSet()
+
+ protected var hasBackground: Boolean = true
+ protected var hasForeground: Boolean = false
+ protected var isIncludeDecorAndMargins: Boolean = true
+
+ val checkedItemsCount: Int
+ get() = selection.size
+
+ val checkedItemsIds: Set
+ get() = selection
+
+ fun toggleItemChecked(id: Long) {
+ if (!selection.remove(id)) {
+ selection.add(id)
+ }
+ }
+
+ fun setItemIsChecked(id: Long, isChecked: Boolean) {
+ if (isChecked) {
+ selection.add(id)
+ } else {
+ selection.remove(id)
+ }
+ }
+
+ fun checkAll(ids: Collection) {
+ selection.addAll(ids)
+ }
+
+ fun clearSelection() {
+ selection.clear()
+ }
+
+ override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+ if (hasBackground) {
+ doDraw(canvas, parent, state, false)
+ } else {
+ super.onDraw(canvas, parent, state)
+ }
+ }
+
+ override fun onDrawOver(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+ if (hasForeground) {
+ doDraw(canvas, parent, state, true)
+ } else {
+ super.onDrawOver(canvas, parent, state)
+ }
+ }
+
+ private fun doDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State, isOver: Boolean) {
+ val checkpoint = canvas.save()
+ if (parent.clipToPadding) {
+ canvas.clipRect(
+ parent.paddingLeft, parent.paddingTop, parent.width - parent.paddingRight,
+ parent.height - parent.paddingBottom
+ )
+ }
+
+ for (child in parent.children) {
+ val itemId = getItemId(parent, child)
+ if (itemId != NO_ID && itemId in selection) {
+ if (isIncludeDecorAndMargins) {
+ parent.getDecoratedBoundsWithMargins(child, bounds)
+ } else {
+ bounds.set(child.left, child.top, child.right, child.bottom)
+ }
+ boundsF.set(bounds)
+ boundsF.offset(child.translationX, child.translationY)
+ if (isOver) {
+ onDrawForeground(canvas, parent, child, boundsF, state)
+ } else {
+ onDrawBackground(canvas, parent, child, boundsF, state)
+ }
+ }
+ }
+ canvas.restoreToCount(checkpoint)
+ }
+
+ protected open fun getItemId(parent: RecyclerView, child: View) = parent.getChildItemId(child)
+
+ protected open fun onDrawBackground(
+ canvas: Canvas,
+ parent: RecyclerView,
+ child: View,
+ bounds: RectF,
+ state: RecyclerView.State,
+ ) = Unit
+
+ protected open fun onDrawForeground(
+ canvas: Canvas,
+ parent: RecyclerView,
+ child: View,
+ bounds: RectF,
+ state: RecyclerView.State,
+ ) = Unit
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt
new file mode 100644
index 000000000..68a65e638
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeDelegate.kt
@@ -0,0 +1,50 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.appcompat.view.ActionMode
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+
+class ActionModeDelegate {
+
+ private var activeActionMode: ActionMode? = null
+ private var listeners: MutableList? = null
+
+ val isActionModeStarted: Boolean
+ get() = activeActionMode != null
+
+ fun onSupportActionModeStarted(mode: ActionMode) {
+ activeActionMode = mode
+ listeners?.forEach { it.onActionModeStarted(mode) }
+ }
+
+ fun onSupportActionModeFinished(mode: ActionMode) {
+ activeActionMode = null
+ listeners?.forEach { it.onActionModeFinished(mode) }
+ }
+
+ fun addListener(listener: ActionModeListener) {
+ if (listeners == null) {
+ listeners = ArrayList()
+ }
+ checkNotNull(listeners).add(listener)
+ }
+
+ fun removeListener(listener: ActionModeListener) {
+ listeners?.remove(listener)
+ }
+
+ fun addListener(listener: ActionModeListener, owner: LifecycleOwner) {
+ addListener(listener)
+ owner.lifecycle.addObserver(ListenerLifecycleObserver(listener))
+ }
+
+ private inner class ListenerLifecycleObserver(
+ private val listener: ActionModeListener,
+ ) : DefaultLifecycleObserver {
+
+ override fun onDestroy(owner: LifecycleOwner) {
+ super.onDestroy(owner)
+ removeListener(listener)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeListener.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeListener.kt
new file mode 100644
index 000000000..0c87ff612
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ActionModeListener.kt
@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.appcompat.view.ActionMode
+
+interface ActionModeListener {
+
+ fun onActionModeStarted(mode: ActionMode)
+
+ fun onActionModeFinished(mode: ActionMode)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/RecyclerViewOwner.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/RecyclerViewOwner.kt
new file mode 100644
index 000000000..9b0976d51
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/RecyclerViewOwner.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.recyclerview.widget.RecyclerView
+
+interface RecyclerViewOwner {
+
+ val recyclerView: RecyclerView
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt
new file mode 100644
index 000000000..526c1e986
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ShrinkOnScrollBehavior.kt
@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
+import androidx.core.view.ViewCompat
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+
+class ShrinkOnScrollBehavior : Behavior {
+
+ @Suppress("unused") constructor() : super()
+ @Suppress("unused") constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
+
+ override fun onStartNestedScroll(
+ coordinatorLayout: CoordinatorLayout,
+ child: ExtendedFloatingActionButton,
+ directTargetChild: View,
+ target: View,
+ axes: Int,
+ type: Int
+ ): Boolean {
+ return axes == ViewCompat.SCROLL_AXIS_VERTICAL
+ }
+
+ override fun onNestedScroll(
+ coordinatorLayout: CoordinatorLayout,
+ child: ExtendedFloatingActionButton,
+ target: View,
+ dxConsumed: Int,
+ dyConsumed: Int,
+ dxUnconsumed: Int,
+ dyUnconsumed: Int,
+ type: Int,
+ consumed: IntArray
+ ) {
+ if (dyConsumed > 0) {
+ if (child.isExtended) {
+ child.shrink()
+ }
+ } else if (dyConsumed < 0) {
+ if (!child.isExtended) {
+ child.extend()
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt
new file mode 100644
index 000000000..5f1f0cd5e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/WindowInsetsDelegate.kt
@@ -0,0 +1,69 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import android.view.View
+import androidx.core.graphics.Insets
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+class WindowInsetsDelegate(
+ private val listener: WindowInsetsListener,
+) : OnApplyWindowInsetsListener, View.OnLayoutChangeListener {
+
+ var handleImeInsets: Boolean = false
+
+ var interceptingWindowInsetsListener: OnApplyWindowInsetsListener? = null
+
+ private var lastInsets: Insets? = null
+
+ override fun onApplyWindowInsets(v: View?, insets: WindowInsetsCompat?): WindowInsetsCompat? {
+ if (insets == null) {
+ return null
+ }
+ val handledInsets = interceptingWindowInsetsListener?.onApplyWindowInsets(v, insets) ?: insets
+ val newInsets = if (handleImeInsets) {
+ Insets.max(
+ handledInsets.getInsets(WindowInsetsCompat.Type.systemBars()),
+ handledInsets.getInsets(WindowInsetsCompat.Type.ime()),
+ )
+ } else {
+ handledInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+ }
+ if (newInsets != lastInsets) {
+ listener.onWindowInsetsChanged(newInsets)
+ lastInsets = newInsets
+ }
+ return handledInsets
+ }
+
+ override fun onLayoutChange(
+ view: View,
+ left: Int,
+ top: Int,
+ right: Int,
+ bottom: Int,
+ oldLeft: Int,
+ oldTop: Int,
+ oldRight: Int,
+ oldBottom: Int,
+ ) {
+ view.removeOnLayoutChangeListener(this)
+ if (lastInsets == null) { // Listener may not be called
+ onApplyWindowInsets(view, ViewCompat.getRootWindowInsets(view))
+ }
+ }
+
+ fun onViewCreated(view: View) {
+ ViewCompat.setOnApplyWindowInsetsListener(view, this)
+ view.addOnLayoutChangeListener(this)
+ }
+
+ fun onDestroyView() {
+ lastInsets = null
+ }
+
+ interface WindowInsetsListener {
+
+ fun onWindowInsetsChanged(insets: Insets)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
index 7d8730c33..c20b615cf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
@@ -80,6 +80,7 @@ class ChipsView @JvmOverloads constructor(
chip.setOnCloseIconClickListener(chipOnCloseListener)
chip.setEnsureMinTouchTargetSize(false)
chip.setOnClickListener(chipOnClickListener)
+ chip.isCheckable = false
addView(chip)
return chip
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
new file mode 100644
index 000000000..7004192ad
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
@@ -0,0 +1,126 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.content.res.TypedArray
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.InsetDrawable
+import android.graphics.drawable.RippleDrawable
+import android.graphics.drawable.ShapeDrawable
+import android.graphics.drawable.shapes.RectShape
+import android.util.AttributeSet
+import androidx.annotation.AttrRes
+import androidx.appcompat.widget.AppCompatCheckedTextView
+import androidx.core.content.res.use
+import androidx.core.content.withStyledAttributes
+import com.google.android.material.ripple.RippleUtils
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.ShapeAppearanceModel
+import org.koitharu.kotatsu.R
+
+@SuppressLint("RestrictedApi")
+class ListItemTextView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ @AttrRes defStyleAttr: Int = R.attr.listItemTextViewStyle,
+) : AppCompatCheckedTextView(context, attrs, defStyleAttr) {
+
+ private var checkedDrawableStart: Drawable? = null
+ private var checkedDrawableEnd: Drawable? = null
+ private var isInitialized = false
+ private var isCheckDrawablesVisible: Boolean = false
+ private var defaultPaddingStart: Int = 0
+ private var defaultPaddingEnd: Int = 0
+
+ init {
+ context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) {
+ val itemRippleColor = getColorStateList(R.styleable.ListItemTextView_rippleColor)
+ ?: getRippleColorFallback(context)
+ val shape = createShapeDrawable(this)
+ background = RippleDrawable(
+ RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
+ shape,
+ ShapeDrawable(RectShape()),
+ )
+ checkedDrawableStart = getDrawable(R.styleable.ListItemTextView_checkedDrawableStart)
+ checkedDrawableEnd = getDrawable(R.styleable.ListItemTextView_checkedDrawableEnd)
+ }
+ checkedDrawableStart?.setTintList(textColors)
+ checkedDrawableEnd?.setTintList(textColors)
+ defaultPaddingStart = paddingStart
+ defaultPaddingEnd = paddingEnd
+ isInitialized = true
+ adjustCheckDrawables()
+ }
+
+ override fun refreshDrawableState() {
+ super.refreshDrawableState()
+ adjustCheckDrawables()
+ }
+
+ override fun setTextColor(colors: ColorStateList?) {
+ checkedDrawableStart?.setTintList(colors)
+ checkedDrawableEnd?.setTintList(colors)
+ super.setTextColor(colors)
+ }
+
+ override fun setPaddingRelative(start: Int, top: Int, end: Int, bottom: Int) {
+ defaultPaddingStart = start
+ defaultPaddingEnd = end
+ super.setPaddingRelative(start, top, end, bottom)
+ }
+
+ override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
+ val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
+ defaultPaddingStart = if (isRtl) right else left
+ defaultPaddingEnd = if (isRtl) left else right
+ super.setPadding(left, top, right, bottom)
+ }
+
+ private fun adjustCheckDrawables() {
+ if (isInitialized && isCheckDrawablesVisible != isChecked) {
+ setCompoundDrawablesRelativeWithIntrinsicBounds(
+ if (isChecked) checkedDrawableStart else null,
+ null,
+ if (isChecked) checkedDrawableEnd else null,
+ null,
+ )
+ super.setPaddingRelative(
+ if (isChecked && checkedDrawableStart != null) {
+ defaultPaddingStart + compoundDrawablePadding
+ } else defaultPaddingStart,
+ paddingTop,
+ if (isChecked && checkedDrawableEnd != null) {
+ defaultPaddingEnd + compoundDrawablePadding
+ } else defaultPaddingEnd,
+ paddingBottom,
+ )
+ isCheckDrawablesVisible = isChecked
+ }
+ }
+
+ private fun createShapeDrawable(ta: TypedArray): InsetDrawable {
+ val shapeAppearance = ShapeAppearanceModel.builder(
+ context,
+ ta.getResourceId(R.styleable.ListItemTextView_shapeAppearance, 0),
+ ta.getResourceId(R.styleable.ListItemTextView_shapeAppearanceOverlay, 0),
+ ).build()
+ val shapeDrawable = MaterialShapeDrawable(shapeAppearance)
+ shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundTint)
+ return InsetDrawable(
+ shapeDrawable,
+ ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetLeft, 0),
+ ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetTop, 0),
+ ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetRight, 0),
+ ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetBottom, 0),
+ )
+ }
+
+ private fun getRippleColorFallback(context: Context): ColorStateList {
+ return context.obtainStyledAttributes(intArrayOf(android.R.attr.colorControlHighlight)).use {
+ it.getColorStateList(0)
+ } ?: ColorStateList.valueOf(Color.TRANSPARENT)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/ProgressChromeClient.kt b/app/src/main/java/org/koitharu/kotatsu/browser/ProgressChromeClient.kt
index 0d890397e..1b29d7339 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/ProgressChromeClient.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/ProgressChromeClient.kt
@@ -4,7 +4,6 @@ import android.webkit.WebChromeClient
import android.webkit.WebView
import androidx.core.view.isVisible
import com.google.android.material.progressindicator.BaseProgressIndicator
-import org.koitharu.kotatsu.utils.ext.setIndeterminateCompat
private const val PROGRESS_MAX = 100
@@ -22,10 +21,10 @@ class ProgressChromeClient(
return
}
if (newProgress in 1 until PROGRESS_MAX) {
- progressIndicator.setIndeterminateCompat(false)
+ progressIndicator.isIndeterminate = false
progressIndicator.setProgressCompat(newProgress.coerceAtMost(PROGRESS_MAX), true)
} else {
- progressIndicator.setIndeterminateCompat(true)
+ progressIndicator.setIndeterminate(true)
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt
index d0ec8a8cb..6a90243fa 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt
@@ -1,6 +1,8 @@
package org.koitharu.kotatsu.core.backup
import android.content.Context
+import java.io.File
+import java.util.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runInterruptible
import kotlinx.coroutines.withContext
@@ -8,8 +10,6 @@ import org.json.JSONArray
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.utils.MutableZipFile
import org.koitharu.kotatsu.utils.ext.format
-import java.io.File
-import java.util.*
class BackupArchive(file: File) : MutableZipFile(file) {
@@ -40,7 +40,7 @@ class BackupArchive(file: File) : MutableZipFile(file) {
}
dir.mkdirs()
val filename = buildString {
- append(context.getString(R.string.app_name).toLowerCase(Locale.ROOT))
+ append(context.getString(R.string.app_name).lowercase(Locale.ROOT))
append('_')
append(Date().format("ddMMyyyy"))
append(".bak")
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
index 9626ddb13..ba4a8b6a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
@@ -5,23 +5,23 @@ import org.json.JSONObject
import org.koitharu.kotatsu.core.db.MangaDatabase
import org.koitharu.kotatsu.core.db.entity.MangaEntity
import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.SortOrder
import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
import org.koitharu.kotatsu.favourites.data.FavouriteEntity
import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.utils.ext.getBooleanOrDefault
-import org.koitharu.kotatsu.utils.ext.getStringOrNull
-import org.koitharu.kotatsu.utils.ext.iterator
-import org.koitharu.kotatsu.utils.ext.map
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
class RestoreRepository(private val db: MangaDatabase) {
suspend fun upsertHistory(entry: BackupEntry): CompositeResult {
val result = CompositeResult()
- for (item in entry.data) {
+ for (item in entry.data.JSONIterator()) {
val mangaJson = item.getJSONObject("manga")
val manga = parseManga(mangaJson)
- val tags = mangaJson.getJSONArray("tags").map {
+ val tags = mangaJson.getJSONArray("tags").mapJSON {
parseTag(it)
}
val history = parseHistory(item)
@@ -38,7 +38,7 @@ class RestoreRepository(private val db: MangaDatabase) {
suspend fun upsertCategories(entry: BackupEntry): CompositeResult {
val result = CompositeResult()
- for (item in entry.data) {
+ for (item in entry.data.JSONIterator()) {
val category = parseCategory(item)
result += runCatching {
db.favouriteCategoriesDao.upsert(category)
@@ -49,10 +49,10 @@ class RestoreRepository(private val db: MangaDatabase) {
suspend fun upsertFavourites(entry: BackupEntry): CompositeResult {
val result = CompositeResult()
- for (item in entry.data) {
+ for (item in entry.data.JSONIterator()) {
val mangaJson = item.getJSONObject("manga")
val manga = parseManga(mangaJson)
- val tags = mangaJson.getJSONArray("tags").map {
+ val tags = mangaJson.getJSONArray("tags").mapJSON {
parseTag(it)
}
val favourite = parseFavourite(item)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
index dc390f0f3..dadbb05eb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
@@ -1,28 +1,9 @@
package org.koitharu.kotatsu.core.db
-import androidx.room.Room
import org.koin.android.ext.koin.androidContext
import org.koin.dsl.module
-import org.koitharu.kotatsu.core.db.migrations.*
val databaseModule
get() = module {
- single {
- Room.databaseBuilder(
- androidContext(),
- MangaDatabase::class.java,
- "kotatsu-db"
- ).addMigrations(
- Migration1To2(),
- Migration2To3(),
- Migration3To4(),
- Migration4To5(),
- Migration5To6(),
- Migration6To7(),
- Migration7To8(),
- Migration8To9(),
- ).addCallback(
- DatabasePrePopulateCallback(androidContext().resources)
- ).build()
- }
+ single { MangaDatabase.create(androidContext()) }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
index 79d0fbd34..35c52192c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
@@ -4,7 +4,7 @@ import android.content.res.Resources
import androidx.room.RoomDatabase
import androidx.sqlite.db.SupportSQLiteDatabase
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
index 89d90665e..010a2653f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -1,9 +1,12 @@
package org.koitharu.kotatsu.core.db
+import android.content.Context
import androidx.room.Database
+import androidx.room.Room
import androidx.room.RoomDatabase
import org.koitharu.kotatsu.core.db.dao.*
import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.db.migrations.*
import org.koitharu.kotatsu.favourites.data.FavouriteCategoriesDao
import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -18,7 +21,8 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
- ], version = 9
+ ],
+ version = 9
)
abstract class MangaDatabase : RoomDatabase() {
@@ -39,4 +43,24 @@ abstract class MangaDatabase : RoomDatabase() {
abstract val trackLogsDao: TrackLogsDao
abstract val suggestionDao: SuggestionDao
+
+ companion object {
+
+ fun create(context: Context): MangaDatabase = Room.databaseBuilder(
+ context,
+ MangaDatabase::class.java,
+ "kotatsu-db"
+ ).addMigrations(
+ Migration1To2(),
+ Migration2To3(),
+ Migration3To4(),
+ Migration4To5(),
+ Migration5To6(),
+ Migration6To7(),
+ Migration7To8(),
+ Migration8To9(),
+ ).addCallback(
+ DatabasePrePopulateCallback(context.resources)
+ ).build()
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TagsDao.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TagsDao.kt
index 7f9655d19..8b3498e3c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TagsDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TagsDao.kt
@@ -9,6 +9,45 @@ abstract class TagsDao {
@Query("SELECT * FROM tags WHERE source = :source")
abstract suspend fun findTags(source: String): List
+ @Query(
+ """SELECT tags.* FROM tags
+ LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+ GROUP BY tags.title
+ ORDER BY COUNT(manga_id) DESC
+ LIMIT :limit"""
+ )
+ abstract suspend fun findPopularTags(limit: Int): List
+
+ @Query(
+ """SELECT tags.* FROM tags
+ LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+ WHERE tags.source = :source
+ GROUP BY tags.title
+ ORDER BY COUNT(manga_id) DESC
+ LIMIT :limit"""
+ )
+ abstract suspend fun findPopularTags(source: String, limit: Int): List
+
+ @Query(
+ """SELECT tags.* FROM tags
+ LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+ WHERE tags.source = :source AND title LIKE :query
+ GROUP BY tags.title
+ ORDER BY COUNT(manga_id) DESC
+ LIMIT :limit"""
+ )
+ abstract suspend fun findTags(source: String, query: String, limit: Int): List
+
+ @Query(
+ """SELECT tags.* FROM tags
+ LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+ WHERE title LIKE :query
+ GROUP BY tags.title
+ ORDER BY COUNT(manga_id) DESC
+ LIMIT :limit"""
+ )
+ abstract suspend fun findTags(query: String, limit: Int): List
+
@Insert(onConflict = OnConflictStrategy.IGNORE)
abstract suspend fun insert(tag: TagEntity): Long
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
new file mode 100644
index 000000000..51cd77b2e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
@@ -0,0 +1,76 @@
+package org.koitharu.kotatsu.core.db.entity
+
+import java.util.*
+import org.koitharu.kotatsu.core.model.TrackingLogItem
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.longHashCode
+import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+
+// Entity to model
+
+fun TagEntity.toMangaTag() = MangaTag(
+ key = this.key,
+ title = this.title.toTitleCase(),
+ source = MangaSource.valueOf(this.source),
+)
+
+fun Collection.toMangaTags() = mapToSet(TagEntity::toMangaTag)
+
+fun MangaEntity.toManga(tags: Set) = Manga(
+ id = this.id,
+ title = this.title,
+ altTitle = this.altTitle,
+ state = this.state?.let { MangaState.valueOf(it) },
+ rating = this.rating,
+ isNsfw = this.isNsfw,
+ url = this.url,
+ publicUrl = this.publicUrl,
+ coverUrl = this.coverUrl,
+ largeCoverUrl = this.largeCoverUrl,
+ author = this.author,
+ source = MangaSource.valueOf(this.source),
+ tags = tags
+)
+
+fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
+
+fun TrackLogWithManga.toTrackingLogItem() = TrackingLogItem(
+ id = trackLog.id,
+ chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
+ manga = manga.toManga(tags.toMangaTags()),
+ createdAt = Date(trackLog.createdAt)
+)
+
+// Model to entity
+
+fun Manga.toEntity() = MangaEntity(
+ id = id,
+ url = url,
+ publicUrl = publicUrl,
+ source = source.name,
+ largeCoverUrl = largeCoverUrl,
+ coverUrl = coverUrl,
+ altTitle = altTitle,
+ rating = rating,
+ isNsfw = isNsfw,
+ state = state?.name,
+ title = title,
+ author = author,
+)
+
+fun MangaTag.toEntity() = TagEntity(
+ title = title,
+ key = key,
+ source = source.name,
+ id = "${key}_${source.name}".longHashCode()
+)
+
+fun Collection.toEntities() = map(MangaTag::toEntity)
+
+// Other
+
+@Suppress("FunctionName")
+fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
+ SortOrder.valueOf(name)
+}.getOrDefault(fallback)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
index 25ec915a3..c425f0e68 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
@@ -3,10 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaState
-import org.koitharu.kotatsu.core.model.MangaTag
@Entity(tableName = "manga")
class MangaEntity(
@@ -16,46 +12,11 @@ class MangaEntity(
@ColumnInfo(name = "alt_title") val altTitle: String?,
@ColumnInfo(name = "url") val url: String,
@ColumnInfo(name = "public_url") val publicUrl: String,
- @ColumnInfo(name = "rating") val rating: Float, //normalized value [0..1] or -1
+ @ColumnInfo(name = "rating") val rating: Float, // normalized value [0..1] or -1
@ColumnInfo(name = "nsfw") val isNsfw: Boolean,
@ColumnInfo(name = "cover_url") val coverUrl: String,
@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
@ColumnInfo(name = "state") val state: String?,
@ColumnInfo(name = "author") val author: String?,
@ColumnInfo(name = "source") val source: String
-) {
-
- fun toManga(tags: Set = emptySet()) = Manga(
- id = this.id,
- title = this.title,
- altTitle = this.altTitle,
- state = this.state?.let { MangaState.valueOf(it) },
- rating = this.rating,
- isNsfw = this.isNsfw,
- url = this.url,
- publicUrl = this.publicUrl,
- coverUrl = this.coverUrl,
- largeCoverUrl = this.largeCoverUrl,
- author = this.author,
- source = MangaSource.valueOf(this.source),
- tags = tags
- )
-
- companion object {
-
- fun from(manga: Manga) = MangaEntity(
- id = manga.id,
- url = manga.url,
- publicUrl = manga.publicUrl,
- source = manga.source.name,
- largeCoverUrl = manga.largeCoverUrl,
- coverUrl = manga.coverUrl,
- altTitle = manga.altTitle,
- rating = manga.rating,
- isNsfw = manga.isNsfw,
- state = manga.state?.name,
- title = manga.title,
- author = manga.author
- )
- }
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaPrefsEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaPrefsEntity.kt
index 99e94b25a..a09ccd884 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaPrefsEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaPrefsEntity.kt
@@ -6,13 +6,15 @@ import androidx.room.ForeignKey
import androidx.room.PrimaryKey
@Entity(
- tableName = "preferences", foreignKeys = [
+ tableName = "preferences",
+ foreignKeys = [
ForeignKey(
entity = MangaEntity::class,
parentColumns = ["manga_id"],
childColumns = ["manga_id"],
onDelete = ForeignKey.CASCADE
- )]
+ )
+ ]
)
class MangaPrefsEntity(
@PrimaryKey(autoGenerate = false)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
index ea7f0b3d2..d3ee401a6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaTagsEntity.kt
@@ -5,7 +5,8 @@ import androidx.room.Entity
import androidx.room.ForeignKey
@Entity(
- tableName = "manga_tags", primaryKeys = ["manga_id", "tag_id"], foreignKeys = [
+ tableName = "manga_tags", primaryKeys = ["manga_id", "tag_id"],
+ foreignKeys = [
ForeignKey(
entity = MangaEntity::class,
parentColumns = ["manga_id"],
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
index ad80b0beb..8c35c376e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/MangaWithTags.kt
@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
import androidx.room.Embedded
import androidx.room.Junction
import androidx.room.Relation
-import org.koitharu.kotatsu.utils.ext.mapToSet
class MangaWithTags(
@Embedded val manga: MangaEntity,
@@ -12,10 +11,5 @@ class MangaWithTags(
entityColumn = "tag_id",
associateBy = Junction(MangaTagsEntity::class)
)
- val tags: List
-) {
-
- fun toManga() = manga.toManga(tags.mapToSet {
- it.toMangaTag()
- })
-}
\ No newline at end of file
+ val tags: List,
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
index 6b3b6a94b..fe813a02b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TagEntity.kt
@@ -3,10 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.longHashCode
-import org.koitharu.kotatsu.utils.ext.toTitleCase
@Entity(tableName = "tags")
class TagEntity(
@@ -15,21 +11,4 @@ class TagEntity(
@ColumnInfo(name = "title") val title: String,
@ColumnInfo(name = "key") val key: String,
@ColumnInfo(name = "source") val source: String
-) {
-
- fun toMangaTag() = MangaTag(
- key = this.key,
- title = this.title.toTitleCase(),
- source = MangaSource.valueOf(this.source)
- )
-
- companion object {
-
- fun fromMangaTag(tag: MangaTag) = TagEntity(
- title = tag.title,
- key = tag.key,
- source = tag.source.name,
- id = "${tag.key}_${tag.source.name}".longHashCode()
- )
- }
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt
index 1b5c41492..91d65d82b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackEntity.kt
@@ -6,7 +6,8 @@ import androidx.room.ForeignKey
import androidx.room.PrimaryKey
@Entity(
- tableName = "tracks", foreignKeys = [
+ tableName = "tracks",
+ foreignKeys = [
ForeignKey(
entity = MangaEntity::class,
parentColumns = ["manga_id"],
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogEntity.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogEntity.kt
index a4f608c4d..8bb8e61b4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogEntity.kt
@@ -6,7 +6,8 @@ import androidx.room.ForeignKey
import androidx.room.PrimaryKey
@Entity(
- tableName = "track_logs", foreignKeys = [
+ tableName = "track_logs",
+ foreignKeys = [
ForeignKey(
entity = MangaEntity::class,
parentColumns = ["manga_id"],
@@ -20,5 +21,5 @@ class TrackLogEntity(
@ColumnInfo(name = "id") val id: Long = 0L,
@ColumnInfo(name = "manga_id", index = true) val mangaId: Long,
@ColumnInfo(name = "chapters") val chapters: String,
- @ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis()
+ @ColumnInfo(name = "created_at") val createdAt: Long = System.currentTimeMillis(),
)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt
index 263e91938..7a6e145a4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/entity/TrackLogWithManga.kt
@@ -3,9 +3,6 @@ package org.koitharu.kotatsu.core.db.entity
import androidx.room.Embedded
import androidx.room.Junction
import androidx.room.Relation
-import org.koitharu.kotatsu.core.model.TrackingLogItem
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import java.util.*
class TrackLogWithManga(
@Embedded val trackLog: TrackLogEntity,
@@ -19,13 +16,5 @@ class TrackLogWithManga(
entityColumn = "tag_id",
associateBy = Junction(MangaTagsEntity::class)
)
- val tags: List
-) {
-
- fun toTrackingLogItem() = TrackingLogItem(
- id = trackLog.id,
- chapters = trackLog.chapters.split('\n').filterNot { x -> x.isEmpty() },
- manga = manga.toManga(tags.mapToSet { x -> x.toMangaTag() }),
- createdAt = Date(trackLog.createdAt)
- )
-}
\ No newline at end of file
+ val tags: List,
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
index 84eedc797..768acf7d4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration8To9.kt
@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.db.migrations
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
class Migration8To9 : Migration(8, 9) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt
deleted file mode 100644
index 90a40c050..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class AuthRequiredException(
- val source: MangaSource,
-) : RuntimeException("Authorization required"), ResolvableException {
-
- @StringRes
- override val resolveTextId: Int = R.string.sign_in
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
index e02f16da1..5a8cd055c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
@@ -3,12 +3,7 @@ package org.koitharu.kotatsu.core.exceptions
import androidx.annotation.StringRes
import okio.IOException
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
class CloudFlareProtectedException(
val url: String
-) : IOException("Protected by CloudFlare"), ResolvableException {
-
- @StringRes
- override val resolveTextId: Int = R.string.captcha_solve
-}
\ No newline at end of file
+) : IOException("Protected by CloudFlare")
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt
deleted file mode 100644
index 92cdb325f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/GraphQLException.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import org.json.JSONArray
-import org.koitharu.kotatsu.utils.ext.map
-
-class GraphQLException(private val errors: JSONArray) : RuntimeException() {
-
- val messages = errors.map {
- it.getString("message")
- }
-
- override val message: String
- get() = messages.joinToString("\n")
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt
deleted file mode 100644
index 2a2bb64dc..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/ParseException.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-class ParseException(message: String? = null, cause: Throwable? = null) :
- RuntimeException(message, cause)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
index efad58757..50f991b47 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
@@ -3,13 +3,15 @@ package org.koitharu.kotatsu.core.exceptions.resolve
import android.util.ArrayMap
import androidx.activity.result.ActivityResultCallback
import androidx.activity.result.ActivityResultLauncher
+import androidx.annotation.StringRes
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import kotlinx.coroutines.suspendCancellableCoroutine
+import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
import org.koitharu.kotatsu.utils.TaggedActivityResult
import org.koitharu.kotatsu.utils.isSuccess
@@ -20,7 +22,7 @@ import kotlin.coroutines.suspendCoroutine
class ExceptionResolver private constructor(
private val activity: FragmentActivity?,
private val fragment: Fragment?,
-): ActivityResultCallback {
+) : ActivityResultCallback {
private val continuations = ArrayMap>(1)
private lateinit var sourceAuthContract: ActivityResultLauncher
@@ -38,7 +40,7 @@ class ExceptionResolver private constructor(
continuations.remove(result.tag)?.resume(result.isSuccess)
}
- suspend fun resolve(e: ResolvableException): Boolean = when (e) {
+ suspend fun resolve(e: Throwable): Boolean = when (e) {
is CloudFlareProtectedException -> resolveCF(e.url)
is AuthRequiredException -> resolveAuthException(e.source)
else -> false
@@ -68,4 +70,16 @@ class ExceptionResolver private constructor(
}
private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
+
+ companion object {
+
+ @StringRes
+ fun getResolveStringId(e: Throwable) = when (e) {
+ is CloudFlareProtectedException -> R.string.captcha_solve
+ is AuthRequiredException -> R.string.sign_in
+ else -> 0
+ }
+
+ fun canResolve(e: Throwable) = getResolveStringId(e) != 0
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt
deleted file mode 100644
index 6ea802b61..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ResolvableException.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-interface ResolvableException {
-
- val resolveTextId: Int
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
index b7b3e110e..8b9f4e793 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.core.github
import okhttp3.OkHttpClient
import okhttp3.Request
-import org.koitharu.kotatsu.utils.ext.await
-import org.koitharu.kotatsu.utils.ext.parseJson
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.parseJson
class GithubRepository(private val okHttp: OkHttpClient) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
index 6998a1a08..655a0eb08 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.model
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.SortOrder
import java.util.*
@Parcelize
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
index f631d2d9d..3079b6c76 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
@@ -1,29 +1,28 @@
package org.koitharu.kotatsu.core.model
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.mapToSet
-@Parcelize
-data class Manga(
- val id: Long,
- val title: String,
- val altTitle: String? = null,
- val url: String, // relative url for internal use
- val publicUrl: String,
- val rating: Float = NO_RATING, //normalized value [0..1] or -1
- val isNsfw: Boolean = false,
- val coverUrl: String,
- val largeCoverUrl: String? = null,
- val description: String? = null, //HTML
- val tags: Set = emptySet(),
- val state: MangaState? = null,
- val author: String? = null,
- val chapters: List? = null,
- val source: MangaSource
-) : Parcelable {
+fun Manga.withoutChapters() = if (chapters.isNullOrEmpty()) {
+ this
+} else {
+ Manga(
+ id = id,
+ title = title,
+ altTitle = altTitle,
+ url = url,
+ publicUrl = publicUrl,
+ rating = rating,
+ isNsfw = isNsfw,
+ coverUrl = coverUrl,
+ tags = tags,
+ state = state,
+ author = author,
+ largeCoverUrl = largeCoverUrl,
+ description = description,
+ chapters = null,
+ source = source,
+ )
+}
- companion object {
-
- const val NO_RATING = -1f
- }
-}
\ No newline at end of file
+fun Collection.ids() = mapToSet { it.id }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt
deleted file mode 100644
index 9b0533722..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaChapter.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaChapter(
- val id: Long,
- val name: String,
- val number: Int,
- val url: String,
- val scanlator: String?,
- val uploadDate: Long,
- val branch: String?,
- val source: MangaSource,
-) : Parcelable, Comparable {
-
- override fun compareTo(other: MangaChapter): Int {
- return number.compareTo(other.number)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt
deleted file mode 100644
index 7576e2da4..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaPage.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaPage(
- val id: Long,
- val url: String,
- val referer: String,
- val preview: String?,
- val source: MangaSource,
-) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
deleted file mode 100644
index 2733a422a..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Suppress("SpellCheckingInspection")
-@Parcelize
-enum class MangaSource(
- val title: String,
- val locale: String?,
-) : Parcelable {
- LOCAL("Local", null),
- READMANGA_RU("ReadManga", "ru"),
- MINTMANGA("MintManga", "ru"),
- SELFMANGA("SelfManga", "ru"),
- MANGACHAN("Манга-тян", "ru"),
- DESUME("Desu.me", "ru"),
- HENCHAN("Хентай-тян", "ru"),
- YAOICHAN("Яой-тян", "ru"),
- MANGATOWN("MangaTown", "en"),
- MANGALIB("MangaLib", "ru"),
- NUDEMOON("Nude-Moon", "ru"),
- MANGAREAD("MangaRead", "en"),
- REMANGA("Remanga", "ru"),
- HENTAILIB("HentaiLib", "ru"),
- ANIBEL("Anibel", "be"),
- NINEMANGA_EN("NineManga English", "en"),
- NINEMANGA_ES("NineManga Español", "es"),
- NINEMANGA_RU("NineManga Русский", "ru"),
- NINEMANGA_DE("NineManga Deutsch", "de"),
- NINEMANGA_IT("NineManga Italiano", "it"),
- NINEMANGA_BR("NineManga Brasil", "pt"),
- NINEMANGA_FR("NineManga Français", "fr"),
- EXHENTAI("ExHentai", null),
- MANGAOWL("MangaOwl", "en"),
- MANGADEX("MangaDex", null),
- BATOTO("Bato.To", null),
- COMICK_FUN("ComicK", null),
- ;
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt
deleted file mode 100644
index caca2af4f..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaState.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-enum class MangaState {
- ONGOING, FINISHED
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt
deleted file mode 100644
index fe10cb690..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTag.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class MangaTag(
- val title: String,
- val key: String,
- val source: MangaSource,
-) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
index c336599cc..77fdc5925 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/MangaTracking.kt
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.core.model
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
import java.util.*
-@Parcelize
data class MangaTracking(
val manga: Manga,
val knownChaptersCount: Int,
val lastChapterId: Long,
val lastNotifiedChapterId: Long,
val lastCheck: Date?
-) : Parcelable
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt
deleted file mode 100644
index 99ee3b835..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/SortOrder.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-
-enum class SortOrder(@StringRes val titleRes: Int) {
- UPDATED(R.string.updated),
- POPULARITY(R.string.popular),
- RATING(R.string.by_rating),
- NEWEST(R.string.newest),
- ALPHABETICAL(R.string.by_name)
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt
index ccb69b081..23a922cb6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/TrackingLogItem.kt
@@ -2,12 +2,12 @@ package org.koitharu.kotatsu.core.model
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.parsers.model.Manga
import java.util.*
-@Parcelize
data class TrackingLogItem(
val id: Long,
val manga: Manga,
val chapters: List,
val createdAt: Date
-) : Parcelable
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
new file mode 100644
index 000000000..67bb80044
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
@@ -0,0 +1,95 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import androidx.core.os.ParcelCompat
+import org.koitharu.kotatsu.parsers.model.*
+
+fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
+ out.writeLong(id)
+ out.writeString(title)
+ out.writeString(altTitle)
+ out.writeString(url)
+ out.writeString(publicUrl)
+ out.writeFloat(rating)
+ ParcelCompat.writeBoolean(out, isNsfw)
+ out.writeString(coverUrl)
+ out.writeString(largeCoverUrl)
+ out.writeString(description)
+ out.writeParcelable(ParcelableMangaTags(tags), flags)
+ out.writeSerializable(state)
+ out.writeString(author)
+ if (withChapters) {
+ out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
+ } else {
+ out.writeString(null)
+ }
+ out.writeSerializable(source)
+}
+
+fun Parcel.readManga() = Manga(
+ id = readLong(),
+ title = requireNotNull(readString()),
+ altTitle = readString(),
+ url = requireNotNull(readString()),
+ publicUrl = requireNotNull(readString()),
+ rating = readFloat(),
+ isNsfw = ParcelCompat.readBoolean(this),
+ coverUrl = requireNotNull(readString()),
+ largeCoverUrl = readString(),
+ description = readString(),
+ tags = requireNotNull(readParcelable(ParcelableMangaTags::class.java.classLoader)).tags,
+ state = readSerializable() as MangaState?,
+ author = readString(),
+ chapters = readParcelable(ParcelableMangaChapters::class.java.classLoader)?.chapters,
+ source = readSerializable() as MangaSource,
+)
+
+fun MangaPage.writeToParcel(out: Parcel) {
+ out.writeLong(id)
+ out.writeString(url)
+ out.writeString(referer)
+ out.writeString(preview)
+ out.writeSerializable(source)
+}
+
+fun Parcel.readMangaPage() = MangaPage(
+ id = readLong(),
+ url = requireNotNull(readString()),
+ referer = requireNotNull(readString()),
+ preview = readString(),
+ source = readSerializable() as MangaSource,
+)
+
+fun MangaChapter.writeToParcel(out: Parcel) {
+ out.writeLong(id)
+ out.writeString(name)
+ out.writeInt(number)
+ out.writeString(url)
+ out.writeString(scanlator)
+ out.writeLong(uploadDate)
+ out.writeString(branch)
+ out.writeSerializable(source)
+}
+
+fun Parcel.readMangaChapter() = MangaChapter(
+ id = readLong(),
+ name = requireNotNull(readString()),
+ number = readInt(),
+ url = requireNotNull(readString()),
+ scanlator = readString(),
+ uploadDate = readLong(),
+ branch = readString(),
+ source = readSerializable() as MangaSource,
+)
+
+fun MangaTag.writeToParcel(out: Parcel) {
+ out.writeString(title)
+ out.writeString(key)
+ out.writeSerializable(source)
+}
+
+fun Parcel.readMangaTag() = MangaTag(
+ title = requireNotNull(readString()),
+ key = requireNotNull(readString()),
+ source = readSerializable() as MangaSource,
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
new file mode 100644
index 000000000..fd9b6cfa1
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
@@ -0,0 +1,48 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.Manga
+
+// Limits to avoid TransactionTooLargeException
+private const val MAX_SAFE_SIZE = 1024 * 512 // Assume that 512 kb is safe parcel size
+private const val MAX_SAFE_CHAPTERS_COUNT = 40 // this is 100% safe
+
+class ParcelableManga(
+ val manga: Manga,
+) : Parcelable {
+
+ constructor(parcel: Parcel) : this(parcel.readManga())
+
+ override fun writeToParcel(parcel: Parcel, flags: Int) {
+ val chapters = manga.chapters
+ if (chapters == null || chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
+ // fast path
+ manga.writeToParcel(parcel, flags, withChapters = true)
+ return
+ }
+ val tempParcel = Parcel.obtain()
+ manga.writeToParcel(tempParcel, flags, withChapters = true)
+ val size = tempParcel.dataSize()
+ if (size < MAX_SAFE_SIZE) {
+ parcel.appendFrom(tempParcel, 0, size)
+ } else {
+ manga.writeToParcel(parcel, flags, withChapters = false)
+ }
+ tempParcel.recycle()
+ }
+
+ override fun describeContents(): Int {
+ return 0
+ }
+
+ companion object CREATOR : Parcelable.Creator {
+ override fun createFromParcel(parcel: Parcel): ParcelableManga {
+ return ParcelableManga(parcel)
+ }
+
+ override fun newArray(size: Int): Array {
+ return arrayOfNulls(size)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
new file mode 100644
index 000000000..db9ebb9c7
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaChapters.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.utils.ext.createList
+
+class ParcelableMangaChapters(
+ val chapters: List,
+) : Parcelable {
+
+ constructor(parcel: Parcel) : this(
+ createList(parcel.readInt()) { parcel.readMangaChapter() }
+ )
+
+ override fun writeToParcel(parcel: Parcel, flags: Int) {
+ parcel.writeInt(chapters.size)
+ for (chapter in chapters) {
+ chapter.writeToParcel(parcel)
+ }
+ }
+
+ override fun describeContents(): Int {
+ return 0
+ }
+
+ companion object CREATOR : Parcelable.Creator {
+ override fun createFromParcel(parcel: Parcel): ParcelableMangaChapters {
+ return ParcelableMangaChapters(parcel)
+ }
+
+ override fun newArray(size: Int): Array {
+ return arrayOfNulls(size)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
new file mode 100644
index 000000000..4717132f5
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaPages.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.utils.ext.createList
+
+class ParcelableMangaPages(
+ val pages: List,
+) : Parcelable {
+
+ constructor(parcel: Parcel) : this(
+ createList(parcel.readInt()) { parcel.readMangaPage() }
+ )
+
+ override fun writeToParcel(parcel: Parcel, flags: Int) {
+ parcel.writeInt(pages.size)
+ for (page in pages) {
+ page.writeToParcel(parcel)
+ }
+ }
+
+ override fun describeContents(): Int {
+ return 0
+ }
+
+ companion object CREATOR : Parcelable.Creator {
+ override fun createFromParcel(parcel: Parcel): ParcelableMangaPages {
+ return ParcelableMangaPages(parcel)
+ }
+
+ override fun newArray(size: Int): Array {
+ return arrayOfNulls(size)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
new file mode 100644
index 000000000..0ef0f74e0
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaTags.kt
@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.utils.ext.createSet
+
+class ParcelableMangaTags(
+ val tags: Set,
+) : Parcelable {
+
+ constructor(parcel: Parcel) : this(
+ createSet(parcel.readInt()) { parcel.readMangaTag() }
+ )
+
+ override fun writeToParcel(parcel: Parcel, flags: Int) {
+ parcel.writeInt(tags.size)
+ for (tag in tags) {
+ tag.writeToParcel(parcel)
+ }
+ }
+
+ override fun describeContents(): Int {
+ return 0
+ }
+
+ companion object CREATOR : Parcelable.Creator {
+ override fun createFromParcel(parcel: Parcel): ParcelableMangaTags {
+ return ParcelableMangaTags(parcel)
+ }
+
+ override fun newArray(size: Int): Array {
+ return arrayOfNulls(size)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
deleted file mode 100644
index e5bf2deca..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.util.Log
-import okhttp3.Interceptor
-import okhttp3.Request
-import okhttp3.Response
-import okio.Buffer
-import java.io.IOException
-import java.nio.charset.StandardCharsets
-
-private const val TAG = "CURL"
-
-class CurlLoggingInterceptor(
- private val extraCurlOptions: String? = null,
-) : Interceptor {
-
- @Throws(IOException::class)
- override fun intercept(chain: Interceptor.Chain): Response {
- val request: Request = chain.request()
- var compressed = false
- val curlCmd = StringBuilder("curl")
- if (extraCurlOptions != null) {
- curlCmd.append(" ").append(extraCurlOptions)
- }
- curlCmd.append(" -X ").append(request.method)
- val headers = request.headers
- var i = 0
- val count = headers.size
- while (i < count) {
- val name = headers.name(i)
- val value = headers.value(i)
- if ("Accept-Encoding".equals(name, ignoreCase = true) && "gzip".equals(value,
- ignoreCase = true)
- ) {
- compressed = true
- }
- curlCmd.append(" -H " + "\"").append(name).append(": ").append(value).append("\"")
- i++
- }
- val requestBody = request.body
- if (requestBody != null) {
- val buffer = Buffer()
- requestBody.writeTo(buffer)
- val contentType = requestBody.contentType()
- val charset = contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8
- curlCmd.append(" --data $'")
- .append(buffer.readString(charset).replace("\n", "\\n"))
- .append("'")
- }
- curlCmd.append(if (compressed) " --compressed " else " ").append(request.url)
- Log.d(TAG, "╭--- cURL (" + request.url + ")")
- Log.d(TAG, curlCmd.toString())
- Log.d(TAG, "╰--- (copy and paste the above line to a terminal)")
- return chain.proceed(request)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
index 69e1e411a..48b009a33 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt
@@ -1,14 +1,13 @@
package org.koitharu.kotatsu.core.network
+import java.util.concurrent.TimeUnit
import okhttp3.CookieJar
import okhttp3.OkHttpClient
import org.koin.dsl.bind
import org.koin.dsl.module
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
+import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.utils.DownloadManagerHelper
-import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
val networkModule
get() = module {
@@ -22,11 +21,7 @@ val networkModule
cache(get().createHttpCache())
addInterceptor(UserAgentInterceptor())
addInterceptor(CloudFlareInterceptor())
- if (BuildConfig.DEBUG) {
- addNetworkInterceptor(CurlLoggingInterceptor())
- }
}.build()
}
- factory { DownloadManagerHelper(get(), get()) }
- single { MangaLoaderContext(get(), get()) }
- }
+ single { MangaLoaderContextImpl(get(), get(), get()) }
+ }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
index d8c3db0c4..98ebe3a6a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
@@ -15,8 +15,8 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.history.domain.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.reader.ui.ReaderActivity
import org.koitharu.kotatsu.utils.ext.requireBitmap
@@ -24,7 +24,7 @@ class ShortcutsRepository(
private val context: Context,
private val coil: ImageLoader,
private val historyRepository: HistoryRepository,
- private val mangaRepository: MangaDataRepository
+ private val mangaRepository: MangaDataRepository,
) {
private val iconSize by lazy {
@@ -69,7 +69,7 @@ class ShortcutsRepository(
.setLongLabel(manga.title)
.setIcon(icon)
.setIntent(
- ReaderActivity.newIntent(context, manga.id, null)
+ ReaderActivity.newIntent(context, manga.id)
.setAction(ReaderActivity.ACTION_MANGA_READ)
)
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
index 44f1ca040..4a386d3f8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
@@ -4,7 +4,7 @@ import android.net.Uri
import coil.map.Mapper
import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
class FaviconMapper() : Mapper {
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
new file mode 100644
index 000000000..ffacb6c6e
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.Base64
+import android.webkit.WebView
+import androidx.core.os.LocaleListCompat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import org.koitharu.kotatsu.core.network.AndroidCookieJar
+import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.ext.toList
+import java.util.*
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class MangaLoaderContextImpl(
+ override val httpClient: OkHttpClient,
+ override val cookieJar: AndroidCookieJar,
+ private val androidContext: Context,
+) : MangaLoaderContext() {
+
+ @SuppressLint("SetJavaScriptEnabled")
+ override suspend fun evaluateJs(script: String): String? = withContext(Dispatchers.Main) {
+ val webView = WebView(androidContext)
+ webView.settings.javaScriptEnabled = true
+ suspendCoroutine { cont ->
+ webView.evaluateJavascript(script) { result ->
+ cont.resume(result?.takeUnless { it == "null" })
+ }
+ }
+ }
+
+ override fun getConfig(source: MangaSource): MangaSourceConfig {
+ return SourceSettings(androidContext, source)
+ }
+
+ override fun encodeBase64(data: ByteArray): String {
+ return Base64.encodeToString(data, Base64.NO_PADDING)
+ }
+
+ override fun decodeBase64(data: String): ByteArray {
+ return Base64.decode(data, Base64.DEFAULT)
+ }
+
+ override fun getPreferredLocales(): List {
+ return LocaleListCompat.getAdjustedDefault().toList()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index 45103954f..1857064b3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.core.parser
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
-import org.koin.core.qualifier.named
-import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.*
interface MangaRepository {
@@ -11,7 +11,7 @@ interface MangaRepository {
val sortOrders: Set
- suspend fun getList2(
+ suspend fun getList(
offset: Int,
query: String? = null,
tags: Set? = null,
@@ -29,7 +29,11 @@ interface MangaRepository {
companion object : KoinComponent {
operator fun invoke(source: MangaSource): MangaRepository {
- return get(named(source))
+ return if (source == MangaSource.LOCAL) {
+ get()
+ } else {
+ RemoteMangaRepository(source, get())
+ }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
deleted file mode 100644
index 86fbf4926..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepositoryAuthProvider.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-interface MangaRepositoryAuthProvider {
-
- val authUrl: String
-
- fun isAuthorized(): Boolean
-
- suspend fun getUsername(): String
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
deleted file mode 100644
index ef16f37a9..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.site.*
-
-val parserModule
- get() = module {
-
- factory(named(MangaSource.READMANGA_RU)) { ReadmangaRepository(get()) }
- factory(named(MangaSource.MINTMANGA)) { MintMangaRepository(get()) }
- factory(named(MangaSource.SELFMANGA)) { SelfMangaRepository(get()) }
- factory(named(MangaSource.MANGACHAN)) { MangaChanRepository(get()) }
- factory(named(MangaSource.DESUME)) { DesuMeRepository(get()) }
- factory(named(MangaSource.HENCHAN)) { HenChanRepository(get()) }
- factory(named(MangaSource.YAOICHAN)) { YaoiChanRepository(get()) }
- factory(named(MangaSource.MANGATOWN)) { MangaTownRepository(get()) }
- factory(named(MangaSource.MANGALIB)) { MangaLibRepository(get()) }
- factory(named(MangaSource.NUDEMOON)) { NudeMoonRepository(get()) }
- factory(named(MangaSource.MANGAREAD)) { MangareadRepository(get()) }
- factory(named(MangaSource.REMANGA)) { RemangaRepository(get()) }
- factory(named(MangaSource.HENTAILIB)) { HentaiLibRepository(get()) }
- factory(named(MangaSource.ANIBEL)) { AnibelRepository(get()) }
- factory(named(MangaSource.NINEMANGA_EN)) { NineMangaRepository.English(get()) }
- factory(named(MangaSource.NINEMANGA_BR)) { NineMangaRepository.Brazil(get()) }
- factory(named(MangaSource.NINEMANGA_DE)) { NineMangaRepository.Deutsch(get()) }
- factory(named(MangaSource.NINEMANGA_ES)) { NineMangaRepository.Spanish(get()) }
- factory(named(MangaSource.NINEMANGA_RU)) { NineMangaRepository.Russian(get()) }
- factory(named(MangaSource.NINEMANGA_IT)) { NineMangaRepository.Italiano(get()) }
- factory(named(MangaSource.NINEMANGA_FR)) { NineMangaRepository.Francais(get()) }
- factory(named(MangaSource.EXHENTAI)) { ExHentaiRepository(get()) }
- factory(named(MangaSource.MANGAOWL)) { MangaOwlRepository(get()) }
- factory(named(MangaSource.MANGADEX)) { MangaDexRepository(get()) }
- factory(named(MangaSource.BATOTO)) { BatoToRepository(get()) }
- factory(named(MangaSource.COMICK_FUN)) { ComickFunRepository(get()) }
- }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
index f66e4b14f..a532f6e6e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -1,84 +1,51 @@
package org.koitharu.kotatsu.core.parser
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.MangaPage
-import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.newParser
-abstract class RemoteMangaRepository(
- protected val loaderContext: MangaLoaderContext
+class RemoteMangaRepository(
+ override val source: MangaSource,
+ loaderContext: MangaLoaderContext,
) : MangaRepository {
- protected abstract val defaultDomain: String
+ private val parser: MangaParser = source.newParser(loaderContext)
- private val conf by lazy {
- loaderContext.getSettings(source)
- }
+ override val sortOrders: Set
+ get() = parser.sortOrders
- val title: String
- get() = source.title
-
- override suspend fun getPageUrl(page: MangaPage): String = page.url.withDomain()
-
- override suspend fun getTags(): Set = emptySet()
-
- open fun getFaviconUrl() = "https://${getDomain()}/favicon.ico"
-
- open fun onCreatePreferences(map: MutableMap) {
- map[SourceSettings.KEY_DOMAIN] = defaultDomain
- }
-
- protected fun getDomain() = conf.getDomain(defaultDomain)
-
- protected fun String.withDomain(subdomain: String? = null) = when {
- this.startsWith("//") -> buildString {
- append("http")
- if (conf.isUseSsl(true)) {
- append('s')
- }
- append(":")
- append(this@withDomain)
+ var defaultSortOrder: SortOrder?
+ get() = getConfig().defaultSortOrder ?: sortOrders.firstOrNull()
+ set(value) {
+ getConfig().defaultSortOrder = value
}
- this.startsWith("/") -> buildString {
- append("http")
- if (conf.isUseSsl(true)) {
- append('s')
- }
- append("://")
- if (subdomain != null) {
- append(subdomain)
- append('.')
- append(conf.getDomain(defaultDomain).removePrefix("www."))
- } else {
- append(conf.getDomain(defaultDomain))
- }
- append(this@withDomain)
- }
- else -> this
+
+ override suspend fun getList(
+ offset: Int,
+ query: String?,
+ tags: Set?,
+ sortOrder: SortOrder?
+ ): List = parser.getList(offset, query, tags, sortOrder)
+
+ override suspend fun getDetails(manga: Manga): Manga = parser.getDetails(manga)
+
+ override suspend fun getPages(chapter: MangaChapter): List = parser.getPages(chapter)
+
+ override suspend fun getPageUrl(page: MangaPage): String = parser.getPageUrl(page)
+
+ override suspend fun getTags(): Set = parser.getTags()
+
+ fun getFaviconUrl(): String = parser.getFaviconUrl()
+
+ fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
+
+ fun getConfigKeys(): List> = ArrayList>().also {
+ parser.onCreateConfig(it)
}
- protected fun generateUid(url: String): Long {
- var h = 1125899906842597L
- source.name.forEach { c ->
- h = 31 * h + c.code
- }
- url.forEach { c ->
- h = 31 * h + c.code
- }
- return h
- }
-
- protected fun generateUid(id: Long): Long {
- var h = 1125899906842597L
- source.name.forEach { c ->
- h = 31 * h + c.code
- }
- h = 31 * h + id
- return h
- }
-
- protected fun parseFailed(message: String? = null): Nothing {
- throw ParseException(message)
- }
+ private fun getConfig() = parser.config as SourceSettings
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
deleted file mode 100644
index beb969daf..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/AnibelRepository.kt
+++ /dev/null
@@ -1,262 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.map
-import org.koitharu.kotatsu.utils.ext.mapIndexed
-import org.koitharu.kotatsu.utils.ext.stringIterator
-import java.util.*
-
-class AnibelRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
- override val source = MangaSource.ANIBEL
-
- override val defaultDomain = "anibel.net"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.NEWEST
- )
-
- override fun getFaviconUrl(): String {
- return "https://cdn.${getDomain()}/favicons/favicon.png"
- }
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?,
- ): List {
- if (!query.isNullOrEmpty()) {
- return if (offset == 0) {
- search(query)
- } else {
- emptyList()
- }
- }
- val filters = tags?.takeUnless { it.isEmpty() }?.joinToString(
- separator = ",",
- prefix = "genres: [",
- postfix = "]"
- ) { "\"it.key\"" }.orEmpty()
- val array = apiCall(
- """
- getMediaList(offset: $offset, limit: 20, mediaType: manga, filters: {$filters}) {
- docs {
- mediaId
- title {
- be
- alt
- }
- rating
- poster
- genres
- slug
- mediaType
- status
- }
- }
- """.trimIndent()
- ).getJSONObject("getMediaList").getJSONArray("docs")
- return array.map { jo ->
- val mediaId = jo.getString("mediaId")
- val title = jo.getJSONObject("title")
- val href = "${jo.getString("mediaType")}/${jo.getString("slug")}"
- Manga(
- id = generateUid(mediaId),
- title = title.getString("be"),
- coverUrl = jo.getString("poster").removePrefix("/cdn")
- .withDomain("cdn") + "?width=200&height=280",
- altTitle = title.getString("alt").takeUnless(String::isEmpty),
- author = null,
- rating = jo.getDouble("rating").toFloat() / 10f,
- url = href,
- publicUrl = "https://${getDomain()}/${href}",
- tags = jo.getJSONArray("genres").mapToTags(),
- state = when (jo.getString("status")) {
- "ongoing" -> MangaState.ONGOING
- "finished" -> MangaState.FINISHED
- else -> null
- },
- source = source,
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val (type, slug) = manga.url.split('/')
- val details = apiCall(
- """
- media(mediaType: $type, slug: "$slug") {
- mediaId
- title {
- be
- alt
- }
- description {
- be
- }
- status
- poster
- rating
- genres
- }
- """.trimIndent()
- ).getJSONObject("media")
- val title = details.getJSONObject("title")
- val poster = details.getString("poster").removePrefix("/cdn")
- .withDomain("cdn")
- val chapters = apiCall(
- """
- chapters(mediaId: "${details.getString("mediaId")}") {
- id
- chapter
- released
- }
- """.trimIndent()
- ).getJSONArray("chapters")
- return manga.copy(
- title = title.getString("be"),
- altTitle = title.getString("alt"),
- coverUrl = "$poster?width=200&height=280",
- largeCoverUrl = poster,
- description = details.getJSONObject("description").getString("be"),
- rating = details.getDouble("rating").toFloat() / 10f,
- tags = details.getJSONArray("genres").mapToTags(),
- state = when (details.getString("status")) {
- "ongoing" -> MangaState.ONGOING
- "finished" -> MangaState.FINISHED
- else -> null
- },
- chapters = chapters.map { jo ->
- val number = jo.getInt("chapter")
- MangaChapter(
- id = generateUid(jo.getString("id")),
- name = "Глава $number",
- number = number,
- url = "${manga.url}/read/$number",
- scanlator = null,
- uploadDate = jo.getLong("released"),
- branch = null,
- source = source,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val (_, slug, _, number) = chapter.url.split('/')
- val chapterJson = apiCall(
- """
- chapter(slug: "$slug", chapter: $number) {
- id
- images {
- large
- thumbnail
- }
- }
- """.trimIndent()
- ).getJSONObject("chapter")
- val pages = chapterJson.getJSONArray("images")
- val chapterUrl = "https://${getDomain()}/${chapter.url}"
- return pages.mapIndexed { i, jo ->
- MangaPage(
- id = generateUid("${chapter.url}/$i"),
- url = jo.getString("large"),
- referer = chapterUrl,
- preview = jo.getString("thumbnail"),
- source = source,
- )
- }
- }
-
- override suspend fun getTags(): Set {
- val json = apiCall(
- """
- getFilters(mediaType: manga) {
- genres
- }
- """.trimIndent()
- )
- val array = json.getJSONObject("getFilters").getJSONArray("genres")
- return array.mapToTags()
- }
-
- private suspend fun search(query: String): List {
- val json = apiCall(
- """
- search(query: "$query", limit: 40) {
- id
- title {
- be
- en
- }
- poster
- url
- type
- }
- """.trimIndent()
- )
- val array = json.getJSONArray("search")
- return array.map { jo ->
- val mediaId = jo.getString("id")
- val title = jo.getJSONObject("title")
- val href = "${jo.getString("type").lowercase()}/${jo.getString("url")}"
- Manga(
- id = generateUid(mediaId),
- title = title.getString("be"),
- coverUrl = jo.getString("poster").removePrefix("/cdn")
- .withDomain("cdn") + "?width=200&height=280",
- altTitle = title.getString("en").takeUnless(String::isEmpty),
- author = null,
- rating = Manga.NO_RATING,
- url = href,
- publicUrl = "https://${getDomain()}/${href}",
- tags = emptySet(),
- state = null,
- source = source,
- )
- }
- }
-
- private suspend fun apiCall(request: String): JSONObject {
- return loaderContext.graphQLQuery("https://api.${getDomain()}/graphql", request)
- .getJSONObject("data")
- }
-
- private fun JSONArray.mapToTags(): Set {
-
- fun toTitle(slug: String): String {
- val builder = StringBuilder(slug)
- var capitalize = true
- for ((i, c) in builder.withIndex()) {
- when {
- c == '-' -> {
- builder.setCharAt(i, ' ')
- }
- capitalize -> {
- builder.setCharAt(i, c.uppercaseChar())
- capitalize = false
- }
- }
- }
- return builder.toString()
- }
-
- val result = ArraySet(length())
- stringIterator().forEach {
- result.add(
- MangaTag(
- title = toTitle(it),
- key = it,
- source = source,
- )
- )
- }
- return result
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt
deleted file mode 100644
index 45a3abbc4..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/BatoToRepository.kt
+++ /dev/null
@@ -1,307 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.Base64
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
-import java.util.*
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-private const val PAGE_SIZE = 60
-private const val PAGE_SIZE_SEARCH = 20
-
-class BatoToRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
- override val source = MangaSource.BATOTO
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.NEWEST,
- SortOrder.UPDATED,
- SortOrder.POPULARITY,
- SortOrder.ALPHABETICAL
- )
-
- override val defaultDomain: String = "bato.to"
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- if (!query.isNullOrEmpty()) {
- return search(offset, query)
- }
- val page = (offset / PAGE_SIZE) + 1
-
- @Suppress("NON_EXHAUSTIVE_WHEN_STATEMENT")
- val url = buildString {
- append("https://")
- append(getDomain())
- append("/browse?sort=")
- when (sortOrder) {
- null,
- SortOrder.UPDATED -> append("update.za")
- SortOrder.POPULARITY -> append("views_a.za")
- SortOrder.NEWEST -> append("create.za")
- SortOrder.ALPHABETICAL -> append("title.az")
- }
- if (!tags.isNullOrEmpty()) {
- append("&genres=")
- appendAll(tags, ",") { it.key }
- }
- append("&page=")
- append(page)
- }
- return parseList(url, page)
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val root = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
- .getElementById("mainer") ?: parseFailed("Cannot find root")
- val details = root.selectFirst(".detail-set") ?: parseFailed("Cannot find detail-set")
- val attrs = details.selectFirst(".attr-main")?.select(".attr-item")?.associate {
- it.child(0).text().trim() to it.child(1)
- }.orEmpty()
- return manga.copy(
- title = root.selectFirst("h3.item-title")?.text() ?: manga.title,
- isNsfw = !root.selectFirst("alert")?.getElementsContainingOwnText("NSFW").isNullOrEmpty(),
- largeCoverUrl = details.selectFirst("img[src]")?.absUrl("src"),
- description = details.getElementById("limit-height-body-summary")
- ?.selectFirst(".limit-html")
- ?.html(),
- tags = manga.tags + attrs["Genres:"]?.parseTags().orEmpty(),
- state = when (attrs["Release status:"]?.text()) {
- "Ongoing" -> MangaState.ONGOING
- "Completed" -> MangaState.FINISHED
- else -> manga.state
- },
- author = attrs["Authors:"]?.text()?.trim() ?: manga.author,
- chapters = root.selectFirst(".episode-list")
- ?.selectFirst(".main")
- ?.children()
- ?.reversed()
- ?.mapIndexedNotNull { i, div ->
- div.parseChapter(i)
- }.orEmpty()
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val scripts = loaderContext.httpGet(fullUrl).parseHtml().select("script")
- for (script in scripts) {
- val scriptSrc = script.html()
- val p = scriptSrc.indexOf("const images =")
- if (p == -1) continue
- val start = scriptSrc.indexOf('[', p)
- val end = scriptSrc.indexOf(';', start)
- if (start == -1 || end == -1) {
- continue
- }
- val images = JSONArray(scriptSrc.substring(start, end))
- val batoJs = scriptSrc.substringBetweenFirst("batojs =", ";")?.trim(' ', '"', '\n')
- ?: parseFailed("Cannot find batojs")
- val server = scriptSrc.substringBetweenFirst("server =", ";")?.trim(' ', '"', '\n')
- ?: parseFailed("Cannot find server")
- val password = loaderContext.evaluateJs(batoJs)?.removeSurrounding('"')
- ?: parseFailed("Cannot evaluate batojs")
- val serverDecrypted = decryptAES(server, password).removeSurrounding('"')
- val result = ArrayList(images.length())
- repeat(images.length()) { i ->
- val url = images.getString(i)
- result += MangaPage(
- id = generateUid(url),
- url = if (url.startsWith("http")) url else "$serverDecrypted$url",
- referer = fullUrl,
- preview = null,
- source = source,
- )
- }
- return result
- }
- parseFailed("Cannot find images list")
- }
-
- override suspend fun getTags(): Set {
- val scripts = loaderContext.httpGet(
- "https://${getDomain()}/browse"
- ).parseHtml().select("script")
- for (script in scripts) {
- val genres = script.html().substringBetweenFirst("const _genres =", ";") ?: continue
- val jo = JSONObject(genres)
- val result = ArraySet(jo.length())
- jo.keys().forEach { key ->
- val item = jo.getJSONObject(key)
- result += MangaTag(
- title = item.getString("text").toTitleCase(),
- key = item.getString("file"),
- source = source,
- )
- }
- return result
- }
- parseFailed("Cannot find gernes list")
- }
-
- override fun getFaviconUrl(): String = "https://styles.amarkcdn.com/img/batoto/favicon.ico?v0"
-
- private suspend fun search(offset: Int, query: String): List {
- val page = (offset / PAGE_SIZE_SEARCH) + 1
- val url = buildString {
- append("https://")
- append(getDomain())
- append("/search?word=")
- append(query.replace(' ', '+'))
- append("&page=")
- append(page)
- }
- return parseList(url, page)
- }
-
- private fun getActivePage(body: Element): Int = body.select("nav ul.pagination > li.page-item.active")
- .lastOrNull()
- ?.text()
- ?.toIntOrNull() ?: parseFailed("Cannot determine current page")
-
- private suspend fun parseList(url: String, page: Int): List {
- val body = loaderContext.httpGet(url).parseHtml().body()
- if (body.selectFirst(".browse-no-matches") != null) {
- return emptyList()
- }
- val activePage = getActivePage(body)
- if (activePage != page) {
- return emptyList()
- }
- val root = body.getElementById("series-list") ?: parseFailed("Cannot find root")
- return root.children().map { div ->
- val a = div.selectFirst("a") ?: parseFailed()
- val href = a.relUrl("href")
- val title = div.selectFirst(".item-title")?.text() ?: parseFailed("Title not found")
- Manga(
- id = generateUid(href),
- title = title,
- altTitle = div.selectFirst(".item-alias")?.text()?.takeUnless { it == title },
- url = href,
- publicUrl = a.absUrl("href"),
- rating = Manga.NO_RATING,
- isNsfw = false,
- coverUrl = div.selectFirst("img[src]")?.absUrl("src").orEmpty(),
- largeCoverUrl = null,
- description = null,
- tags = div.selectFirst(".item-genre")?.parseTags().orEmpty(),
- state = null,
- author = null,
- source = source,
- )
- }
- }
-
- private fun Element.parseTags() = children().mapToSet { span ->
- val text = span.ownText()
- MangaTag(
- title = text.toTitleCase(),
- key = text.lowercase(Locale.ENGLISH).replace(' ', '_'),
- source = source,
- )
- }
-
- private fun Element.parseChapter(index: Int): MangaChapter? {
- val a = selectFirst("a.chapt") ?: return null
- val extra = selectFirst(".extra")
- val href = a.relUrl("href")
- return MangaChapter(
- id = generateUid(href),
- name = a.text(),
- number = index + 1,
- url = href,
- scanlator = extra?.getElementsByAttributeValueContaining("href", "/group/")?.text(),
- uploadDate = runCatching {
- parseChapterDate(extra?.select("i")?.lastOrNull()?.ownText())
- }.getOrDefault(0),
- branch = null,
- source = source,
- )
- }
-
- private fun parseChapterDate(date: String?): Long {
- if (date.isNullOrEmpty()) {
- return 0
- }
- val value = date.substringBefore(' ').toInt()
- val field = when {
- "sec" in date -> Calendar.SECOND
- "min" in date -> Calendar.MINUTE
- "hour" in date -> Calendar.HOUR
- "day" in date -> Calendar.DAY_OF_MONTH
- "week" in date -> Calendar.WEEK_OF_YEAR
- "month" in date -> Calendar.MONTH
- "year" in date -> Calendar.YEAR
- else -> return 0
- }
- val calendar = Calendar.getInstance()
- calendar.add(field, -value)
- return calendar.timeInMillis
- }
-
- private fun decryptAES(encrypted: String, password: String): String {
- val cipherData = Base64.decode(encrypted, Base64.DEFAULT)
- val saltData = cipherData.copyOfRange(8, 16)
- val (key, iv) = generateKeyAndIV(
- keyLength = 32,
- ivLength = 16,
- iterations = 1,
- salt = saltData,
- password = password.toByteArray(StandardCharsets.UTF_8),
- md = MessageDigest.getInstance("MD5"),
- )
- val encryptedData = cipherData.copyOfRange(16, cipherData.size)
- val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
- cipher.init(Cipher.DECRYPT_MODE, key, iv)
- return cipher.doFinal(encryptedData).toString(Charsets.UTF_8)
- }
-
- @Suppress("SameParameterValue")
- private fun generateKeyAndIV(
- keyLength: Int,
- ivLength: Int,
- iterations: Int,
- salt: ByteArray,
- password: ByteArray,
- md: MessageDigest,
- ): Pair {
- val digestLength = md.digestLength
- val requiredLength = (keyLength + ivLength + digestLength - 1) / digestLength * digestLength
- val generatedData = ByteArray(requiredLength)
- var generatedLength = 0
- md.reset()
- while (generatedLength < keyLength + ivLength) {
- if (generatedLength > 0) {
- md.update(generatedData, generatedLength - digestLength, digestLength)
- }
- md.update(password)
- md.update(salt, 0, 8)
- md.digest(generatedData, generatedLength, digestLength)
- repeat(iterations - 1) {
- md.update(generatedData, generatedLength, digestLength)
- md.digest(generatedData, generatedLength, digestLength)
- }
- generatedLength += digestLength
- }
-
- return SecretKeySpec(generatedData.copyOfRange(0, keyLength), "AES") to IvParameterSpec(
- if (ivLength > 0) {
- generatedData.copyOfRange(keyLength, keyLength + ivLength)
- } else byteArrayOf()
- )
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
deleted file mode 100644
index 6e7005757..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(
- loaderContext
-) {
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.NEWEST,
- SortOrder.POPULARITY,
- SortOrder.ALPHABETICAL
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val domain = getDomain()
- val url = when {
- !query.isNullOrEmpty() -> {
- if (offset != 0) {
- return emptyList()
- }
- "https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
- }
- !tags.isNullOrEmpty() -> tags.joinToString(
- prefix = "https://$domain/tags/",
- postfix = "&n=${getSortKey2(sortOrder)}?offset=$offset",
- separator = "+",
- ) { tag -> tag.key }
- else -> "https://$domain/${getSortKey(sortOrder)}?offset=$offset"
- }
- val doc = loaderContext.httpGet(url).parseHtml()
- val root = doc.body().selectFirst("div.main_fon")?.getElementById("content")
- ?: throw ParseException("Cannot find root")
- return root.select("div.content_row").mapNotNull { row ->
- val a = row.selectFirst("div.manga_row1")?.selectFirst("h2")?.selectFirst("a")
- ?: return@mapNotNull null
- val href = a.relUrl("href")
- Manga(
- id = generateUid(href),
- url = href,
- publicUrl = href.inContextOf(a),
- altTitle = a.attr("title"),
- title = a.text().substringAfterLast('(').substringBeforeLast(')'),
- author = row.getElementsByAttributeValueStarting(
- "href",
- "/mangaka"
- ).firstOrNull()?.text(),
- coverUrl = row.selectFirst("div.manga_images")?.selectFirst("img")
- ?.absUrl("src").orEmpty(),
- tags = runCatching {
- row.selectFirst("div.genre")?.select("a")?.mapToSet {
- MangaTag(
- title = it.text().toTagName(),
- key = it.attr("href").substringAfterLast('/').urlEncoded(),
- source = source
- )
- }
- }.getOrNull().orEmpty(),
- source = source
- )
- }
- }
-
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
- val root =
- doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
- val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
- return manga.copy(
- description = root.getElementById("description")?.html()?.substringBeforeLast("
- val href = tr?.selectFirst("a")?.relUrl("href") ?: return@mapIndexedNotNull null
- MangaChapter(
- id = generateUid(href),
- name = tr.selectFirst("a")?.text().orEmpty(),
- number = i + 1,
- url = href,
- scanlator = null,
- branch = null,
- uploadDate = dateFormat.tryParse(tr.selectFirst("div.date")?.text()),
- source = source,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- val scripts = doc.select("script")
- for (script in scripts) {
- val data = script.html()
- val pos = data.indexOf("\"fullimg")
- if (pos == -1) {
- continue
- }
- val json = data.substring(pos).substringAfter('[').substringBefore(';')
- .substringBeforeLast(']')
- val domain = getDomain()
- return json.split(",").mapNotNull {
- it.trim()
- .removeSurrounding('"', '\'')
- .toRelativeUrl(domain)
- .takeUnless(String::isBlank)
- }.map { url ->
- MangaPage(
- id = generateUid(url),
- url = url,
- preview = null,
- referer = fullUrl,
- source = source,
- )
- }
- }
- throw ParseException("Pages list not found at ${chapter.url}")
- }
-
- override suspend fun getTags(): Set {
- val domain = getDomain()
- val doc = loaderContext.httpGet("https://$domain/catalog").parseHtml()
- val root = doc.body().selectFirst("div.main_fon")?.getElementById("side")
- ?.select("ul")?.last() ?: throw ParseException("Cannot find root")
- return root.select("li.sidetag").mapToSet { li ->
- val a = li.children().last() ?: throw ParseException("a is null")
- MangaTag(
- title = a.text().toTagName(),
- key = a.attr("href").substringAfterLast('/'),
- source = source
- )
- }
- }
-
- private fun getSortKey(sortOrder: SortOrder?) =
- when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
- SortOrder.ALPHABETICAL -> "catalog"
- SortOrder.POPULARITY -> "mostfavorites"
- SortOrder.NEWEST -> "manga/new"
- else -> "mostfavorites"
- }
-
- private fun getSortKey2(sortOrder: SortOrder?) =
- when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
- SortOrder.ALPHABETICAL -> "abcasc"
- SortOrder.POPULARITY -> "favdesc"
- SortOrder.NEWEST -> "datedesc"
- else -> "favdesc"
- }
-
- private fun String.toTagName() = replace('_', ' ').toTitleCase()
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
deleted file mode 100644
index bd0b858f1..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.SparseArray
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-/**
- * https://api.comick.fun/docs/static/index.html
- */
-
-private const val PAGE_SIZE = 20
-private const val CHAPTERS_LIMIT = 99999
-
-class ComickFunRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
- override val defaultDomain = "comick.fun"
- override val source = MangaSource.COMICK_FUN
- override val sortOrders: Set = EnumSet.of(
- SortOrder.POPULARITY,
- SortOrder.UPDATED,
- SortOrder.RATING,
- )
-
- @Volatile
- private var cachedTags: SparseArray? = null
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val domain = getDomain()
- val url = buildString {
- append("https://api.")
- append(domain)
- append("/search?tachiyomi=true")
- if (!query.isNullOrEmpty()) {
- if (offset > 0) {
- return emptyList()
- }
- append("&q=")
- append(query.urlEncoded())
- } else {
- append("&limit=")
- append(PAGE_SIZE)
- append("&page=")
- append((offset / PAGE_SIZE) + 1)
- if (!tags.isNullOrEmpty()) {
- append("&genres=")
- appendAll(tags, "&genres=", MangaTag::key)
- }
- append("&sort=") // view, uploaded, rating, follow, user_follow_count
- append(
- when (sortOrder) {
- SortOrder.POPULARITY -> "view"
- SortOrder.RATING -> "rating"
- else -> "uploaded"
- }
- )
- }
- }
- val ja = loaderContext.httpGet(url).parseJsonArray()
- val tagsMap = cachedTags ?: loadTags()
- return ja.map { jo ->
- val slug = jo.getString("slug")
- Manga(
- id = generateUid(slug),
- title = jo.getString("title"),
- altTitle = null,
- url = slug,
- publicUrl = "https://$domain/comic/$slug",
- rating = jo.getDouble("rating").toFloat() / 10f,
- isNsfw = false,
- coverUrl = jo.getString("cover_url"),
- largeCoverUrl = null,
- description = jo.getStringOrNull("desc"),
- tags = jo.selectGenres("genres", tagsMap),
- state = runCatching {
- if (jo.getBoolean("translation_completed")) {
- MangaState.FINISHED
- } else {
- MangaState.ONGOING
- }
- }.getOrNull(),
- author = null,
- source = source,
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val domain = getDomain()
- val url = "https://api.$domain/comic/${manga.url}?tachiyomi=true"
- val jo = loaderContext.httpGet(url).parseJson()
- val comic = jo.getJSONObject("comic")
- return manga.copy(
- title = comic.getString("title"),
- altTitle = null, // TODO
- isNsfw = jo.getBoolean("matureContent") || comic.getBoolean("hentai"),
- description = comic.getStringOrNull("parsed") ?: comic.getString("desc"),
- tags = manga.tags + jo.getJSONArray("genres").mapToSet {
- MangaTag(
- title = it.getString("name"),
- key = it.getString("slug"),
- source = source,
- )
- },
- author = jo.getJSONArray("artists").optJSONObject(0)?.getString("name"),
- chapters = getChapters(comic.getLong("id")),
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val jo = loaderContext.httpGet(
- "https://api.${getDomain()}/chapter/${chapter.url}?tachiyomi=true"
- ).parseJson().getJSONObject("chapter")
- val referer = "https://${getDomain()}/"
- return jo.getJSONArray("images").map {
- val url = it.getString("url")
- MangaPage(
- id = generateUid(url),
- url = url,
- referer = referer,
- preview = null,
- source = source,
- )
- }
- }
-
- override suspend fun getTags(): Set {
- val sparseArray = cachedTags ?: loadTags()
- val set = ArraySet(sparseArray.size())
- for (i in 0 until sparseArray.size()) {
- set.add(sparseArray.valueAt(i))
- }
- return set
- }
-
- private suspend fun loadTags(): SparseArray {
- val ja = loaderContext.httpGet("https://api.${getDomain()}/genre").parseJsonArray()
- val tags = SparseArray(ja.length())
- for (jo in ja) {
- tags.append(
- jo.getInt("id"),
- MangaTag(
- title = jo.getString("name"),
- key = jo.getString("slug"),
- source = source,
- )
- )
- }
- cachedTags = tags
- return tags
- }
-
- private suspend fun getChapters(id: Long): List {
- val ja = loaderContext.httpGet(
- url = "https://api.${getDomain()}/comic/$id/chapter?tachiyomi=true&limit=$CHAPTERS_LIMIT"
- ).parseJson().getJSONArray("chapters")
- val dateFormat = SimpleDateFormat("yyyy-MM-dd")
- val counters = HashMap()
- return ja.mapReversed { jo ->
- val locale = Locale.forLanguageTag(jo.getString("lang"))
- var number = counters[locale] ?: 0
- number++
- counters[locale] = number
- MangaChapter(
- id = generateUid(jo.getLong("id")),
- name = buildString {
- jo.getStringOrNull("vol")?.let { append("Vol ").append(it).append(' ') }
- jo.getStringOrNull("chap")?.let { append("Chap ").append(it) }
- jo.getStringOrNull("title")?.let { append(": ").append(it) }
- },
- number = number,
- url = jo.getString("hid"),
- scanlator = jo.optJSONArray("group_name")?.optString(0),
- uploadDate = dateFormat.tryParse(jo.getString("created_at").substringBefore('T')),
- branch = locale.getDisplayName(locale).toTitleCase(locale),
- source = source,
- )
- }
- }
-
- private inline fun JSONArray.mapReversed(block: (JSONObject) -> R): List {
- val len = length()
- val destination = ArrayList(len)
- for (i in (0 until len).reversed()) {
- val jo = getJSONObject(i)
- destination.add(block(jo))
- }
- return destination
- }
-
- private fun JSONObject.selectGenres(name: String, tags: SparseArray): Set {
- val array = optJSONArray(name) ?: return emptySet()
- val res = ArraySet(array.length())
- for (i in 0 until array.length()) {
- val id = array.getInt(i)
- val tag = tags.get(id) ?: continue
- res.add(tag)
- }
- return res
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
deleted file mode 100644
index 308f209b0..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/DesuMeRepository.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.util.*
-
-class DesuMeRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
- override val source = MangaSource.DESUME
-
- override val defaultDomain = "desu.me"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.UPDATED,
- SortOrder.POPULARITY,
- SortOrder.NEWEST,
- SortOrder.ALPHABETICAL
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- if (query != null && offset != 0) {
- return emptyList()
- }
- val domain = getDomain()
- val url = buildString {
- append("https://")
- append(domain)
- append("/manga/api/?limit=20&order=")
- append(getSortKey(sortOrder))
- append("&page=")
- append((offset / 20) + 1)
- if (!tags.isNullOrEmpty()) {
- append("&genres=")
- appendAll(tags, ",") { it.key }
- }
- if (query != null) {
- append("&search=")
- append(query)
- }
- }
- val json = loaderContext.httpGet(url).parseJson().getJSONArray("response")
- ?: throw ParseException("Invalid response")
- val total = json.length()
- val list = ArrayList(total)
- for (i in 0 until total) {
- val jo = json.getJSONObject(i)
- val cover = jo.getJSONObject("image")
- val id = jo.getLong("id")
- list += Manga(
- url = "/manga/api/$id",
- publicUrl = jo.getString("url"),
- source = MangaSource.DESUME,
- title = jo.getString("russian"),
- altTitle = jo.getString("name"),
- coverUrl = cover.getString("preview"),
- largeCoverUrl = cover.getString("original"),
- state = when {
- jo.getInt("ongoing") == 1 -> MangaState.ONGOING
- else -> null
- },
- rating = jo.getDouble("score").toFloat().coerceIn(0f, 1f),
- id = generateUid(id),
- description = jo.getString("description")
- )
- }
- return list
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val url = manga.url.withDomain()
- val json = loaderContext.httpGet(url).parseJson().getJSONObject("response")
- ?: throw ParseException("Invalid response")
- val baseChapterUrl = manga.url + "/chapter/"
- val chaptersList = json.getJSONObject("chapters").getJSONArray("list")
- val totalChapters = chaptersList.length()
- return manga.copy(
- tags = json.getJSONArray("genres").mapToSet {
- MangaTag(
- key = it.getString("text"),
- title = it.getString("russian").toTitleCase(),
- source = manga.source
- )
- },
- publicUrl = json.getString("url"),
- description = json.getString("description"),
- chapters = chaptersList.mapIndexed { i, it ->
- val chid = it.getLong("id")
- val volChap = "Том " + it.optString("vol", "0") + ". " + "Глава " + it.optString("ch", "0")
- val title = it.optString("title", "null").takeUnless { it == "null" }
- MangaChapter(
- id = generateUid(chid),
- source = manga.source,
- url = "$baseChapterUrl$chid",
- uploadDate = it.getLong("date") * 1000,
- name = if (title.isNullOrEmpty()) volChap else "$volChap: $title",
- number = totalChapters - i,
- scanlator = null,
- branch = null,
- )
- }.reversed()
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val json = loaderContext.httpGet(fullUrl)
- .parseJson()
- .getJSONObject("response") ?: throw ParseException("Invalid response")
- return json.getJSONObject("pages").getJSONArray("list").map { jo ->
- MangaPage(
- id = generateUid(jo.getLong("id")),
- referer = fullUrl,
- preview = null,
- source = chapter.source,
- url = jo.getString("img"),
- )
- }
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
- val root = doc.body().getElementById("animeFilter")
- ?.selectFirst(".catalog-genres") ?: throw ParseException("Root not found")
- return root.select("li").mapToSet {
- MangaTag(
- source = source,
- key = it.selectFirst("input")?.attr("data-genre") ?: parseFailed(),
- title = it.selectFirst("label")?.text()?.toTitleCase() ?: parseFailed()
- )
- }
- }
-
- private fun getSortKey(sortOrder: SortOrder?) =
- when (sortOrder) {
- SortOrder.ALPHABETICAL -> "name"
- SortOrder.POPULARITY -> "popular"
- SortOrder.UPDATED -> "updated"
- SortOrder.NEWEST -> "id"
- else -> "updated"
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
deleted file mode 100644
index d59e171ba..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ExHentaiRepository.kt
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.jsoup.nodes.Element
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.util.*
-import kotlin.math.pow
-
-private const val DOMAIN_UNAUTHORIZED = "e-hentai.org"
-private const val DOMAIN_AUTHORIZED = "exhentai.org"
-
-class ExHentaiRepository(
- loaderContext: MangaLoaderContext,
-) : RemoteMangaRepository(loaderContext), MangaRepositoryAuthProvider {
-
- override val source = MangaSource.EXHENTAI
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.NEWEST,
- )
-
- override val defaultDomain: String
- get() = if (isAuthorized()) DOMAIN_AUTHORIZED else DOMAIN_UNAUTHORIZED
-
- override val authUrl: String
- get() = "https://${getDomain()}/bounce_login.php"
-
- private val ratingPattern = Regex("-?[0-9]+px")
- private val authCookies = arrayOf("ipb_member_id", "ipb_pass_hash")
- private var updateDm = false
-
- init {
- loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "nw=1", "sl=dm_2")
- loaderContext.cookieJar.insertCookies(DOMAIN_UNAUTHORIZED, "nw=1", "sl=dm_2")
- }
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?,
- ): List {
- val page = (offset / 25f).toIntUp()
- var search = query?.urlEncoded().orEmpty()
- val url = buildString {
- append("https://")
- append(getDomain())
- append("/?page=")
- append(page)
- if (!tags.isNullOrEmpty()) {
- var fCats = 0
- for (tag in tags) {
- tag.key.toIntOrNull()?.let { fCats = fCats or it } ?: run {
- search += tag.key + " "
- }
- }
- if (fCats != 0) {
- append("&f_cats=")
- append(1023 - fCats)
- }
- }
- if (search.isNotEmpty()) {
- append("&f_search=")
- append(search.trim().replace(' ', '+'))
- }
- // by unknown reason cookie "sl=dm_2" is ignored, so, we should request it again
- if (updateDm) {
- append("&inline_set=dm_e")
- }
- }
- val body = loaderContext.httpGet(url).parseHtml().body()
- val root = body.selectFirst("table.itg")
- ?.selectFirst("tbody")
- ?: if (updateDm) {
- parseFailed("Cannot find root")
- } else {
- updateDm = true
- return getList2(offset, query, tags, sortOrder)
- }
- updateDm = false
- return root.children().mapNotNull { tr ->
- if (tr.childrenSize() != 2) return@mapNotNull null
- val (td1, td2) = tr.children()
- val glink = td2.selectFirst("div.glink") ?: parseFailed("glink not found")
- val a = glink.parents().select("a").first() ?: parseFailed("link not found")
- val href = a.relUrl("href")
- val tagsDiv = glink.nextElementSibling() ?: parseFailed("tags div not found")
- val mainTag = td2.selectFirst("div.cn")?.let { div ->
- MangaTag(
- title = div.text().toTitleCase(),
- key = tagIdByClass(div.classNames()) ?: return@let null,
- source = source,
- )
- }
- Manga(
- id = generateUid(href),
- title = glink.text().cleanupTitle(),
- altTitle = null,
- url = href,
- publicUrl = a.absUrl("href"),
- rating = td2.selectFirst("div.ir")?.parseRating() ?: Manga.NO_RATING,
- isNsfw = true,
- coverUrl = td1.selectFirst("img")?.absUrl("src").orEmpty(),
- tags = setOfNotNull(mainTag),
- state = null,
- author = tagsDiv.getElementsContainingOwnText("artist:").first()
- ?.nextElementSibling()?.text(),
- source = source,
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
- val root = doc.body().selectFirst("div.gm") ?: parseFailed("Cannot find root")
- val cover = root.getElementById("gd1")?.children()?.first()
- val title = root.getElementById("gd2")
- val taglist = root.getElementById("taglist")
- val tabs = doc.body().selectFirst("table.ptt")?.selectFirst("tr")
- return manga.copy(
- title = title?.getElementById("gn")?.text()?.cleanupTitle() ?: manga.title,
- altTitle = title?.getElementById("gj")?.text()?.cleanupTitle() ?: manga.altTitle,
- publicUrl = doc.baseUri().ifEmpty { manga.publicUrl },
- rating = root.getElementById("rating_label")?.text()
- ?.substringAfterLast(' ')
- ?.toFloatOrNull()
- ?.div(5f) ?: manga.rating,
- largeCoverUrl = cover?.css("background")?.cssUrl(),
- description = taglist?.select("tr")?.joinToString("
") { tr ->
- val (tc, td) = tr.children()
- val subtags = td.select("a").joinToString { it.html() }
- "${tc.html()} $subtags"
- },
- chapters = tabs?.select("a")?.findLast { a ->
- a.text().toIntOrNull() != null
- }?.let { a ->
- val count = a.text().toInt()
- val chapters = ArrayList(count)
- for (i in 1..count) {
- val url = "${manga.url}?p=$i"
- chapters += MangaChapter(
- id = generateUid(url),
- name = "${manga.title} #$i",
- number = i,
- url = url,
- uploadDate = 0L,
- source = source,
- scanlator = null,
- branch = null,
- )
- }
- chapters
- },
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val doc = loaderContext.httpGet(chapter.url.withDomain()).parseHtml()
- val root = doc.body().getElementById("gdt") ?: parseFailed("Root not found")
- return root.select("a").mapNotNull { a ->
- val url = a.relUrl("href")
- MangaPage(
- id = generateUid(url),
- url = url,
- referer = a.absUrl("href"),
- preview = null,
- source = source,
- )
- }
- }
-
- override suspend fun getPageUrl(page: MangaPage): String {
- val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
- return doc.body().getElementById("img")?.absUrl("src")
- ?: parseFailed("Image not found")
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("https://${getDomain()}").parseHtml()
- val root = doc.body().getElementById("searchbox")?.selectFirst("table")
- ?: parseFailed("Root not found")
- return root.select("div.cs").mapNotNullToSet { div ->
- val id = div.id().substringAfterLast('_').toIntOrNull()
- ?: return@mapNotNullToSet null
- MangaTag(
- title = div.text().toTitleCase(),
- key = id.toString(),
- source = source
- )
- }
- }
-
- override fun isAuthorized(): Boolean {
- val authorized = isAuthorized(DOMAIN_UNAUTHORIZED)
- if (authorized) {
- if (!isAuthorized(DOMAIN_AUTHORIZED)) {
- loaderContext.cookieJar.copyCookies(
- DOMAIN_UNAUTHORIZED,
- DOMAIN_AUTHORIZED,
- authCookies,
- )
- loaderContext.cookieJar.insertCookies(DOMAIN_AUTHORIZED, "yay=louder")
- }
- return true
- }
- return false
- }
-
- override suspend fun getUsername(): String {
- val doc = loaderContext.httpGet("https://forums.${DOMAIN_UNAUTHORIZED}/").parseHtml().body()
- val username = doc.getElementById("userlinks")
- ?.getElementsByAttributeValueContaining("href", "?showuser=")
- ?.firstOrNull()
- ?.ownText()
- ?: if (doc.getElementById("userlinksguest") != null) {
- throw AuthRequiredException(source)
- } else {
- throw ParseException()
- }
- return username
- }
-
- private fun isAuthorized(domain: String): Boolean {
- val cookies = loaderContext.cookieJar.getCookies(domain).mapToSet { x -> x.name }
- return authCookies.all { it in cookies }
- }
-
- private fun Element.parseRating(): Float {
- return runCatching {
- val style = requireNotNull(attr("style"))
- val (v1, v2) = ratingPattern.find(style)!!.destructured
- var p1 = v1.dropLast(2).toInt()
- val p2 = v2.dropLast(2).toInt()
- if (p2 != -1) {
- p1 += 8
- }
- (80 - p1) / 80f
- }.getOrDefault(Manga.NO_RATING)
- }
-
- private fun String.cleanupTitle(): String {
- val result = StringBuilder(length)
- var skip = false
- for (c in this) {
- when {
- c == '[' -> skip = true
- c == ']' -> skip = false
- c.isWhitespace() && result.isEmpty() -> continue
- !skip -> result.append(c)
- }
- }
- while (result.lastOrNull()?.isWhitespace() == true) {
- result.deleteCharAt(result.lastIndex)
- }
- return result.toString()
- }
-
- private fun String.cssUrl(): String? {
- val fromIndex = indexOf("url(")
- if (fromIndex == -1) {
- return null
- }
- val toIndex = indexOf(')', startIndex = fromIndex)
- return if (toIndex == -1) {
- null
- } else {
- substring(fromIndex + 4, toIndex).trim()
- }
- }
-
- private fun tagIdByClass(classNames: Collection): String? {
- val className = classNames.find { x -> x.startsWith("ct") } ?: return null
- val num = className.drop(2).toIntOrNull(16) ?: return null
- return 2.0.pow(num).toInt().toString()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
deleted file mode 100644
index 0aeb751e1..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Response
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 70
-private const val PAGE_SIZE_SEARCH = 50
-
-abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
- RemoteMangaRepository(loaderContext) {
-
- private val headers = Headers.Builder()
- .add("User-Agent", "readmangafun")
- .build()
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.UPDATED,
- SortOrder.POPULARITY,
- SortOrder.NEWEST,
- SortOrder.RATING
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val domain = getDomain()
- val doc = when {
- !query.isNullOrEmpty() -> loaderContext.httpPost(
- "https://$domain/search",
- mapOf(
- "q" to query.urlEncoded(),
- "offset" to (offset upBy PAGE_SIZE_SEARCH).toString()
- )
- )
- tags.isNullOrEmpty() -> loaderContext.httpGet(
- "https://$domain/list?sortType=${
- getSortKey(
- sortOrder
- )
- }&offset=${offset upBy PAGE_SIZE}", headers
- )
- tags.size == 1 -> loaderContext.httpGet(
- "https://$domain/list/genre/${tags.first().key}?sortType=${
- getSortKey(
- sortOrder
- )
- }&offset=${offset upBy PAGE_SIZE}", headers
- )
- offset > 0 -> return emptyList()
- else -> advancedSearch(domain, tags)
- }.parseHtml().body()
- val root = (doc.getElementById("mangaBox") ?: doc.getElementById("mangaResults"))
- ?.selectFirst("div.tiles.row") ?: throw ParseException("Cannot find root")
- val baseHost = root.baseUri().toHttpUrl().host
- return root.select("div.tile").mapNotNull { node ->
- val imgDiv = node.selectFirst("div.img") ?: return@mapNotNull null
- val descDiv = node.selectFirst("div.desc") ?: return@mapNotNull null
- if (descDiv.selectFirst("i.fa-user") != null) {
- return@mapNotNull null //skip author
- }
- val href = imgDiv.selectFirst("a")?.attr("href")?.inContextOf(node)
- if (href == null || href.toHttpUrl().host != baseHost) {
- return@mapNotNull null // skip external links
- }
- val title = descDiv.selectFirst("h3")?.selectFirst("a")?.text()
- ?: return@mapNotNull null
- val tileInfo = descDiv.selectFirst("div.tile-info")
- val relUrl = href.toRelativeUrl(baseHost)
- Manga(
- id = generateUid(relUrl),
- url = relUrl,
- publicUrl = href,
- title = title,
- altTitle = descDiv.selectFirst("h4")?.text(),
- coverUrl = imgDiv.selectFirst("img.lazy")?.attr("data-original").orEmpty(),
- rating = runCatching {
- node.selectFirst("div.rating")
- ?.attr("title")
- ?.substringBefore(' ')
- ?.toFloatOrNull()
- ?.div(10f)
- }.getOrNull() ?: Manga.NO_RATING,
- author = tileInfo?.selectFirst("a.person-link")?.text(),
- tags = runCatching {
- tileInfo?.select("a.element-link")
- ?.mapToSet {
- MangaTag(
- title = it.text().toTitleCase(),
- key = it.attr("href").substringAfterLast('/'),
- source = source
- )
- }
- }.getOrNull().orEmpty(),
- state = when {
- node.selectFirst("div.tags")
- ?.selectFirst("span.mangaCompleted") != null -> MangaState.FINISHED
- else -> null
- },
- source = source
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.url.withDomain(), headers).parseHtml()
- val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
- ?: throw ParseException("Cannot find root")
- val dateFormat = SimpleDateFormat("dd.MM.yy", Locale.US)
- val coverImg = root.selectFirst("div.subject-cover")?.selectFirst("img")
- return manga.copy(
- description = root.selectFirst("div.manga-description")?.html(),
- largeCoverUrl = coverImg?.attr("data-full"),
- coverUrl = coverImg?.attr("data-thumb") ?: manga.coverUrl,
- tags = manga.tags + root.select("div.subject-meta").select("span.elem_genre ")
- .mapNotNull {
- val a = it.selectFirst("a.element-link") ?: return@mapNotNull null
- MangaTag(
- title = a.text().toTitleCase(),
- key = a.attr("href").substringAfterLast('/'),
- source = source
- )
- },
- chapters = root.selectFirst("div.chapters-link")?.selectFirst("table")
- ?.select("tr:has(td > a)")?.asReversed()?.mapIndexedNotNull { i, tr ->
- val a = tr.selectFirst("a") ?: return@mapIndexedNotNull null
- val href = a.relUrl("href")
- var translators = ""
- val translatorElement = a.attr("title")
- if (!translatorElement.isNullOrBlank()) {
- translators = translatorElement
- .replace("(Переводчик),", "&")
- .removeSuffix(" (Переводчик)")
- }
- MangaChapter(
- id = generateUid(href),
- name = tr.selectFirst("a")?.text().orEmpty().removePrefix(manga.title).trim(),
- number = i + 1,
- url = href,
- uploadDate = dateFormat.tryParse(tr.selectFirst("td.d-none")?.text()),
- scanlator = translators,
- source = source,
- branch = null,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val doc = loaderContext.httpGet(chapter.url.withDomain() + "?mtr=1", headers).parseHtml()
- val scripts = doc.select("script")
- for (script in scripts) {
- val data = script.html()
- val pos = data.indexOf("rm_h.init")
- if (pos == -1) {
- continue
- }
- val json = data.substring(pos).substringAfter('[').substringBeforeLast(']')
- val matches = Regex("\\[.*?]").findAll(json).toList()
- val regex = Regex("['\"].*?['\"]")
- return matches.map { x ->
- val parts = regex.findAll(x.value).toList()
- val url = parts[0].value.removeSurrounding('"', '\'') +
- parts[2].value.removeSurrounding('"', '\'')
- MangaPage(
- id = generateUid(url),
- url = url,
- preview = null,
- referer = chapter.url,
- source = source,
- )
- }
- }
- throw ParseException("Pages list not found at ${chapter.url}")
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("https://${getDomain()}/list/genres/sort_name", headers).parseHtml()
- val root = doc.body().getElementById("mangaBox")?.selectFirst("div.leftContent")
- ?.selectFirst("table.table") ?: parseFailed("Cannot find root")
- return root.select("a.element-link").mapToSet { a ->
- MangaTag(
- title = a.text().toTitleCase(),
- key = a.attr("href").substringAfterLast('/'),
- source = source
- )
- }
- }
-
- private fun getSortKey(sortOrder: SortOrder?) =
- when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
- SortOrder.ALPHABETICAL -> "name"
- SortOrder.POPULARITY -> "rate"
- SortOrder.UPDATED -> "updated"
- SortOrder.NEWEST -> "created"
- SortOrder.RATING -> "votes"
- null -> "updated"
- }
-
- private suspend fun advancedSearch(domain: String, tags: Set): Response {
- val url = "https://$domain/search/advanced"
- // Step 1: map catalog genres names to advanced-search genres ids
- val tagsIndex = loaderContext.httpGet(url, headers).parseHtml()
- .body().selectFirst("form.search-form")
- ?.select("div.form-group")
- ?.get(1) ?: parseFailed("Genres filter element not found")
- val tagNames = tags.map { it.title.lowercase() }
- val payload = HashMap()
- var foundGenres = 0
- tagsIndex.select("li.property").forEach { li ->
- val name = li.text().trim().lowercase()
- val id = li.selectFirst("input")?.id()
- ?: parseFailed("Id for tag $name not found")
- payload[id] = if (name in tagNames) {
- foundGenres++
- "in"
- } else ""
- }
- if (foundGenres != tags.size) {
- parseFailed("Some genres are not found")
- }
- // Step 2: advanced search
- payload["q"] = ""
- payload["s_high_rate"] = ""
- payload["s_single"] = ""
- payload["s_mature"] = ""
- payload["s_completed"] = ""
- payload["s_translated"] = ""
- payload["s_many_chapters"] = ""
- payload["s_wait_upload"] = ""
- payload["s_sale"] = ""
- payload["years"] = "1900,2099"
- payload["+"] = "Искать".urlEncoded()
- return loaderContext.httpPost(url, payload)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
deleted file mode 100644
index 2c25870b9..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.parseHtml
-import org.koitharu.kotatsu.utils.ext.toTitleCase
-
-class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
- override val defaultDomain = "hentaichan.live"
- override val source = MangaSource.HENCHAN
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- return super.getList2(offset, query, tags, sortOrder).map {
- it.copy(
- coverUrl = it.coverUrl.replace("_blur", ""),
- isNsfw = true,
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
- val root =
- doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
- val readLink = manga.url.replace("manga", "online")
- return manga.copy(
- description = root.getElementById("description")?.html()?.substringBeforeLast(" = EnumSet.of(
- SortOrder.UPDATED,
- SortOrder.ALPHABETICAL,
- SortOrder.NEWEST,
- SortOrder.POPULARITY,
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?,
- ): List {
- val domain = getDomain()
- val url = buildString {
- append("https://api.")
- append(domain)
- append("/manga?limit=")
- append(PAGE_SIZE)
- append("&offset=")
- append(offset)
- append("&includes[]=cover_art&includes[]=author&includes[]=artist&")
- tags?.forEach { tag ->
- append("includedTags[]=")
- append(tag.key)
- append('&')
- }
- if (!query.isNullOrEmpty()) {
- append("title=")
- append(query.urlEncoded())
- append('&')
- }
- append(CONTENT_RATING)
- append("&order")
- append(when (sortOrder) {
- null,
- SortOrder.UPDATED,
- -> "[latestUploadedChapter]=desc"
- SortOrder.ALPHABETICAL -> "[title]=asc"
- SortOrder.NEWEST -> "[createdAt]=desc"
- SortOrder.POPULARITY -> "[followedCount]=desc"
- else -> "[followedCount]=desc"
- })
- }
- val json = loaderContext.httpGet(url).parseJson().getJSONArray("data")
- return json.map { jo ->
- val id = jo.getString("id")
- val attrs = jo.getJSONObject("attributes")
- val relations = jo.getJSONArray("relationships").associateByKey("type")
- val cover = relations["cover_art"]
- ?.getJSONObject("attributes")
- ?.getString("fileName")
- ?.let {
- "https://uploads.$domain/covers/$id/$it"
- }
- Manga(
- id = generateUid(id),
- title = requireNotNull(attrs.getJSONObject("title").selectByLocale()) {
- "Title should not be null"
- },
- altTitle = attrs.optJSONObject("altTitles")?.selectByLocale(),
- url = id,
- publicUrl = "https://$domain/title/$id",
- rating = Manga.NO_RATING,
- isNsfw = attrs.getStringOrNull("contentRating") == "erotica",
- coverUrl = cover?.plus(".256.jpg").orEmpty(),
- largeCoverUrl = cover,
- description = attrs.optJSONObject("description")?.selectByLocale(),
- tags = attrs.getJSONArray("tags").mapToSet { tag ->
- MangaTag(
- title = tag.getJSONObject("attributes")
- .getJSONObject("name")
- .firstStringValue()
- .toTitleCase(),
- key = tag.getString("id"),
- source = source,
- )
- },
- state = when (jo.getStringOrNull("status")) {
- "ongoing" -> MangaState.ONGOING
- "completed" -> MangaState.FINISHED
- else -> null
- },
- author = (relations["author"] ?: relations["artist"])
- ?.getJSONObject("attributes")
- ?.getStringOrNull("name"),
- source = source,
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
- val domain = getDomain()
- val attrsDeferred = async {
- loaderContext.httpGet(
- "https://api.$domain/manga/${manga.url}?includes[]=artist&includes[]=author&includes[]=cover_art"
- ).parseJson().getJSONObject("data").getJSONObject("attributes")
- }
- val feedDeferred = async {
- val url = buildString {
- append("https://api.")
- append(domain)
- append("/manga/")
- append(manga.url)
- append("/feed")
- append("?limit=96&includes[]=scanlation_group&order[volume]=asc&order[chapter]=asc&offset=0&")
- append(CONTENT_RATING)
- }
- loaderContext.httpGet(url).parseJson().getJSONArray("data")
- }
- val mangaAttrs = attrsDeferred.await()
- val feed = feedDeferred.await()
- //2022-01-02T00:27:11+00:00
- val dateFormat = SimpleDateFormat(
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- "yyyy-MM-dd'T'HH:mm:ssX"
- } else {
- "yyyy-MM-dd'T'HH:mm:ss'+00:00'"
- },
- Locale.ROOT
- )
- manga.copy(
- description = mangaAttrs.getJSONObject("description").selectByLocale()
- ?: manga.description,
- chapters = feed.mapNotNull { jo ->
- val id = jo.getString("id")
- val attrs = jo.getJSONObject("attributes")
- if (!attrs.isNull("externalUrl")) {
- return@mapNotNull null
- }
- val locale = Locale.forLanguageTag(attrs.getString("translatedLanguage"))
- val relations = jo.getJSONArray("relationships").associateByKey("type")
- val number = attrs.optInt("chapter", 0)
- MangaChapter(
- id = generateUid(id),
- name = attrs.getStringOrNull("title")?.takeUnless(String::isEmpty)
- ?: "Chapter #$number",
- number = number,
- url = id,
- scanlator = relations["scanlation_group"]?.getStringOrNull("name"),
- uploadDate = dateFormat.tryParse(attrs.getString("publishAt")),
- branch = locale.getDisplayName(locale).toTitleCase(locale),
- source = source,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val domain = getDomain()
- val chapter = loaderContext.httpGet("https://api.$domain/at-home/server/${chapter.url}?forcePort443=false")
- .parseJson()
- .getJSONObject("chapter")
- val pages = chapter.getJSONArray("data")
- val prefix = "https://uploads.$domain/data/${chapter.getString("hash")}/"
- val referer = "https://$domain/"
- return List(pages.length()) { i ->
- val url = prefix + pages.getString(i)
- MangaPage(
- id = generateUid(url),
- url = url,
- referer = referer,
- preview = null, // TODO prefix + dataSaver.getString(i),
- source = source,
- )
- }
- }
-
- override suspend fun getTags(): Set {
- val tags = loaderContext.httpGet("https://api.${getDomain()}/manga/tag").parseJson()
- .getJSONArray("data")
- return tags.mapToSet { jo ->
- MangaTag(
- title = jo.getJSONObject("attributes").getJSONObject("name").firstStringValue().toTitleCase(),
- key = jo.getString("id"),
- source = source,
- )
- }
- }
-
- private fun JSONObject.firstStringValue() = values().next() as String
-
- private fun JSONObject.selectByLocale(): String? {
- val preferredLocales = LocaleListCompat.getAdjustedDefault()
- repeat(preferredLocales.size()) { i ->
- val locale = preferredLocales.get(i)
- getStringOrNull(locale.language)?.let { return it }
- getStringOrNull(locale.toLanguageTag())?.let { return it }
- }
- return getStringOrNull(LOCALE_FALLBACK) ?: values().nextOrNull() as? String
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
deleted file mode 100644
index 87868b327..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
+++ /dev/null
@@ -1,267 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import androidx.collection.ArraySet
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-open class MangaLibRepository(loaderContext: MangaLoaderContext) :
- RemoteMangaRepository(loaderContext), MangaRepositoryAuthProvider {
-
- override val defaultDomain = "mangalib.me"
-
- override val source = MangaSource.MANGALIB
-
- override val authUrl: String
- get() = "https://${getDomain()}/login"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.RATING,
- SortOrder.ALPHABETICAL,
- SortOrder.POPULARITY,
- SortOrder.UPDATED,
- SortOrder.NEWEST
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- if (!query.isNullOrEmpty()) {
- return if (offset == 0) search(query) else emptyList()
- }
- val page = (offset / 60f).toIntUp()
- val url = buildString {
- append("https://")
- append(getDomain())
- append("/manga-list?dir=")
- append(getSortKey(sortOrder))
- append("&page=")
- append(page)
- tags?.forEach { tag ->
- append("&genres[include][]=")
- append(tag.key)
- }
- }
- val doc = loaderContext.httpGet(url).parseHtml()
- val root = doc.body().getElementById("manga-list") ?: throw ParseException("Root not found")
- val items = root.selectFirst("div.media-cards-grid")?.select("div.media-card-wrap")
- ?: return emptyList()
- return items.mapNotNull { card ->
- val a = card.selectFirst("a.media-card") ?: return@mapNotNull null
- val href = a.relUrl("href")
- Manga(
- id = generateUid(href),
- title = card.selectFirst("h3")?.text().orEmpty(),
- coverUrl = a.absUrl("data-src"),
- altTitle = null,
- author = null,
- rating = Manga.NO_RATING,
- url = href,
- publicUrl = href.inContextOf(a),
- tags = emptySet(),
- state = null,
- source = source
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val fullUrl = manga.url.withDomain()
- val doc = loaderContext.httpGet("$fullUrl?section=info").parseHtml()
- val root = doc.body().getElementById("main-page") ?: throw ParseException("Root not found")
- val title = root.selectFirst("div.media-header__wrap")?.children()
- val info = root.selectFirst("div.media-content")
- val chaptersDoc = loaderContext.httpGet("$fullUrl?section=chapters").parseHtml()
- val scripts = chaptersDoc.select("script")
- val dateFormat = SimpleDateFormat("yyy-MM-dd", Locale.US)
- var chapters: ArrayList? = null
- scripts@ for (script in scripts) {
- val raw = script.html().lines()
- for (line in raw) {
- if (line.startsWith("window.__DATA__")) {
- val json = JSONObject(line.substringAfter('=').substringBeforeLast(';'))
- val list = json.getJSONObject("chapters").getJSONArray("list")
- val total = list.length()
- chapters = ArrayList(total)
- for (i in 0 until total) {
- val item = list.getJSONObject(i)
- val chapterId = item.getLong("chapter_id")
- val scanlator = item.getStringOrNull("username")
- val url = buildString {
- append(manga.url)
- append("/v")
- append(item.getInt("chapter_volume"))
- append("/c")
- append(item.getString("chapter_number"))
- @Suppress("BlockingMethodInNonBlockingContext") // lint issue
- append('/')
- append(item.optString("chapter_string"))
- }
- val nameChapter = item.getStringOrNull("chapter_name")
- val volume = item.getInt("chapter_volume")
- val number = item.getString("chapter_number")
- val fullNameChapter = "Том $volume. Глава $number"
- chapters.add(
- MangaChapter(
- id = generateUid(chapterId),
- url = url,
- source = source,
- number = total - i,
- uploadDate = dateFormat.tryParse(
- item.getString("chapter_created_at").substringBefore(" ")
- ),
- scanlator = scanlator,
- branch = null,
- name = if (nameChapter.isNullOrBlank()) fullNameChapter else "$fullNameChapter - $nameChapter",
- )
- )
- }
- chapters.reverse()
- break@scripts
- }
- }
- }
- return manga.copy(
- title = title?.getOrNull(0)?.text()?.takeUnless(String::isBlank) ?: manga.title,
- altTitle = title?.getOrNull(1)?.text()?.substringBefore('/')?.trim(),
- rating = root.selectFirst("div.media-stats-item__score")
- ?.selectFirst("span")
- ?.text()?.toFloatOrNull()?.div(5f) ?: manga.rating,
- author = info?.getElementsMatchingOwnText("Автор")?.firstOrNull()
- ?.nextElementSibling()?.text() ?: manga.author,
- tags = info?.selectFirst("div.media-tags")
- ?.select("a.media-tag-item")?.mapToSet { a ->
- MangaTag(
- title = a.text().toTitleCase(),
- key = a.attr("href").substringAfterLast('='),
- source = source
- )
- } ?: manga.tags,
- description = info?.selectFirst("div.media-description__text")?.html(),
- chapters = chapters
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- if (doc.location().endsWith("/register")) {
- throw AuthRequiredException(source)
- }
- val scripts = doc.head().select("script")
- val pg = (doc.body().getElementById("pg")?.html() ?: parseFailed("Element #pg not found"))
- .substringAfter('=')
- .substringBeforeLast(';')
- val pages = JSONArray(pg)
- for (script in scripts) {
- val raw = script.html().trim()
- if (raw.contains("window.__info")) {
- val json = JSONObject(
- raw.substringAfter("window.__info")
- .substringAfter('=')
- .substringBeforeLast(';')
- )
- val domain = json.getJSONObject("servers").run {
- getStringOrNull("main") ?: getString(
- json.getJSONObject("img").getString("server")
- )
- }
- val url = json.getJSONObject("img").getString("url")
- return pages.map { x ->
- val pageUrl = "$domain/$url${x.getString("u")}"
- MangaPage(
- id = generateUid(pageUrl),
- url = pageUrl,
- preview = null,
- referer = fullUrl,
- source = source,
- )
- }
- }
- }
- throw ParseException("Script with info not found")
- }
-
- override suspend fun getTags(): Set {
- val url = "https://${getDomain()}/manga-list"
- val doc = loaderContext.httpGet(url).parseHtml()
- val scripts = doc.body().select("script")
- for (script in scripts) {
- val raw = script.html().trim()
- if (raw.startsWith("window.__DATA")) {
- val json = JSONObject(raw.substringAfter('=').substringBeforeLast(';'))
- val genres = json.getJSONObject("filters").getJSONArray("genres")
- val result = ArraySet(genres.length())
- for (x in genres) {
- result += MangaTag(
- source = source,
- key = x.getInt("id").toString(),
- title = x.getString("name").toTitleCase(),
- )
- }
- return result
- }
- }
- throw ParseException("Script with genres not found")
- }
-
- override fun isAuthorized(): Boolean {
- return loaderContext.cookieJar.getCookies(getDomain()).any {
- it.name.startsWith("remember_web_")
- }
- }
-
- override suspend fun getUsername(): String {
- val body = loaderContext.httpGet("https://${getDomain()}/messages").parseHtml().body()
- if (body.baseUri().endsWith("/login")) {
- throw AuthRequiredException(source)
- }
- return body.selectFirst(".profile-user__username")?.text() ?: parseFailed("Cannot find username")
- }
-
- private fun getSortKey(sortOrder: SortOrder?) = when (sortOrder) {
- SortOrder.RATING -> "desc&sort=rate"
- SortOrder.ALPHABETICAL -> "asc&sort=name"
- SortOrder.POPULARITY -> "desc&sort=views"
- SortOrder.UPDATED -> "desc&sort=last_chapter_at"
- SortOrder.NEWEST -> "desc&sort=created_at"
- else -> "desc&sort=last_chapter_at"
- }
-
- private suspend fun search(query: String): List {
- val domain = getDomain()
- val json = loaderContext.httpGet("https://$domain/search?type=manga&q=$query")
- .parseJsonArray()
- return json.map { jo ->
- val slug = jo.getString("slug")
- val url = "/$slug"
- val covers = jo.getJSONObject("covers")
- Manga(
- id = generateUid(url),
- url = url,
- publicUrl = "https://$domain/$slug",
- title = jo.getString("rus_name"),
- altTitle = jo.getString("name"),
- author = null,
- tags = emptySet(),
- rating = jo.getString("rate_avg")
- .toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
- state = null,
- source = source,
- coverUrl = covers.getString("thumbnail"),
- largeCoverUrl = covers.getString("default")
- )
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt
deleted file mode 100644
index a9c0030d2..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaOwlRepository.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.Base64
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangaOwlRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
-
- override val source = MangaSource.MANGAOWL
-
- override val defaultDomain = "mangaowls.com"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.POPULARITY,
- SortOrder.NEWEST,
- SortOrder.UPDATED
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?,
- ): List {
- val page = (offset / 36f).toIntUp().inc()
- val link = buildString {
- append("https://")
- append(getDomain())
- when {
- !query.isNullOrEmpty() -> {
- append("/search/${page}?search=")
- append(query.urlEncoded())
- }
- !tags.isNullOrEmpty() -> {
- for (tag in tags) {
- append(tag.key)
- }
- append("/${page}?type=${getAlternativeSortKey(sortOrder)}")
- }
- else -> {
- append("/${getSortKey(sortOrder)}/${page}")
- }
- }
- }
- val doc = loaderContext.httpGet(link).parseHtml()
- val slides = doc.body().select("ul.slides") ?: parseFailed("An error occurred while parsing")
- val items = slides.select("div.col-md-2")
- return items.mapNotNull { item ->
- val href = item.selectFirst("h6 a")?.relUrl("href") ?: return@mapNotNull null
- Manga(
- id = generateUid(href),
- title = item.selectFirst("h6 a")?.text() ?: return@mapNotNull null,
- coverUrl = item.select("div.img-responsive").attr("abs:data-background-image"),
- altTitle = null,
- author = null,
- rating = runCatching {
- item.selectFirst("div.block-stars")
- ?.text()
- ?.toFloatOrNull()
- ?.div(10f)
- }.getOrNull() ?: Manga.NO_RATING,
- url = href,
- publicUrl = href.withDomain(),
- source = source
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.publicUrl).parseHtml()
- val info = doc.body().selectFirst("div.single_detail") ?: parseFailed("An error occurred while parsing")
- val table = doc.body().selectFirst("div.single-grid-right") ?: parseFailed("An error occurred while parsing")
- val dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US)
- val trRegex = "window\\['tr'] = '([^']*)';".toRegex(RegexOption.IGNORE_CASE)
- val trElement = doc.getElementsByTag("script").find { trRegex.find(it.data()) != null } ?: parseFailed("Oops, tr not found")
- val tr = trRegex.find(trElement.data())!!.groups[1]!!.value
- val s = Base64.encodeToString(defaultDomain.toByteArray(), Base64.NO_PADDING)
- return manga.copy(
- description = info.selectFirst(".description")?.html(),
- largeCoverUrl = info.select("img").first()?.let { img ->
- if (img.hasAttr("data-src")) img.attr("abs:data-src") else img.attr("abs:src")
- },
- author = info.selectFirst("p.fexi_header_para a.author_link")?.text(),
- state = parseStatus(info.select("p.fexi_header_para:contains(status)").first()?.ownText()),
- tags = manga.tags + info.select("div.col-xs-12.col-md-8.single-right-grid-right > p > a[href*=genres]")
- .mapNotNull {
- val a = it.selectFirst("a") ?: return@mapNotNull null
- MangaTag(
- title = a.text().toTitleCase(),
- key = a.attr("href"),
- source = source
- )
- },
- chapters = table.select("div.table.table-chapter-list").select("li.list-group-item.chapter_list").asReversed().mapIndexed { i, li ->
- val a = li.select("a")
- val href = a.attr("data-href").ifEmpty {
- parseFailed("Link is missing")
- }
- MangaChapter(
- id = generateUid(href),
- name = a.select("label").text(),
- number = i + 1,
- url = "$href?tr=$tr&s=$s",
- scanlator = null,
- branch = null,
- uploadDate = dateFormat.tryParse(li.selectFirst("small:last-of-type")?.text()),
- source = MangaSource.MANGAOWL,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- val root = doc.body().select("div.item img.owl-lazy") ?: throw ParseException("Root not found")
- return root.map { div ->
- val url = div?.relUrl("data-src") ?: parseFailed("Page image not found")
- MangaPage(
- id = generateUid(url),
- url = url,
- preview = null,
- referer = url,
- source = MangaSource.MANGAOWL,
- )
- }
- }
-
- private fun parseStatus(status: String?) = when {
- status == null -> null
- status.contains("Ongoing") -> MangaState.ONGOING
- status.contains("Completed") -> MangaState.FINISHED
- else -> null
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("https://${getDomain()}/").parseHtml()
- val root = doc.body().select("ul.dropdown-menu.multi-column.columns-3").select("li")
- return root.mapToSet { p ->
- val a = p.selectFirst("a") ?: parseFailed("a is null")
- MangaTag(
- title = a.text().toTitleCase(),
- key = a.attr("href"),
- source = source
- )
- }
- }
-
- private fun getSortKey(sortOrder: SortOrder?) =
- when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
- SortOrder.POPULARITY -> "popular"
- SortOrder.NEWEST -> "new_release"
- SortOrder.UPDATED -> "lastest"
- else -> "lastest"
- }
-
- private fun getAlternativeSortKey(sortOrder: SortOrder?) =
- when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
- SortOrder.POPULARITY -> "0"
- SortOrder.NEWEST -> "2"
- SortOrder.UPDATED -> "3"
- else -> "3"
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
deleted file mode 100644
index 30109513c..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-class MangaTownRepository(loaderContext: MangaLoaderContext) :
- RemoteMangaRepository(loaderContext) {
-
- override val source = MangaSource.MANGATOWN
-
- override val defaultDomain = "www.mangatown.com"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.ALPHABETICAL,
- SortOrder.RATING,
- SortOrder.POPULARITY,
- SortOrder.UPDATED
- )
-
- private val regexTag = Regex("[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+-[^\\-]+")
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val sortKey = when (sortOrder) {
- SortOrder.ALPHABETICAL -> "?name.az"
- SortOrder.RATING -> "?rating.za"
- SortOrder.UPDATED -> "?last_chapter_time.za"
- else -> ""
- }
- val page = (offset / 30) + 1
- val url = when {
- !query.isNullOrEmpty() -> {
- if (offset != 0) {
- return emptyList()
- }
- "/search?name=${query.urlEncoded()}".withDomain()
- }
- tags.isNullOrEmpty() -> "/directory/$page.htm$sortKey".withDomain()
- tags.size == 1 -> "/directory/${tags.first().key}/$page.htm$sortKey".withDomain()
- else -> tags.joinToString(
- prefix = "/search?page=$page".withDomain()
- ) { tag ->
- "&genres[${tag.key}]=1"
- }
- }
- val doc = loaderContext.httpGet(url).parseHtml()
- val root = doc.body().selectFirst("ul.manga_pic_list")
- ?: throw ParseException("Root not found")
- return root.select("li").mapNotNull { li ->
- val a = li.selectFirst("a.manga_cover")
- val href = a?.relUrl("href")
- ?: return@mapNotNull null
- val views = li.select("p.view")
- val status = views.findOwnText { x -> x.startsWith("Status:") }
- ?.substringAfter(':')?.trim()?.lowercase(Locale.ROOT)
- Manga(
- id = generateUid(href),
- title = a.attr("title"),
- coverUrl = a.selectFirst("img")?.absUrl("src").orEmpty(),
- source = MangaSource.MANGATOWN,
- altTitle = null,
- rating = li.selectFirst("p.score")?.selectFirst("b")
- ?.ownText()?.toFloatOrNull()?.div(5f) ?: Manga.NO_RATING,
- author = views.findText { x -> x.startsWith("Author:") }?.substringAfter(':')
- ?.trim(),
- state = when (status) {
- "ongoing" -> MangaState.ONGOING
- "completed" -> MangaState.FINISHED
- else -> null
- },
- tags = li.selectFirst("p.keyWord")?.select("a")?.mapNotNullToSet tags@{ x ->
- MangaTag(
- title = x.attr("title").toTitleCase(),
- key = x.attr("href").parseTagKey() ?: return@tags null,
- source = MangaSource.MANGATOWN
- )
- }.orEmpty(),
- url = href,
- publicUrl = href.inContextOf(a)
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
- val root = doc.body().selectFirst("section.main")
- ?.selectFirst("div.article_content") ?: throw ParseException("Cannot find root")
- val info = root.selectFirst("div.detail_info")?.selectFirst("ul")
- val chaptersList = root.selectFirst("div.chapter_content")
- ?.selectFirst("ul.chapter_list")?.select("li")?.asReversed()
- val dateFormat = SimpleDateFormat("MMM dd,yyyy", Locale.US)
- return manga.copy(
- tags = manga.tags + info?.select("li")?.find { x ->
- x.selectFirst("b")?.ownText() == "Genre(s):"
- }?.select("a")?.mapNotNull { a ->
- MangaTag(
- title = a.attr("title").toTitleCase(),
- key = a.attr("href").parseTagKey() ?: return@mapNotNull null,
- source = MangaSource.MANGATOWN
- )
- }.orEmpty(),
- description = info?.getElementById("show")?.ownText(),
- chapters = chaptersList?.mapIndexedNotNull { i, li ->
- val href = li.selectFirst("a")?.relUrl("href")
- ?: return@mapIndexedNotNull null
- val name = li.select("span").filter { it.className().isEmpty() }
- .joinToString(" - ") { it.text() }.trim()
- MangaChapter(
- id = generateUid(href),
- url = href,
- source = MangaSource.MANGATOWN,
- number = i + 1,
- uploadDate = parseChapterDate(
- dateFormat,
- li.selectFirst("span.time")?.text()
- ),
- name = name.ifEmpty { "${manga.title} - ${i + 1}" },
- scanlator = null,
- branch = null,
- )
- } ?: bypassLicensedChapters(manga)
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- val root = doc.body().selectFirst("div.page_select")
- ?: throw ParseException("Cannot find root")
- return root.selectFirst("select")?.select("option")?.mapNotNull {
- val href = it.relUrl("value")
- if (href.endsWith("featured.html")) {
- return@mapNotNull null
- }
- MangaPage(
- id = generateUid(href),
- url = href,
- preview = null,
- referer = fullUrl,
- source = MangaSource.MANGATOWN,
- )
- } ?: parseFailed("Pages list not found")
- }
-
- override suspend fun getPageUrl(page: MangaPage): String {
- val doc = loaderContext.httpGet(page.url.withDomain()).parseHtml()
- return doc.getElementById("image")?.absUrl("src") ?: parseFailed("Image not found")
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("/directory/".withDomain()).parseHtml()
- val root = doc.body().selectFirst("aside.right")
- ?.getElementsContainingOwnText("Genres")
- ?.first()
- ?.nextElementSibling() ?: parseFailed("Root not found")
- return root.select("li").mapNotNullToSet { li ->
- val a = li.selectFirst("a") ?: return@mapNotNullToSet null
- val key = a.attr("href").parseTagKey()
- if (key.isNullOrEmpty()) {
- return@mapNotNullToSet null
- }
- MangaTag(
- source = MangaSource.MANGATOWN,
- key = key,
- title = a.text().toTitleCase()
- )
- }
- }
-
- private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
- return when {
- date.isNullOrEmpty() -> 0L
- date.contains("Today") -> Calendar.getInstance().timeInMillis
- date.contains("Yesterday") -> Calendar.getInstance().apply { add(Calendar.DAY_OF_MONTH, -1) }.timeInMillis
- else -> dateFormat.tryParse(date)
- }
- }
-
- override fun onCreatePreferences(map: MutableMap) {
- super.onCreatePreferences(map)
- map[SourceSettings.KEY_USE_SSL] = true
- }
-
- private suspend fun bypassLicensedChapters(manga: Manga): List {
- val doc = loaderContext.httpGet(manga.url.withDomain("m")).parseHtml()
- val list = doc.body().selectFirst("ul.detail-ch-list") ?: return emptyList()
- val dateFormat = SimpleDateFormat("MMM dd,yyyy", Locale.US)
- return list.select("li").asReversed().mapIndexedNotNull { i, li ->
- val a = li.selectFirst("a") ?: return@mapIndexedNotNull null
- val href = a.relUrl("href")
- val name = a.selectFirst("span.vol")?.text().orEmpty().ifEmpty {
- a.ownText()
- }
- MangaChapter(
- id = generateUid(href),
- url = href,
- source = MangaSource.MANGATOWN,
- number = i + 1,
- uploadDate = parseChapterDate(
- dateFormat,
- li.selectFirst("span.time")?.text()
- ),
- name = name.ifEmpty { "${manga.title} - ${i + 1}" },
- scanlator = null,
- branch = null,
- )
- }
- }
-
- private fun String.parseTagKey() = split('/').findLast { regexTag matches it }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
deleted file mode 100644
index 70c51b4cf..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.WordSet
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 12
-
-class MangareadRepository(
- loaderContext: MangaLoaderContext
-) : RemoteMangaRepository(loaderContext) {
-
- override val source = MangaSource.MANGAREAD
-
- override val defaultDomain = "www.mangaread.org"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.UPDATED,
- SortOrder.POPULARITY
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val tag = when {
- tags.isNullOrEmpty() -> null
- tags.size == 1 -> tags.first()
- else -> throw NotImplementedError("Multiple genres are not supported by this source")
- }
- val payload = createRequestTemplate()
- payload["page"] = (offset / PAGE_SIZE.toFloat()).toIntUp().toString()
- payload["vars[meta_key]"] = when (sortOrder) {
- SortOrder.POPULARITY -> "_wp_manga_views"
- SortOrder.UPDATED -> "_latest_update"
- else -> "_wp_manga_views"
- }
- payload["vars[wp-manga-genre]"] = tag?.key.orEmpty()
- payload["vars[s]"] = query.orEmpty()
- val doc = loaderContext.httpPost(
- "https://${getDomain()}/wp-admin/admin-ajax.php",
- payload
- ).parseHtml()
- return doc.select("div.row.c-tabs-item__content").map { div ->
- val href = div.selectFirst("a")?.relUrl("href")
- ?: parseFailed("Link not found")
- val summary = div.selectFirst(".tab-summary")
- Manga(
- id = generateUid(href),
- url = href,
- publicUrl = href.inContextOf(div),
- coverUrl = div.selectFirst("img")?.absUrl("data-src").orEmpty(),
- title = summary?.selectFirst("h3")?.text().orEmpty(),
- rating = div.selectFirst("span.total_votes")?.ownText()
- ?.toFloatOrNull()?.div(5f) ?: -1f,
- tags = summary?.selectFirst(".mg_genres")?.select("a")?.mapToSet { a ->
- MangaTag(
- key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
- title = a.text().toTitleCase(),
- source = MangaSource.MANGAREAD
- )
- }.orEmpty(),
- author = summary?.selectFirst(".mg_author")?.selectFirst("a")?.ownText(),
- state = when (summary?.selectFirst(".mg_status")?.selectFirst(".summary-content")
- ?.ownText()?.trim()) {
- "OnGoing" -> MangaState.ONGOING
- "Completed" -> MangaState.FINISHED
- else -> null
- },
- source = MangaSource.MANGAREAD
- )
- }
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("https://${getDomain()}/manga/").parseHtml()
- val root = doc.body().selectFirst("header")
- ?.selectFirst("ul.second-menu") ?: parseFailed("Root not found")
- return root.select("li").mapNotNullToSet { li ->
- val a = li.selectFirst("a") ?: return@mapNotNullToSet null
- val href = a.attr("href").removeSuffix("/")
- .substringAfterLast("genres/", "")
- if (href.isEmpty()) {
- return@mapNotNullToSet null
- }
- MangaTag(
- key = href,
- title = a.text().toTitleCase(),
- source = MangaSource.MANGAREAD
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val fullUrl = manga.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- val root = doc.body().selectFirst("div.profile-manga")
- ?.selectFirst("div.summary_content")
- ?.selectFirst("div.post-content")
- ?: throw ParseException("Root not found")
- val root2 = doc.body().selectFirst("div.content-area")
- ?.selectFirst("div.c-page")
- ?: throw ParseException("Root2 not found")
- val dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US)
- return manga.copy(
- tags = root.selectFirst("div.genres-content")?.select("a")
- ?.mapNotNullToSet { a ->
- MangaTag(
- key = a.attr("href").removeSuffix("/").substringAfterLast('/'),
- title = a.text().toTitleCase(),
- source = MangaSource.MANGAREAD
- )
- } ?: manga.tags,
- description = root2.selectFirst("div.description-summary")
- ?.selectFirst("div.summary__content")
- ?.select("p")
- ?.filterNot { it.ownText().startsWith("A brief description") }
- ?.joinToString { it.html() },
- chapters = root2.select("li").asReversed().mapIndexed { i, li ->
- val a = li.selectFirst("a")
- val href = a?.relUrl("href").orEmpty().ifEmpty {
- parseFailed("Link is missing")
- }
- MangaChapter(
- id = generateUid(href),
- name = a!!.ownText(),
- number = i + 1,
- url = href,
- uploadDate = parseChapterDate(
- dateFormat,
- li.selectFirst("span.chapter-release-date i")?.text()
- ),
- source = MangaSource.MANGAREAD,
- scanlator = null,
- branch = null,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- val root = doc.body().selectFirst("div.main-col-inner")
- ?.selectFirst("div.reading-content")
- ?: throw ParseException("Root not found")
- return root.select("div.page-break").map { div ->
- val img = div.selectFirst("img") ?: parseFailed("Page image not found")
- val url = img.relUrl("data-src").ifEmpty {
- img.relUrl("src")
- }
- MangaPage(
- id = generateUid(url),
- url = url,
- preview = null,
- referer = fullUrl,
- source = MangaSource.MANGAREAD,
- )
- }
- }
-
- private fun parseChapterDate(dateFormat: DateFormat, date: String?): Long {
-
- date ?: return 0
- return when {
- date.endsWith(" ago", ignoreCase = true) -> {
- parseRelativeDate(date)
- }
- // Handle translated 'ago' in Portuguese.
- date.endsWith(" atrás", ignoreCase = true) -> {
- parseRelativeDate(date)
- }
- // Handle translated 'ago' in Turkish.
- date.endsWith(" önce", ignoreCase = true) -> {
- parseRelativeDate(date)
- }
- // Handle 'yesterday' and 'today', using midnight
- date.startsWith("year", ignoreCase = true) -> {
- Calendar.getInstance().apply {
- add(Calendar.DAY_OF_MONTH, -1) // yesterday
- set(Calendar.HOUR_OF_DAY, 0)
- set(Calendar.MINUTE, 0)
- set(Calendar.SECOND, 0)
- set(Calendar.MILLISECOND, 0)
- }.timeInMillis
- }
- date.startsWith("today", ignoreCase = true) -> {
- Calendar.getInstance().apply {
- set(Calendar.HOUR_OF_DAY, 0)
- set(Calendar.MINUTE, 0)
- set(Calendar.SECOND, 0)
- set(Calendar.MILLISECOND, 0)
- }.timeInMillis
- }
- date.contains(Regex("""\d(st|nd|rd|th)""")) -> {
- // Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it
- date.split(" ").map {
- if (it.contains(Regex("""\d\D\D"""))) {
- it.replace(Regex("""\D"""), "")
- } else {
- it
- }
- }
- .let { dateFormat.tryParse(it.joinToString(" ")) }
- }
- else -> dateFormat.tryParse(date)
- }
- }
-
- // Parses dates in this form:
- // 21 hours ago
- private fun parseRelativeDate(date: String): Long {
- val number = Regex("""(\d+)""").find(date)?.value?.toIntOrNull() ?: return 0
- val cal = Calendar.getInstance()
-
- return when {
- WordSet("hari", "gün", "jour", "día", "dia", "day").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
- WordSet("jam", "saat", "heure", "hora", "hour").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
- WordSet("menit", "dakika", "min", "minute", "minuto").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
- WordSet("detik", "segundo", "second").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
- WordSet("month").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
- WordSet("year").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
- else -> 0
- }
- }
-
- private fun createRequestTemplate() =
- "action=madara_load_more&page=1&template=madara-core%2Fcontent%2Fcontent-search&vars%5Bs%5D=&vars%5Borderby%5D=meta_value_num&vars%5Bpaged%5D=1&vars%5Btemplate%5D=search&vars%5Bmeta_query%5D%5B0%5D%5Brelation%5D=AND&vars%5Bmeta_query%5D%5Brelation%5D=OR&vars%5Bpost_type%5D=wp-manga&vars%5Bpost_status%5D=publish&vars%5Bmeta_key%5D=_latest_update&vars%5Border%5D=desc&vars%5Bmanga_archives_item_layout%5D=default"
- .split('&')
- .map {
- val pos = it.indexOf('=')
- it.substring(0, pos) to it.substring(pos + 1)
- }.toMutableMap()
-}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt
deleted file mode 100644
index 18bc10626..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MintMangaRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class MintMangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
-
- override val source = MangaSource.MINTMANGA
- override val defaultDomain: String = "mintmanga.live"
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
deleted file mode 100644
index 3b94821c5..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NineMangaRepository.kt
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 26
-
-abstract class NineMangaRepository(
- loaderContext: MangaLoaderContext,
- override val source: MangaSource,
- override val defaultDomain: String,
-) : RemoteMangaRepository(loaderContext) {
-
- init {
- loaderContext.cookieJar.insertCookies(getDomain(), "ninemanga_template_desk=yes")
- }
-
- private val headers = Headers.Builder()
- .add("Accept-Language", "en-US;q=0.7,en;q=0.3")
- .build()
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.POPULARITY,
- )
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val page = (offset / PAGE_SIZE.toFloat()).toIntUp() + 1
- val url = buildString {
- append("https://")
- append(getDomain())
- when {
- !query.isNullOrEmpty() -> {
- append("/search/?name_sel=&wd=")
- append(query.urlEncoded())
- append("&page=")
- }
- !tags.isNullOrEmpty() -> {
- append("/search/?category_id=")
- for (tag in tags) {
- append(tag.key)
- append(',')
- }
- append("&page=")
- }
- else -> {
- append("/category/index_")
- }
- }
- append(page)
- append(".html")
- }
- val doc = loaderContext.httpGet(url, headers).parseHtml()
- val root = doc.body().selectFirst("ul.direlist")
- ?: throw ParseException("Cannot find root")
- val baseHost = root.baseUri().toHttpUrl().host
- return root.select("li").map { node ->
- val href = node.selectFirst("a")?.absUrl("href")
- ?: parseFailed("Link not found")
- val relUrl = href.toRelativeUrl(baseHost)
- val dd = node.selectFirst("dd")
- Manga(
- id = generateUid(relUrl),
- url = relUrl,
- publicUrl = href,
- title = dd?.selectFirst("a.bookname")?.text()?.toCamelCase().orEmpty(),
- altTitle = null,
- coverUrl = node.selectFirst("img")?.absUrl("src").orEmpty(),
- rating = Manga.NO_RATING,
- author = null,
- tags = emptySet(),
- state = null,
- source = source,
- description = dd?.selectFirst("p")?.html(),
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(
- manga.url.withDomain() + "?waring=1",
- headers
- ).parseHtml()
- val root = doc.body().selectFirst("div.manga")
- ?: throw ParseException("Cannot find root")
- val infoRoot = root.selectFirst("div.bookintro")
- ?: throw ParseException("Cannot find info")
- return manga.copy(
- tags = infoRoot.getElementsByAttributeValue("itemprop", "genre").first()
- ?.select("a")?.mapToSet { a ->
- MangaTag(
- title = a.text().toTitleCase(),
- key = a.attr("href").substringBetween("/", "."),
- source = source,
- )
- }.orEmpty(),
- author = infoRoot.getElementsByAttributeValue("itemprop", "author").first()?.text(),
- state = parseStatus(infoRoot.select("li a.red").text()),
- description = infoRoot.getElementsByAttributeValue("itemprop", "description").first()
- ?.html()?.substringAfter(""),
- chapters = root.selectFirst("div.chapterbox")?.select("ul.sub_vol_ul > li")
- ?.asReversed()?.mapIndexed { i, li ->
- val a = li.selectFirst("a.chapter_list_a")
- val href = a?.relUrl("href")?.replace("%20", " ") ?: parseFailed("Link not found")
- MangaChapter(
- id = generateUid(href),
- name = a.text(),
- number = i + 1,
- url = href,
- uploadDate = parseChapterDateByLang(li.selectFirst("span")?.text().orEmpty()),
- source = source,
- scanlator = null,
- branch = null,
- )
- }
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val doc = loaderContext.httpGet(chapter.url.withDomain(), headers).parseHtml()
- return doc.body().getElementById("page")?.select("option")?.map { option ->
- val url = option.attr("value")
- MangaPage(
- id = generateUid(url),
- url = url,
- referer = chapter.url.withDomain(),
- preview = null,
- source = source,
- )
- } ?: throw ParseException("Pages list not found at ${chapter.url}")
- }
-
- override suspend fun getPageUrl(page: MangaPage): String {
- val doc = loaderContext.httpGet(page.url.withDomain(), headers).parseHtml()
- val root = doc.body()
- return root.selectFirst("a.pic_download")?.absUrl("href")
- ?: throw ParseException("Page image not found")
- }
-
- override suspend fun getTags(): Set {
- val doc = loaderContext.httpGet("https://${getDomain()}/search/?type=high", headers)
- .parseHtml()
- val root = doc.body().getElementById("search_form")
- return root?.select("li.cate_list")?.mapNotNullToSet { li ->
- val cateId = li.attr("cate_id") ?: return@mapNotNullToSet null
- val a = li.selectFirst("a") ?: return@mapNotNullToSet null
- MangaTag(
- title = a.text().toTitleCase(),
- key = cateId,
- source = source
- )
- } ?: parseFailed("Root not found")
- }
-
- private fun parseStatus(status: String) = when {
- status.contains("Ongoing") -> MangaState.ONGOING
- status.contains("Completed") -> MangaState.FINISHED
- else -> null
- }
-
- private fun parseChapterDateByLang(date: String): Long {
- val dateWords = date.split(" ")
-
- if (dateWords.size == 3) {
- if (dateWords[1].contains(",")) {
- SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).tryParse(date)
- } else {
- val timeAgo = Integer.parseInt(dateWords[0])
- return Calendar.getInstance().apply {
- when (dateWords[1]) {
- "minutes" -> Calendar.MINUTE // EN-FR
- "hours" -> Calendar.HOUR // EN
-
- "minutos" -> Calendar.MINUTE // ES
- "horas" -> Calendar.HOUR
-
- // "minutos" -> Calendar.MINUTE // BR
- "hora" -> Calendar.HOUR
-
- "минут" -> Calendar.MINUTE // RU
- "часа" -> Calendar.HOUR
-
- "Stunden" -> Calendar.HOUR // DE
-
- "minuti" -> Calendar.MINUTE // IT
- "ore" -> Calendar.HOUR
-
- "heures" -> Calendar.HOUR // FR ("minutes" also French word)
- else -> null
- }?.let {
- add(it, -timeAgo)
- }
- }.timeInMillis
- }
- }
- return 0L
- }
-
- class English(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_EN,
- "www.ninemanga.com",
- )
-
- class Spanish(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_ES,
- "es.ninemanga.com",
- )
-
- class Russian(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_RU,
- "ru.ninemanga.com",
- )
-
- class Deutsch(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_DE,
- "de.ninemanga.com",
- )
-
- class Brazil(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_BR,
- "br.ninemanga.com",
- )
-
- class Italiano(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_IT,
- "it.ninemanga.com",
- )
-
- class Francais(loaderContext: MangaLoaderContext) : NineMangaRepository(
- loaderContext,
- MangaSource.NINEMANGA_FR,
- "fr.ninemanga.com",
- )
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt
deleted file mode 100644
index 91dc0bf59..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import android.util.SparseArray
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-class NudeMoonRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext),
- MangaRepositoryAuthProvider {
-
- override val source = MangaSource.NUDEMOON
- override val defaultDomain = "nude-moon.net"
- override val authUrl: String
- get() = "https://${getDomain()}/index.php"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.NEWEST,
- SortOrder.POPULARITY,
- SortOrder.RATING
- )
-
- private val pageUrlPatter = Pattern.compile(".*\\?page=[0-9]+$")
-
- init {
- loaderContext.cookieJar.insertCookies(
- getDomain(),
- "NMfYa=1;",
- "nm_mobile=0;"
- )
- }
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?
- ): List {
- val domain = getDomain()
- val url = when {
- !query.isNullOrEmpty() -> "https://$domain/search?stext=${query.urlEncoded()}&rowstart=$offset"
- !tags.isNullOrEmpty() -> tags.joinToString(
- separator = "_",
- prefix = "https://$domain/tags/",
- postfix = "&rowstart=$offset",
- transform = { it.key.urlEncoded() }
- )
- else -> "https://$domain/all_manga?${getSortKey(sortOrder)}&rowstart=$offset"
- }
- val doc = loaderContext.httpGet(url).parseHtml()
- val root = doc.body().run {
- selectFirst("td.main-bg") ?: selectFirst("td.main-body")
- } ?: parseFailed("Cannot find root")
- return root.select("table.news_pic2").mapNotNull { row ->
- val a = row.selectFirst("td.bg_style1")?.selectFirst("a")
- ?: return@mapNotNull null
- val href = a.relUrl("href")
- val title = a.selectFirst("h2")?.text().orEmpty()
- val info = row.selectFirst("td[width=100%]") ?: return@mapNotNull null
- Manga(
- id = generateUid(href),
- url = href,
- title = title.substringAfter(" / "),
- altTitle = title.substringBefore(" / ", "")
- .takeUnless { it.isBlank() },
- author = info.getElementsContainingOwnText("Автор:").firstOrNull()
- ?.nextElementSibling()?.ownText(),
- coverUrl = row.selectFirst("img.news_pic2")?.absUrl("data-src")
- .orEmpty(),
- tags = row.selectFirst("span.tag-links")?.select("a")
- ?.mapToSet {
- MangaTag(
- title = it.text().toTitleCase(),
- key = it.attr("href").substringAfterLast('/'),
- source = source
- )
- }.orEmpty(),
- source = source,
- publicUrl = a.absUrl("href"),
- rating = Manga.NO_RATING,
- isNsfw = true,
- description = row.selectFirst("div.description")?.html(),
- state = null,
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- val body = loaderContext.httpGet(manga.url.withDomain()).parseHtml().body()
- val root = body.selectFirst("table.shoutbox")
- ?: parseFailed("Cannot find root")
- val info = root.select("div.tbl2")
- val lastInfo = info.last()
- return manga.copy(
- largeCoverUrl = body.selectFirst("img.news_pic2")?.absUrl("src"),
- description = info.select("div.blockquote").lastOrNull()?.html() ?: manga.description,
- tags = info.select("span.tag-links").firstOrNull()?.select("a")?.mapToSet {
- MangaTag(
- title = it.text().toTitleCase(),
- key = it.attr("href").substringAfterLast('/'),
- source = source,
- )
- }?.plus(manga.tags) ?: manga.tags,
- author = lastInfo?.getElementsByAttributeValueContaining("href", "mangaka/")?.text()
- ?: manga.author,
- chapters = listOf(
- MangaChapter(
- id = manga.id,
- url = manga.url,
- source = source,
- number = 1,
- name = manga.title,
- scanlator = lastInfo?.getElementsByAttributeValueContaining("href", "perevod/")?.text(),
- uploadDate = lastInfo?.getElementsContainingOwnText("Дата:")
- ?.firstOrNull()
- ?.html()
- ?.parseDate() ?: 0L,
- branch = null,
- )
- )
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val fullUrl = chapter.url.withDomain()
- val doc = loaderContext.httpGet(fullUrl).parseHtml()
- val root = doc.body().selectFirst("td.main-body")
- ?: parseFailed("Cannot find root")
- val readlink = root.selectFirst("table.shoutbox")?.selectFirst("a")?.absUrl("href")
- ?: parseFailed("Cannot obtain read link")
- val fullPages = getFullPages(readlink)
- return root.getElementsByAttributeValueMatching("href", pageUrlPatter).mapIndexedNotNull { i, a ->
- val url = a.relUrl("href")
- MangaPage(
- id = generateUid(url),
- url = fullPages[i] ?: return@mapIndexedNotNull null,
- referer = fullUrl,
- preview = a.selectFirst("img")?.absUrl("src"),
- source = source,
- )
- }
- }
-
- override suspend fun getTags(): Set {
- val domain = getDomain()
- val doc = loaderContext.httpGet("https://$domain/all_manga").parseHtml()
- val root = doc.body().getElementsContainingOwnText("Поиск манги по тегам")
- .firstOrNull()?.parents()?.find { it.tag().normalName() == "tbody" }
- ?.selectFirst("td.textbox")?.selectFirst("td.small")
- ?: parseFailed("Tags root not found")
- return root.select("a").mapToSet {
- MangaTag(
- title = it.text().toTitleCase(),
- key = it.attr("href").substringAfterLast('/')
- .removeSuffix("+"),
- source = source,
- )
- }
- }
-
- override fun isAuthorized(): Boolean {
- return loaderContext.cookieJar.getCookies(getDomain()).any {
- it.name == "fusion_user"
- }
- }
-
- override suspend fun getUsername(): String {
- val body = loaderContext.httpGet("https://${getDomain()}/").parseHtml()
- .body()
- return body
- .getElementsContainingOwnText("Профиль")
- .firstOrNull()
- ?.attr("href")
- ?.substringAfterLast('/')
- ?: run {
- throw if (body.selectFirst("form[name=\"loginform\"]") != null) {
- AuthRequiredException(source)
- } else {
- ParseException("Cannot find username")
- }
- }
- }
-
- private suspend fun getFullPages(url: String): SparseArray {
- val scripts = loaderContext.httpGet(url).parseHtml().select("script")
- val regex = "images\\[(\\d+)].src = '([^']+)'".toRegex()
- for (script in scripts) {
- val src = script.html()
- if (src.isEmpty()) {
- continue
- }
- val matches = regex.findAll(src).toList()
- if (matches.isEmpty()) {
- continue
- }
- val result = SparseArray(matches.size)
- matches.forEach { match ->
- val (index, link) = match.destructured
- result.append(index.toInt(), link)
- }
- return result
- }
- parseFailed("Cannot find pages list")
- }
-
- private fun getSortKey(sortOrder: SortOrder?) =
- when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
- SortOrder.POPULARITY -> "views"
- SortOrder.NEWEST -> "date"
- SortOrder.RATING -> "like"
- else -> "like"
- }
-
- private fun String.parseDate(): Long {
- val dateString = substringBetweenFirst("Дата:", "<")?.trim() ?: return 0
- val dateFormat = SimpleDateFormat("d MMMM yyyy", Locale("ru"))
- return dateFormat.tryParse(dateString)
- }
-}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt
deleted file mode 100644
index ab95903d5..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class ReadmangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
-
- override val defaultDomain = "readmanga.io"
- override val source = MangaSource.READMANGA_RU
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
deleted file mode 100644
index e98442148..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/RemangaRepository.kt
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import okhttp3.Headers
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.*
-import org.koitharu.kotatsu.core.parser.MangaRepositoryAuthProvider
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
-import org.koitharu.kotatsu.utils.ext.*
-import java.net.URLDecoder
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-private const val PAGE_SIZE = 30
-private const val STATUS_ONGOING = 1
-private const val STATUS_FINISHED = 0
-
-class RemangaRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext),
- MangaRepositoryAuthProvider {
-
- override val source = MangaSource.REMANGA
-
- override val defaultDomain = "remanga.org"
- override val authUrl: String
- get() = "https://${getDomain()}/user/login"
-
- override val sortOrders: Set = EnumSet.of(
- SortOrder.UPDATED,
- SortOrder.POPULARITY,
- SortOrder.RATING,
- SortOrder.NEWEST
- )
-
- private val regexLastUrlPath = Regex("/[^/]+/?$")
-
- override suspend fun getList2(
- offset: Int,
- query: String?,
- tags: Set?,
- sortOrder: SortOrder?,
- ): List {
- copyCookies()
- val domain = getDomain()
- val urlBuilder = StringBuilder()
- .append("https://api.")
- .append(domain)
- if (query != null) {
- urlBuilder.append("/api/search/?query=")
- .append(query.urlEncoded())
- } else {
- urlBuilder.append("/api/search/catalog/?ordering=")
- .append(getSortKey(sortOrder))
- tags?.forEach { tag ->
- urlBuilder.append("&genres=")
- urlBuilder.append(tag.key)
- }
- }
- urlBuilder
- .append("&page=")
- .append((offset / PAGE_SIZE) + 1)
- .append("&count=")
- .append(PAGE_SIZE)
- val content = loaderContext.httpGet(urlBuilder.toString(), getApiHeaders()).parseJson()
- .getJSONArray("content")
- return content.map { jo ->
- val url = "/manga/${jo.getString("dir")}"
- val img = jo.getJSONObject("img")
- Manga(
- id = generateUid(url),
- url = url,
- publicUrl = "https://$domain$url",
- title = jo.getString("rus_name"),
- altTitle = jo.getString("en_name"),
- rating = jo.getString("avg_rating").toFloatOrNull()?.div(10f) ?: Manga.NO_RATING,
- coverUrl = "https://api.$domain${img.getString("mid")}",
- largeCoverUrl = "https://api.$domain${img.getString("high")}",
- author = null,
- tags = jo.optJSONArray("genres")?.mapToSet { g ->
- MangaTag(
- title = g.getString("name").toTitleCase(),
- key = g.getInt("id").toString(),
- source = MangaSource.REMANGA
- )
- }.orEmpty(),
- source = MangaSource.REMANGA
- )
- }
- }
-
- override suspend fun getDetails(manga: Manga): Manga {
- copyCookies()
- val domain = getDomain()
- val slug = manga.url.find(regexLastUrlPath)
- ?: throw ParseException("Cannot obtain slug from ${manga.url}")
- val data = loaderContext.httpGet(
- url = "https://api.$domain/api/titles/$slug/",
- headers = getApiHeaders(),
- ).parseJson()
- val content = try {
- data.getJSONObject("content")
- } catch (e: JSONException) {
- throw ParseException(data.optString("msg"), e)
- }
- val branchId = content.getJSONArray("branches").optJSONObject(0)
- ?.getLong("id") ?: throw ParseException("No branches found")
- val chapters = grabChapters(domain, branchId)
- val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
- return manga.copy(
- description = content.getString("description"),
- state = when (content.optJSONObject("status")?.getInt("id")) {
- STATUS_ONGOING -> MangaState.ONGOING
- STATUS_FINISHED -> MangaState.FINISHED
- else -> null
- },
- tags = content.getJSONArray("genres").mapToSet { g ->
- MangaTag(
- title = g.getString("name").toTitleCase(),
- key = g.getInt("id").toString(),
- source = MangaSource.REMANGA
- )
- },
- chapters = chapters.mapIndexed { i, jo ->
- val id = jo.getLong("id")
- val name = jo.getString("name").toTitleCase(Locale.ROOT)
- val publishers = jo.optJSONArray("publishers")
- MangaChapter(
- id = generateUid(id),
- url = "/api/titles/chapters/$id/",
- number = chapters.size - i,
- name = buildString {
- append("Том ")
- append(jo.optString("tome", "0"))
- append(". ")
- append("Глава ")
- append(jo.optString("chapter", "0"))
- if (name.isNotEmpty()) {
- append(" - ")
- append(name)
- }
- },
- uploadDate = dateFormat.tryParse(jo.getString("upload_date")),
- scanlator = publishers?.optJSONObject(0)?.getStringOrNull("name"),
- source = MangaSource.REMANGA,
- branch = null,
- )
- }.asReversed()
- )
- }
-
- override suspend fun getPages(chapter: MangaChapter): List {
- val referer = "https://${getDomain()}/"
- val content = loaderContext.httpGet(chapter.url.withDomain(subdomain = "api"), getApiHeaders()).parseJson()
- .getJSONObject("content")
- val pages = content.optJSONArray("pages")
- if (pages == null) {
- val pubDate = content.getStringOrNull("pub_date")?.let {
- SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US).tryParse(it)
- }
- if (pubDate != null && pubDate > System.currentTimeMillis()) {
- val at = SimpleDateFormat.getDateInstance(DateFormat.LONG).format(Date(pubDate))
- parseFailed("Глава станет доступной $at")
- } else {
- parseFailed("Глава недоступна")
- }
- }
- val result = ArrayList(pages.length())
- for (i in 0 until pages.length()) {
- when (val item = pages.get(i)) {
- is JSONObject -> result += parsePage(item, referer)
- is JSONArray -> item.mapTo(result) { parsePage(it, referer) }
- else -> throw ParseException("Unknown json item $item")
- }
- }
- return result
- }
-
- override suspend fun getTags(): Set {
- val domain = getDomain()
- val content = loaderContext.httpGet("https://api.$domain/api/forms/titles/?get=genres", getApiHeaders())
- .parseJson().getJSONObject("content").getJSONArray("genres")
- return content.mapToSet { jo ->
- MangaTag(
- title = jo.getString("name").toTitleCase(),
- key = jo.getInt("id").toString(),
- source = source
- )
- }
- }
-
- override fun isAuthorized(): Boolean {
- return loaderContext.cookieJar.getCookies(getDomain()).any {
- it.name == "user"
- }
- }
-
- override suspend fun getUsername(): String {
- val jo = loaderContext.httpGet(
- url = "https://api.${getDomain()}/api/users/current/",
- headers = getApiHeaders(),
- ).parseJson()
- return jo.getJSONObject("content").getString("username")
- }
-
- private fun getApiHeaders(): Headers? {
- val userCookie = loaderContext.cookieJar.getCookies(getDomain()).find {
- it.name == "user"
- } ?: return null
- val jo = JSONObject(URLDecoder.decode(userCookie.value, Charsets.UTF_8.name()))
- val accessToken = jo.getStringOrNull("access_token") ?: return null
- return Headers.headersOf("authorization", "bearer $accessToken")
- }
-
- private fun copyCookies() {
- val domain = getDomain()
- loaderContext.cookieJar.copyCookies(domain, "api.$domain")
- }
-
- private fun getSortKey(order: SortOrder?) = when (order) {
- SortOrder.UPDATED -> "-chapter_date"
- SortOrder.POPULARITY -> "-rating"
- SortOrder.RATING -> "-votes"
- SortOrder.NEWEST -> "-id"
- else -> "-chapter_date"
- }
-
- private fun parsePage(jo: JSONObject, referer: String) = MangaPage(
- id = generateUid(jo.getLong("id")),
- url = jo.getString("link"),
- preview = null,
- referer = referer,
- source = source,
- )
-
- private suspend fun grabChapters(domain: String, branchId: Long): List {
- val result = ArrayList(100)
- var page = 1
- while (true) {
- val content = loaderContext.httpGet(
- url = "https://api.$domain/api/titles/chapters/?branch_id=$branchId&page=$page&count=100",
- headers = getApiHeaders(),
- ).parseJson().getJSONArray("content")
- val len = content.length()
- if (len == 0) {
- break
- }
- result.ensureCapacity(result.size + len)
- for (i in 0 until len) {
- result.add(content.getJSONObject(i))
- }
- page++
- }
- return result
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt
deleted file mode 100644
index f83877f81..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.model.MangaSource
-
-class SelfMangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
-
- override val defaultDomain = "selfmanga.live"
- override val source = MangaSource.SELFMANGA
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt
deleted file mode 100644
index 77edbb5b1..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/YaoiChanRepository.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.parser.site
-
-import org.koitharu.kotatsu.base.domain.MangaLoaderContext
-import org.koitharu.kotatsu.core.exceptions.ParseException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.utils.ext.parseHtml
-import org.koitharu.kotatsu.utils.ext.relUrl
-
-class YaoiChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
-
- override val source = MangaSource.YAOICHAN
- override val defaultDomain = "yaoi-chan.me"
-
- override suspend fun getDetails(manga: Manga): Manga {
- val doc = loaderContext.httpGet(manga.url.withDomain()).parseHtml()
- val root =
- doc.body().getElementById("dle-content") ?: throw ParseException("Cannot find root")
- return manga.copy(
- description = root.getElementById("description")?.html()?.substringBeforeLast("
- table.select("div.manga")
- }.mapNotNull { it.selectFirst("a") }.reversed().mapIndexed { i, a ->
- val href = a.relUrl("href")
- MangaChapter(
- id = generateUid(href),
- name = a.text().trim(),
- number = i + 1,
- url = href,
- uploadDate = 0L,
- source = source,
- scanlator = null,
- branch = null,
- )
- }
- )
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 4c1768438..8583a7adc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -14,8 +14,10 @@ import com.google.android.material.color.DynamicColors
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.channels.trySendBlocking
import kotlinx.coroutines.flow.callbackFlow
-import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.core.model.ZoomMode
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.utils.ext.getEnumValue
+import org.koitharu.kotatsu.utils.ext.putEnumValue
import org.koitharu.kotatsu.utils.ext.toUriOrNull
import java.io.File
import java.text.DateFormat
@@ -27,12 +29,12 @@ class AppSettings(context: Context) {
private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
var listMode: ListMode
- get() = prefs.getString(KEY_LIST_MODE, null)?.findEnumValue(ListMode.values()) ?: ListMode.DETAILED_LIST
- set(value) = prefs.edit { putString(KEY_LIST_MODE, value.name) }
+ get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.DETAILED_LIST)
+ set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }
var defaultSection: AppSection
- get() = prefs.getString(KEY_APP_SECTION, null)?.findEnumValue(AppSection.values()) ?: AppSection.HISTORY
- set(value) = prefs.edit { putString(KEY_APP_SECTION, value.name) }
+ get() = prefs.getEnumValue(KEY_APP_SECTION, AppSection.HISTORY)
+ set(value) = prefs.edit { putEnumValue(KEY_APP_SECTION, value) }
val theme: Int
get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
@@ -43,9 +45,6 @@ class AppSettings(context: Context) {
val isAmoledTheme: Boolean
get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
- val isToolbarHideWhenScrolling: Boolean
- get() = prefs.getBoolean(KEY_HIDE_TOOLBAR, true)
-
var gridSize: Int
get() = prefs.getInt(KEY_GRID_SIZE, 100)
set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
@@ -96,7 +95,7 @@ class AppSettings(context: Context) {
set(value) = prefs.edit { putBoolean(KEY_REVERSE_CHAPTERS, value) }
val zoomMode: ZoomMode
- get() = prefs.getString(KEY_ZOOM_MODE, null)?.findEnumValue(ZoomMode.values()) ?: ZoomMode.FIT_CENTER
+ get() = prefs.getEnumValue(KEY_ZOOM_MODE, ZoomMode.FIT_CENTER)
val trackSources: Set
get() = prefs.getStringSet(KEY_TRACK_SOURCES, null) ?: arraySetOf(TRACK_FAVOURITES, TRACK_HISTORY)
@@ -148,6 +147,10 @@ class AppSettings(context: Context) {
val isSuggestionsExcludeNsfw: Boolean
get() = prefs.getBoolean(KEY_SUGGESTIONS_EXCLUDE_NSFW, false)
+ var isSearchSingleSource: Boolean
+ get() = prefs.getBoolean(KEY_SEARCH_SINGLE_SOURCE, false)
+ set(value) = prefs.edit { putBoolean(KEY_SEARCH_SINGLE_SOURCE, value) }
+
fun isPagesPreloadAllowed(cm: ConnectivityManager): Boolean {
return when (prefs.getString(KEY_PAGES_PRELOAD, null)?.toIntOrNull()) {
NETWORK_ALWAYS -> true
@@ -162,6 +165,18 @@ class AppSettings(context: Context) {
else -> SimpleDateFormat(format, Locale.getDefault())
}
+ fun getSuggestionsTagsBlacklistRegex(): Regex? {
+ val string = prefs.getString(KEY_SUGGESTIONS_EXCLUDE_TAGS, null)?.trimEnd(' ', ',')
+ if (string.isNullOrEmpty()) {
+ return null
+ }
+ val tags = string.split(',')
+ val regex = tags.joinToString(prefix = "(", separator = "|", postfix = ")") { tag ->
+ Regex.escape(tag.trim())
+ }
+ return Regex(regex, RegexOption.IGNORE_CASE)
+ }
+
fun getMangaSources(includeHidden: Boolean): List {
val list = MangaSource.values().toMutableList()
list.remove(MangaSource.LOCAL)
@@ -195,10 +210,6 @@ class AppSettings(context: Context) {
}
}
- private fun > String.findEnumValue(values: Array): E? {
- return values.find { it.name == this }
- }
-
companion object {
const val PAGE_SWITCH_TAPS = "taps"
@@ -213,7 +224,6 @@ class AppSettings(context: Context) {
const val KEY_DYNAMIC_THEME = "dynamic_theme"
const val KEY_THEME_AMOLED = "amoled_theme"
const val KEY_DATE_FORMAT = "date_format"
- const val KEY_HIDE_TOOLBAR = "hide_toolbar"
const val KEY_SOURCES_ORDER = "sources_order"
const val KEY_SOURCES_HIDDEN = "sources_hidden"
const val KEY_TRAFFIC_WARNING = "traffic_warning"
@@ -249,17 +259,17 @@ class AppSettings(context: Context) {
const val KEY_PAGES_PRELOAD = "pages_preload"
const val KEY_SUGGESTIONS = "suggestions"
const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
+ const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
+ const val KEY_SEARCH_SINGLE_SOURCE = "search_single_source"
const val KEY_SHIKIMORI = "shikimori"
// About
const val KEY_APP_UPDATE = "app_update"
const val KEY_APP_UPDATE_AUTO = "app_update_auto"
const val KEY_APP_TRANSLATION = "about_app_translation"
- const val KEY_APP_GRATITUDES = "about_gratitudes"
const val KEY_FEEDBACK_4PDA = "about_feedback_4pda"
const val KEY_FEEDBACK_DISCORD = "about_feedback_discord"
const val KEY_FEEDBACK_GITHUB = "about_feedback_github"
- const val KEY_SUPPORT_DEVELOPER = "about_support_developer"
private const val NETWORK_NEVER = 0
private const val NETWORK_ALWAYS = 1
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
index 7a6036d06..ea14c7342 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
@@ -1,32 +1,29 @@
package org.koitharu.kotatsu.core.prefs
import android.content.Context
-import org.koitharu.kotatsu.core.model.MangaSource
+import androidx.core.content.edit
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.ext.getEnumValue
+import org.koitharu.kotatsu.utils.ext.ifNullOrEmpty
+import org.koitharu.kotatsu.utils.ext.putEnumValue
-interface SourceSettings {
+private const val KEY_SORT_ORDER = "sort_order"
- fun getDomain(defaultValue: String): String
+class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig {
- fun isUseSsl(defaultValue: Boolean): Boolean
+ private val prefs = context.getSharedPreferences(source.name, Context.MODE_PRIVATE)
- private class PrefSourceSettings(context: Context, source: MangaSource) : SourceSettings {
+ var defaultSortOrder: SortOrder?
+ get() = prefs.getEnumValue(KEY_SORT_ORDER, SortOrder::class.java)
+ set(value) = prefs.edit { putEnumValue(KEY_SORT_ORDER, value) }
- private val prefs = context.getSharedPreferences(source.name, Context.MODE_PRIVATE)
-
- override fun getDomain(defaultValue: String) = prefs.getString(KEY_DOMAIN, defaultValue)
- ?.takeUnless(String::isBlank)
- ?: defaultValue
-
- override fun isUseSsl(defaultValue: Boolean) = prefs.getBoolean(KEY_USE_SSL, defaultValue)
- }
-
- companion object {
-
- operator fun invoke(context: Context, source: MangaSource): SourceSettings =
- PrefSourceSettings(context, source)
-
- const val KEY_DOMAIN = "domain"
- const val KEY_USE_SSL = "ssl"
- const val KEY_AUTH = "auth"
+ @Suppress("UNCHECKED_CAST")
+ override fun get(key: ConfigKey): T {
+ return when (key) {
+ is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
+ } as T
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt
index 002b8b05e..20a7bf0c3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/AppCrashHandler.kt
@@ -3,20 +3,12 @@ package org.koitharu.kotatsu.core.ui
import android.content.Context
import android.content.Intent
import android.util.Log
-import java.io.PrintWriter
-import java.io.StringWriter
import kotlin.system.exitProcess
class AppCrashHandler(private val applicationContext: Context) : Thread.UncaughtExceptionHandler {
override fun uncaughtException(t: Thread, e: Throwable) {
- val crashInfo = buildString {
- val writer = StringWriter()
- e.printStackTrace(PrintWriter(writer))
- append(writer.toString().trimIndent())
- }
- val intent = Intent(applicationContext, CrashActivity::class.java)
- intent.putExtra(Intent.EXTRA_TEXT, crashInfo)
+ val intent = CrashActivity.newIntent(applicationContext, e)
intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
try {
applicationContext.startActivity(intent)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt
index 4ea8222bf..7d4d31878 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/CrashActivity.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.ui
import android.app.Activity
import android.content.ActivityNotFoundException
+import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@@ -11,6 +12,7 @@ import android.view.View
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.databinding.ActivityCrashBinding
import org.koitharu.kotatsu.main.ui.MainActivity
+import org.koitharu.kotatsu.parsers.util.ellipsize
import org.koitharu.kotatsu.utils.ShareHelper
class CrashActivity : Activity(), View.OnClickListener {
@@ -63,4 +65,19 @@ class CrashActivity : Activity(), View.OnClickListener {
}
}
}
+
+ companion object {
+
+ private const val MAX_TRACE_SIZE = 131071
+
+ fun newIntent(context: Context, error: Throwable): Intent {
+ val crashInfo = error
+ .stackTraceToString()
+ .trimIndent()
+ .ellipsize(MAX_TRACE_SIZE)
+ val intent = Intent(context, CrashActivity::class.java)
+ intent.putExtra(Intent.EXTRA_TEXT, crashInfo)
+ return intent
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt
new file mode 100644
index 000000000..92b9fd9ef
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/SortOrder.kt
@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.core.ui
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.model.SortOrder
+
+@get:StringRes
+val SortOrder.titleRes: Int
+ get() = when (this) {
+ SortOrder.UPDATED -> R.string.updated
+ SortOrder.POPULARITY -> R.string.popular
+ SortOrder.RATING -> R.string.by_rating
+ SortOrder.NEWEST -> R.string.newest
+ SortOrder.ALPHABETICAL -> R.string.by_name
+ }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
index 060e748ac..26ccbf44a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
@@ -12,11 +12,14 @@ import org.koitharu.kotatsu.local.data.CbzFetcher
val uiModule
get() = module {
single {
- val httpClient = get().newBuilder()
- .cache(CoilUtils.createDefaultCache(androidContext()))
- .build()
+ val httpClientFactory = {
+ get().newBuilder()
+ .cache(CoilUtils.createDefaultCache(androidContext()))
+ .build()
+ }
ImageLoader.Builder(androidContext())
- .okHttpClient(httpClient)
+ .okHttpClient(httpClientFactory)
+ .launchInterceptorChainOnMainThread(false)
.componentRegistry(
ComponentRegistry.Builder()
.add(CbzFetcher())
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index 6ea44a8ac..96f369c56 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -4,31 +4,37 @@ import android.app.ActivityOptions
import android.os.Bundle
import android.view.*
import android.widget.AdapterView
+import android.widget.Spinner
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.SearchView
import androidx.core.graphics.Insets
+import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.divider.MaterialDividerItemDecoration
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseFragment
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
import org.koitharu.kotatsu.details.ui.model.ChapterListItem
import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.reader.ui.ReaderActivity
import org.koitharu.kotatsu.reader.ui.ReaderState
+import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
+import kotlin.math.roundToInt
-class ChaptersFragment : BaseFragment(),
+class ChaptersFragment :
+ BaseFragment(),
OnListItemClickListener,
ActionMode.Callback,
- AdapterView.OnItemSelectedListener {
+ AdapterView.OnItemSelectedListener,
+ MenuItem.OnActionExpandListener,
+ SearchView.OnQueryTextListener {
private val viewModel by sharedViewModel()
@@ -51,46 +57,44 @@ class ChaptersFragment : BaseFragment(),
chaptersAdapter = ChaptersAdapter(this)
selectionDecoration = ChaptersSelectionDecoration(view.context)
with(binding.recyclerViewChapters) {
- addItemDecoration(MaterialDividerItemDecoration(view.context, RecyclerView.VERTICAL))
addItemDecoration(selectionDecoration!!)
setHasFixedSize(true)
adapter = chaptersAdapter
}
- val branchesAdapter = BranchesAdapter()
- binding.spinnerBranches.adapter = branchesAdapter
- binding.spinnerBranches.onItemSelectedListener = this
-
+ binding.spinnerBranches?.let(::initSpinner)
viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
- viewModel.branches.observe(viewLifecycleOwner) {
- branchesAdapter.setItems(it)
- binding.spinnerBranches.isVisible = it.size > 1
- }
- viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
- if (it != -1 && it != binding.spinnerBranches.selectedItemPosition) {
- binding.spinnerBranches.setSelection(it)
- }
- }
viewModel.isChaptersReversed.observe(viewLifecycleOwner) {
activity?.invalidateOptionsMenu()
}
+ viewModel.hasChapters.observe(viewLifecycleOwner) {
+ binding.textViewHolder.isGone = it
+ activity?.invalidateOptionsMenu()
+ }
}
override fun onDestroyView() {
chaptersAdapter = null
selectionDecoration = null
- binding.spinnerBranches.adapter = null
+ binding.spinnerBranches?.adapter = null
super.onDestroyView()
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
super.onCreateOptionsMenu(menu, inflater)
inflater.inflate(R.menu.opt_chapters, menu)
+ val searchMenuItem = menu.findItem(R.id.action_search)
+ searchMenuItem.setOnActionExpandListener(this)
+ val searchView = searchMenuItem.actionView as SearchView
+ searchView.setOnQueryTextListener(this)
+ searchView.setIconifiedByDefault(false)
+ searchView.queryHint = searchMenuItem.title
}
override fun onPrepareOptionsMenu(menu: Menu) {
super.onPrepareOptionsMenu(menu)
menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
+ menu.findItem(R.id.action_search).isVisible = viewModel.hasChapters.value == true
}
override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
@@ -125,10 +129,11 @@ class ChaptersFragment : BaseFragment(),
)
startActivity(
ReaderActivity.newIntent(
- view.context,
- viewModel.manga.value ?: return,
- ReaderState(item.chapter.id, 0, 0)
- ), options.toBundle()
+ context = view.context,
+ manga = viewModel.manga.value ?: return,
+ state = ReaderState(item.chapter.id, 0, 0),
+ ),
+ options.toBundle()
)
}
@@ -166,15 +171,14 @@ class ChaptersFragment : BaseFragment(),
}
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
- viewModel.setSelectedBranch(binding.spinnerBranches.selectedItem as String?)
+ val spinner = binding.spinnerBranches ?: return
+ viewModel.setSelectedBranch(spinner.selectedItem as String?)
}
override fun onNothingSelected(parent: AdapterView<*>?) = Unit
override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
- val manga = viewModel.manga.value
mode.menuInflater.inflate(R.menu.mode_chapters, menu)
- mode.title = manga?.title
return true
}
@@ -184,12 +188,7 @@ class ChaptersFragment : BaseFragment(),
menu.findItem(R.id.action_save).isVisible = items.none { x ->
x.chapter.source == MangaSource.LOCAL
}
- mode.subtitle = resources.getQuantityString(
- R.plurals.chapters_from_x,
- items.size,
- items.size,
- chaptersAdapter?.itemCount ?: 0
- )
+ mode.title = items.size.toString()
return true
}
@@ -199,16 +198,55 @@ class ChaptersFragment : BaseFragment(),
actionMode = null
}
+ override fun onMenuItemActionExpand(item: MenuItem?): Boolean = true
+
+ override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+ (item?.actionView as? SearchView)?.setQuery("", false)
+ viewModel.performChapterSearch(null)
+ return true
+ }
+
+ override fun onQueryTextSubmit(query: String?): Boolean = false
+
+ override fun onQueryTextChange(newText: String?): Boolean {
+ viewModel.performChapterSearch(newText)
+ return true
+ }
+
override fun onWindowInsetsChanged(insets: Insets) {
binding.recyclerViewChapters.updatePadding(
- left = insets.left,
- right = insets.right,
- bottom = insets.bottom + binding.spinnerBranches.height
+ bottom = insets.bottom + (binding.spinnerBranches?.height ?: 0),
)
}
+ private fun initSpinner(spinner: Spinner) {
+ val branchesAdapter = BranchesAdapter()
+ spinner.adapter = branchesAdapter
+ spinner.onItemSelectedListener = this
+ viewModel.branches.observe(viewLifecycleOwner) {
+ branchesAdapter.setItems(it)
+ spinner.isVisible = it.size > 1
+ }
+ viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
+ if (it != -1 && it != spinner.selectedItemPosition) {
+ spinner.setSelection(it)
+ }
+ }
+ }
+
private fun onChaptersChanged(list: List) {
- chaptersAdapter?.items = list
+ val adapter = chaptersAdapter ?: return
+ if (adapter.itemCount == 0) {
+ val position = list.indexOfFirst { it.hasFlag(ChapterListItem.FLAG_CURRENT) } - 1
+ if (position > 0) {
+ val offset = (resources.getDimensionPixelSize(R.dimen.chapter_list_item_height) * 0.6).roundToInt()
+ adapter.setItems(list, RecyclerViewScrollCallback(binding.recyclerViewChapters, position, offset))
+ } else {
+ adapter.items = list
+ }
+ } else {
+ adapter.items = list
+ }
}
private fun onLoadingStateChanged(isLoading: Boolean) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index d8cb87ecf..ef427f091 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -1,66 +1,92 @@
package org.koitharu.kotatsu.details.ui
+import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import android.net.Uri
+import android.content.IntentFilter
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
+import android.view.View
import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.Spinner
import android.widget.Toast
import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.Toolbar
import androidx.core.content.pm.ShortcutManagerCompat
import androidx.core.graphics.Insets
import androidx.core.net.toFile
+import androidx.core.net.toUri
+import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
import androidx.lifecycle.lifecycleScope
import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
import kotlinx.coroutines.launch
import org.koin.android.ext.android.get
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
-import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.base.ui.BaseActivity
import org.koitharu.kotatsu.browser.BrowserActivity
-import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
-import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
import org.koitharu.kotatsu.core.os.ShortcutsRepository
import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
+import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.reader.ui.ReaderActivity
import org.koitharu.kotatsu.reader.ui.ReaderState
import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
import org.koitharu.kotatsu.utils.ShareHelper
-import org.koitharu.kotatsu.utils.ext.buildAlertDialog
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
-class DetailsActivity : BaseActivity(),
- TabLayoutMediator.TabConfigurationStrategy {
+class DetailsActivity : BaseActivity(), TabLayoutMediator.TabConfigurationStrategy,
+ AdapterView.OnItemSelectedListener {
private val viewModel by viewModel {
parametersOf(MangaIntent(intent))
}
+ private val downloadReceiver = object : BroadcastReceiver() {
+ override fun onReceive(context: Context?, intent: Intent?) {
+ val downloadedManga = DownloadService.getDownloadedManga(intent) ?: return
+ viewModel.onDownloadComplete(downloadedManga)
+ }
+ }
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(ActivityDetailsBinding.inflate(layoutInflater))
- supportActionBar?.setDisplayHomeAsUpEnabled(true)
- binding.pager.adapter = MangaDetailsAdapter(this)
- TabLayoutMediator(binding.tabs, binding.pager, this).attach()
+ supportActionBar?.run {
+ setDisplayHomeAsUpEnabled(true)
+ setDisplayShowTitleEnabled(false)
+ }
+ val pager = binding.pager
+ if (pager != null) {
+ pager.adapter = MangaDetailsAdapter(this)
+ TabLayoutMediator(checkNotNull(binding.tabs), pager, this).attach()
+ }
+ gcFragments()
+ binding.spinnerBranches?.let(::initSpinner)
viewModel.manga.observe(this, ::onMangaUpdated)
viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
viewModel.onError.observe(this, ::onError)
+
+ registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
+ }
+
+ override fun onDestroy() {
+ unregisterReceiver(downloadReceiver)
+ super.onDestroy()
}
private fun onMangaUpdated(manga: Manga) {
@@ -78,9 +104,8 @@ class DetailsActivity : BaseActivity(),
private fun onError(e: Throwable) {
when {
- e is CloudFlareProtectedException -> {
- CloudFlareDialog.newInstance(e.url)
- .show(supportFragmentManager, CloudFlareDialog.TAG)
+ ExceptionResolver.canResolve(e) -> {
+ resolveError(e)
}
viewModel.manga.value == null -> {
Toast.makeText(this, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
@@ -96,25 +121,17 @@ class DetailsActivity : BaseActivity(),
binding.snackbar.updatePadding(
bottom = insets.bottom
)
- with(binding.toolbar) {
- updatePadding(
- left = insets.left,
- right = insets.right
- )
- updateLayoutParams {
- topMargin = insets.top
- }
- }
- if (binding.tabs.parent !is Toolbar) {
- binding.tabs.updatePadding(
- left = insets.left,
- right = insets.right
- )
+ binding.toolbar.updateLayoutParams {
+ topMargin = insets.top
}
+ binding.root.updatePadding(
+ left = insets.left,
+ right = insets.right
+ )
}
private fun onNewChaptersChanged(newChapters: Int) {
- val tab = binding.tabs.getTabAt(1) ?: return
+ val tab = binding.tabs?.getTabAt(1) ?: return
if (newChapters == 0) {
tab.removeBadge()
} else {
@@ -146,7 +163,7 @@ class DetailsActivity : BaseActivity(),
R.id.action_share -> {
viewModel.manga.value?.let {
if (it.source == MangaSource.LOCAL) {
- ShareHelper(this).shareCbz(Uri.parse(it.url).toFile())
+ ShareHelper(this).shareCbz(listOf(it.url.toUri().toFile()))
} else {
ShareHelper(this).shareMangaLink(it)
}
@@ -208,11 +225,7 @@ class DetailsActivity : BaseActivity(),
viewModel.manga.value?.let {
lifecycleScope.launch {
if (!get().requestPinShortcut(it)) {
- Snackbar.make(
- binding.pager,
- R.string.operation_not_supported,
- Snackbar.LENGTH_SHORT
- ).show()
+ binding.snackbar.show(getString(R.string.operation_not_supported))
}
}
}
@@ -231,31 +244,37 @@ class DetailsActivity : BaseActivity(),
override fun onSupportActionModeStarted(mode: ActionMode) {
super.onSupportActionModeStarted(mode)
- binding.pager.isUserInputEnabled = false
+ binding.pager?.isUserInputEnabled = false
}
override fun onSupportActionModeFinished(mode: ActionMode) {
super.onSupportActionModeFinished(mode)
- binding.pager.isUserInputEnabled = true
+ binding.pager?.isUserInputEnabled = true
}
+ override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+ val spinner = binding.spinnerBranches ?: return
+ viewModel.setSelectedBranch(spinner.selectedItem as String?)
+ }
+
+ override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+
fun showChapterMissingDialog(chapterId: Long) {
val remoteManga = viewModel.getRemoteManga()
if (remoteManga == null) {
- Snackbar.make(binding.pager, R.string.chapter_is_missing, Snackbar.LENGTH_LONG)
- .show()
+ binding.snackbar.show(getString( R.string.chapter_is_missing))
return
}
- buildAlertDialog(this) {
+ MaterialAlertDialogBuilder(this).apply {
setMessage(R.string.chapter_is_missing_text)
setTitle(R.string.chapter_is_missing)
setNegativeButton(android.R.string.cancel, null)
setPositiveButton(R.string.read) { _, _ ->
startActivity(
ReaderActivity.newIntent(
- this@DetailsActivity,
- remoteManga,
- ReaderState(chapterId, 0, 0)
+ context = this@DetailsActivity,
+ manga = remoteManga,
+ state = ReaderState(chapterId, 0, 0)
)
)
}
@@ -266,13 +285,54 @@ class DetailsActivity : BaseActivity(),
}.show()
}
- companion object {
+ private fun initSpinner(spinner: Spinner) {
+ val branchesAdapter = BranchesAdapter()
+ spinner.adapter = branchesAdapter
+ spinner.onItemSelectedListener = this
+ viewModel.branches.observe(this) {
+ branchesAdapter.setItems(it)
+ spinner.isVisible = it.size > 1
+ }
+ viewModel.selectedBranchIndex.observe(this) {
+ if (it != -1 && it != spinner.selectedItemPosition) {
+ spinner.setSelection(it)
+ }
+ }
+ }
- const val ACTION_MANGA_VIEW = "${BuildConfig.APPLICATION_ID}.action.VIEW_MANGA"
+ private fun resolveError(e: Throwable) {
+ lifecycleScope.launch {
+ if (exceptionResolver.resolve(e)) {
+ viewModel.reload()
+ } else if (viewModel.manga.value == null) {
+ Toast.makeText(this@DetailsActivity, e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
+ finishAfterTransition()
+ }
+ }
+ }
+
+ private fun gcFragments() {
+ val mustHaveId = binding.pager == null
+ val fm = supportFragmentManager
+ val fragmentsToRemove = fm.fragments.filter { f ->
+ (f.id == 0) == mustHaveId
+ }
+ if (fragmentsToRemove.isEmpty()) {
+ return
+ }
+ fm.commit {
+ setReorderingAllowed(true)
+ for (f in fragmentsToRemove) {
+ remove(f)
+ }
+ }
+ }
+
+ companion object {
fun newIntent(context: Context, manga: Manga): Intent {
return Intent(context, DetailsActivity::class.java)
- .putExtra(MangaIntent.KEY_MANGA, manga)
+ .putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
}
fun newIntent(context: Context, mangaId: Long): Intent {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index 98425c798..ab4ae21e1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -4,10 +4,8 @@ import android.app.ActivityOptions
import android.os.Bundle
import android.text.Spanned
import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
+import android.view.*
+import androidx.core.content.ContextCompat
import androidx.core.graphics.Insets
import androidx.core.net.toUri
import androidx.core.text.parseAsHtml
@@ -16,31 +14,42 @@ import androidx.core.view.updatePadding
import coil.ImageLoader
import coil.request.ImageRequest
import coil.util.CoilUtils
+import com.google.android.material.chip.Chip
import kotlinx.coroutines.launch
import org.koin.android.ext.android.inject
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseFragment
import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaState
import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesDialog
import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+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.reader.ui.ReaderActivity
import org.koitharu.kotatsu.reader.ui.ReaderState
+import org.koitharu.kotatsu.search.ui.MangaListActivity
import org.koitharu.kotatsu.search.ui.SearchActivity
import org.koitharu.kotatsu.utils.FileSize
import org.koitharu.kotatsu.utils.ext.*
-class DetailsFragment : BaseFragment(), View.OnClickListener,
- View.OnLongClickListener {
+class DetailsFragment :
+ BaseFragment(),
+ View.OnClickListener,
+ View.OnLongClickListener,
+ ChipsView.OnChipClickListener {
private val viewModel by sharedViewModel()
private val coil by inject(mode = LazyThreadSafetyMode.NONE)
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setHasOptionsMenu(true)
+ }
+
override fun onInflateView(
inflater: LayoutInflater,
container: ViewGroup?,
@@ -52,14 +61,20 @@ class DetailsFragment : BaseFragment(), View.OnClickList
binding.buttonFavorite.setOnClickListener(this)
binding.buttonRead.setOnClickListener(this)
binding.buttonRead.setOnLongClickListener(this)
- binding.coverCard.setOnClickListener(this)
+ binding.imageViewCover.setOnClickListener(this)
binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+ binding.chipsTags.onChipClickListener = this
viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
viewModel.favouriteCategories.observe(viewLifecycleOwner, ::onFavouriteChanged)
viewModel.readingHistory.observe(viewLifecycleOwner, ::onHistoryChanged)
}
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ super.onCreateOptionsMenu(menu, inflater)
+ inflater.inflate(R.menu.opt_details_info, menu)
+ }
+
private fun onMangaUpdated(manga: Manga) {
with(binding) {
// Main
@@ -67,61 +82,62 @@ class DetailsFragment : BaseFragment(), View.OnClickList
textViewTitle.text = manga.title
textViewSubtitle.textAndVisible = manga.altTitle
textViewAuthor.textAndVisible = manga.author
- sourceContainer.isVisible = manga.source != MangaSource.LOCAL
- textViewSource.text = manga.source.title
- textViewDescription.text =
- manga.description?.parseAsHtml()?.takeUnless(Spanned::isBlank)
- ?: getString(R.string.no_description)
+ textViewDescription.text = manga.description?.parseAsHtml()?.takeUnless(Spanned::isBlank)
+ ?: getString(R.string.no_description)
when (manga.state) {
MangaState.FINISHED -> {
textViewState.apply {
textAndVisible = resources.getString(R.string.state_finished)
- drawableStart = ResourcesCompat.getDrawable(resources,
- R.drawable.ic_state_finished,
- context.theme)
+ drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
}
}
MangaState.ONGOING -> {
textViewState.apply {
textAndVisible = resources.getString(R.string.state_ongoing)
- drawableStart = ResourcesCompat.getDrawable(resources,
- R.drawable.ic_state_ongoing,
- context.theme)
+ drawableStart = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
}
}
else -> textViewState.isVisible = false
}
// Info containers
- if (manga.chapters?.isNotEmpty() == true) {
- chaptersContainer.isVisible = true
- textViewChapters.text = manga.chapters.let {
- resources.getQuantityString(
- R.plurals.chapters,
- it.size,
- manga.chapters.size
- )
+ val chapters = manga.chapters
+ if (chapters.isNullOrEmpty()) {
+ infoLayout.textViewChapters.isVisible = false
+ } else {
+ infoLayout.textViewChapters.isVisible = true
+ infoLayout.textViewChapters.text = resources.getQuantityString(
+ R.plurals.chapters,
+ chapters.size,
+ chapters.size,
+ )
+ }
+ if (manga.hasRating) {
+ infoLayout.textViewRating.text = String.format("%.1f", manga.rating * 5)
+ infoLayout.ratingContainer.isVisible = true
+ } else {
+ infoLayout.ratingContainer.isVisible = false
+ }
+ if (manga.source == MangaSource.LOCAL) {
+ infoLayout.textViewSource.isVisible = false
+ val file = manga.url.toUri().toFileOrNull()
+ if (file != null) {
+ viewLifecycleScope.launch {
+ val size = file.computeSize()
+ infoLayout.textViewSize.text = FileSize.BYTES.format(requireContext(), size)
+ infoLayout.textViewSize.isVisible = true
+ }
+ } else {
+ infoLayout.textViewSize.isVisible = false
}
} else {
- chaptersContainer.isVisible = false
- }
- if (manga.rating == Manga.NO_RATING) {
- ratingContainer.isVisible = false
- } else {
- textViewRating.text = String.format("%.1f", manga.rating * 5)
- ratingContainer.isVisible = true
- }
- val file = manga.url.toUri().toFileOrNull()
- if (file != null) {
- viewLifecycleScope.launch {
- val size = file.computeSize()
- textViewSize.text = FileSize.BYTES.format(requireContext(), size)
- }
- sizeContainer.isVisible = true
- } else {
- sizeContainer.isVisible = false
+ infoLayout.textViewSource.text = manga.source.title
+ infoLayout.textViewSource.isVisible = true
+ infoLayout.textViewSize.isVisible = false
}
+ infoLayout.textViewNsfw.isVisible = manga.isNsfw
+
// Buttons
buttonRead.isEnabled = !manga.chapters.isNullOrEmpty()
@@ -143,13 +159,12 @@ class DetailsFragment : BaseFragment(), View.OnClickList
}
private fun onFavouriteChanged(isFavourite: Boolean) {
- with(binding.buttonFavorite) {
- if (isFavourite) {
- this.setIconResource(R.drawable.ic_heart)
- } else {
- this.setIconResource(R.drawable.ic_heart_outline)
- }
+ val iconRes = if (isFavourite) {
+ R.drawable.ic_heart
+ } else {
+ R.drawable.ic_heart_outline
}
+ binding.buttonFavorite.setIconResource(iconRes)
}
private fun onLoadingStateChanged(isLoading: Boolean) {
@@ -173,9 +188,9 @@ class DetailsFragment : BaseFragment(), View.OnClickList
} else {
startActivity(
ReaderActivity.newIntent(
- context ?: return,
- manga,
- null
+ context = context ?: return,
+ manga = manga,
+ branch = viewModel.selectedBranchValue,
)
)
}
@@ -189,7 +204,7 @@ class DetailsFragment : BaseFragment(), View.OnClickList
)
)
}
- R.id.cover_card -> {
+ R.id.imageView_cover -> {
val options = ActivityOptions.makeSceneTransitionAnimation(
requireActivity(),
binding.imageViewCover,
@@ -212,11 +227,14 @@ class DetailsFragment : BaseFragment(), View.OnClickList
v.showPopupMenu(R.menu.popup_read) {
when (it.itemId) {
R.id.action_read -> {
+ val branch = viewModel.selectedBranchValue
startActivity(
ReaderActivity.newIntent(
- context ?: return@showPopupMenu false,
- viewModel.manga.value ?: return@showPopupMenu false,
- viewModel.chapters.value?.firstOrNull()?.let { c ->
+ context = context ?: return@showPopupMenu false,
+ manga = viewModel.manga.value ?: return@showPopupMenu false,
+ state = viewModel.chapters.value?.firstOrNull { c ->
+ c.chapter.branch == branch
+ }?.let { c ->
ReaderState(c.chapter.id, 0, 0)
}
)
@@ -232,11 +250,14 @@ class DetailsFragment : BaseFragment(), View.OnClickList
}
}
+ override fun onChipClick(chip: Chip, data: Any?) {
+ val tag = data as? MangaTag ?: return
+ startActivity(MangaListActivity.newIntent(requireContext(), setOf(tag)))
+ }
+
override fun onWindowInsetsChanged(insets: Insets) {
binding.root.updatePadding(
- left = insets.left,
- right = insets.right,
- bottom = insets.bottom
+ bottom = insets.bottom,
)
}
@@ -245,7 +266,8 @@ class DetailsFragment : BaseFragment(), View.OnClickList
manga.tags.map { tag ->
ChipsView.ChipModel(
title = tag.title,
- icon = 0
+ icon = 0,
+ data = tag,
)
}
)
@@ -268,4 +290,4 @@ class DetailsFragment : BaseFragment(), View.OnClickList
.lifecycle(viewLifecycleOwner)
.enqueueWith(coil)
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 2f660e5b4..7c5fe8574 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -5,15 +5,15 @@ import androidx.lifecycle.asFlow
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.base.domain.MangaDataRepository
import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.base.ui.BaseViewModel
import org.koitharu.kotatsu.core.exceptions.MangaNotFoundException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -21,15 +21,18 @@ import org.koitharu.kotatsu.details.ui.model.toListItem
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
import org.koitharu.kotatsu.history.domain.HistoryRepository
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
import org.koitharu.kotatsu.tracker.domain.TrackingRepository
import org.koitharu.kotatsu.utils.SingleLiveEvent
import org.koitharu.kotatsu.utils.ext.iterator
-import org.koitharu.kotatsu.utils.ext.mapToSet
-import org.koitharu.kotatsu.utils.ext.toTitleCase
import java.io.IOException
class DetailsViewModel(
- intent: MangaIntent,
+ private val intent: MangaIntent,
private val historyRepository: HistoryRepository,
private val favouritesRepository: FavouritesRepository,
private val localMangaRepository: LocalMangaRepository,
@@ -38,7 +41,8 @@ class DetailsViewModel(
private val settings: AppSettings,
) : BaseViewModel() {
- private val mangaData = MutableStateFlow(intent.manga)
+ private var loadingJob: Job
+ private val mangaData = MutableStateFlow(intent.manga)
private val selectedBranch = MutableStateFlow(null)
private val history = mangaData.mapNotNull { it?.id }
@@ -59,7 +63,9 @@ class DetailsViewModel(
trackingRepository.getNewChaptersCount(mangaId)
}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, 0)
- private val remoteManga = MutableStateFlow(null)
+ // Remote manga for saved and saved for remote
+ private val relatedManga = MutableStateFlow(null)
+ private val chaptersQuery = MutableStateFlow("")
private val chaptersReversed = settings.observe()
.filter { it == AppSettings.KEY_REVERSE_CHAPTERS }
@@ -91,46 +97,41 @@ class DetailsViewModel(
branches.indexOf(selected)
}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
- val chapters = combine(
- mangaData.map { it?.chapters.orEmpty() },
- remoteManga,
- history.map { it?.chapterId },
- newChapters,
- selectedBranch
- ) { chapters, sourceManga, currentId, newCount, branch ->
- val sourceChapters = sourceManga?.chapters
- if (sourceManga?.source != MangaSource.LOCAL && !sourceChapters.isNullOrEmpty()) {
- mapChaptersWithSource(chapters, sourceChapters, currentId, newCount, branch)
- } else {
- mapChapters(chapters, sourceChapters, currentId, newCount, branch)
- }
- }.combine(chaptersReversed) { list, reversed ->
- if (reversed) list.asReversed() else list
+ val hasChapters = mangaData.map {
+ !(it?.chapters.isNullOrEmpty())
}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
- init {
- launchLoadingJob(Dispatchers.Default) {
- var manga = mangaDataRepository.resolveIntent(intent)
- ?: throw MangaNotFoundException("Cannot find manga")
- mangaData.value = manga
- manga = MangaRepository(manga.source).getDetails(manga)
- // find default branch
- val hist = historyRepository.getOne(manga)
- selectedBranch.value = if (hist != null) {
- manga.chapters?.find { it.id == hist.chapterId }?.branch
+ val chapters = combine(
+ combine(
+ mangaData.map { it?.chapters.orEmpty() },
+ relatedManga,
+ history.map { it?.chapterId },
+ newChapters,
+ selectedBranch
+ ) { chapters, related, currentId, newCount, branch ->
+ val relatedChapters = related?.chapters
+ if (related?.source != MangaSource.LOCAL && !relatedChapters.isNullOrEmpty()) {
+ mapChaptersWithSource(chapters, relatedChapters, currentId, newCount, branch)
} else {
- predictBranch(manga.chapters)
+ mapChapters(chapters, relatedChapters, currentId, newCount, branch)
}
- mangaData.value = manga
- remoteManga.value = runCatching {
- if (manga.source == MangaSource.LOCAL) {
- val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
- MangaRepository(m.source).getDetails(m)
- } else {
- localMangaRepository.findSavedManga(manga)
- }
- }.getOrNull()
- }
+ },
+ chaptersReversed,
+ chaptersQuery,
+ ) { list, reversed, query ->
+ (if (reversed) list.asReversed() else list).filterSearch(query)
+ }.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
+
+ val selectedBranchValue: String?
+ get() = selectedBranch.value
+
+ init {
+ loadingJob = doLoad()
+ }
+
+ fun reload() {
+ loadingJob.cancel()
+ loadingJob = doLoad()
}
fun deleteLocal(manga: Manga) {
@@ -153,7 +154,56 @@ class DetailsViewModel(
}
fun getRemoteManga(): Manga? {
- return remoteManga.value
+ return relatedManga.value?.takeUnless { it.source == MangaSource.LOCAL }
+ }
+
+ fun performChapterSearch(query: String?) {
+ chaptersQuery.value = query?.trim().orEmpty()
+ }
+
+ fun onDownloadComplete(downloadedManga: Manga) {
+ val currentManga = mangaData.value ?: return
+ if (currentManga.id != downloadedManga.id) {
+ return
+ }
+ if (currentManga.source == MangaSource.LOCAL) {
+ reload()
+ } else {
+ viewModelScope.launch(Dispatchers.Default) {
+ runCatching {
+ localMangaRepository.getDetails(downloadedManga)
+ }.onSuccess {
+ relatedManga.value = it
+ }.onFailure {
+ if (BuildConfig.DEBUG) {
+ it.printStackTrace()
+ }
+ }
+ }
+ }
+ }
+
+ private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
+ var manga = mangaDataRepository.resolveIntent(intent)
+ ?: throw MangaNotFoundException("Cannot find manga")
+ mangaData.value = manga
+ manga = MangaRepository(manga.source).getDetails(manga)
+ // find default branch
+ val hist = historyRepository.getOne(manga)
+ selectedBranch.value = if (hist != null) {
+ manga.chapters?.find { it.id == hist.chapterId }?.branch
+ } else {
+ predictBranch(manga.chapters)
+ }
+ mangaData.value = manga
+ relatedManga.value = runCatching {
+ if (manga.source == MangaSource.LOCAL) {
+ val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
+ MangaRepository(m.source).getDetails(m)
+ } else {
+ localMangaRepository.findSavedManga(manga)
+ }
+ }.getOrNull()
}
private fun mapChapters(
@@ -253,4 +303,13 @@ class DetailsViewModel(
}
return groups.maxByOrNull { it.value.size }?.key
}
-}
+
+ private fun List.filterSearch(query: String): List {
+ if (query.isEmpty() || this.isEmpty()) {
+ return this
+ }
+ return filter {
+ it.chapter.name.contains(query, ignoreCase = true)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt
index 5cee213a7..2ca602df9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/BranchesAdapter.kt
@@ -6,7 +6,7 @@ import android.view.ViewGroup
import android.widget.BaseAdapter
import android.widget.TextView
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.ext.replaceWith
+import org.koitharu.kotatsu.parsers.util.replaceWith
class BranchesAdapter : BaseAdapter() {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
index dbd64b9b7..0ff2fbc94 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersSelectionDecoration.kt
@@ -2,68 +2,32 @@ package org.koitharu.kotatsu.details.ui.adapter
import android.content.Context
import android.graphics.Canvas
+import android.graphics.Color
import android.graphics.Paint
-import android.graphics.Rect
-import androidx.core.view.children
+import android.graphics.RectF
+import android.view.View
import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
import org.koitharu.kotatsu.utils.ext.getThemeColor
+import com.google.android.material.R as materialR
-class ChaptersSelectionDecoration(context: Context) : RecyclerView.ItemDecoration() {
+class ChaptersSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
- private val bounds = Rect()
- private val selection = HashSet()
private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+ private val radius = context.resources.getDimension(materialR.dimen.abc_control_corner_material)
init {
- paint.color = context.getThemeColor(com.google.android.material.R.attr.scrimBackground)
+ paint.color = context.getThemeColor(materialR.attr.colorSecondaryContainer, Color.LTGRAY)
paint.style = Paint.Style.FILL
}
- val checkedItemsCount: Int
- get() = selection.size
-
- val checkedItemsIds: Set
- get() = selection
-
- fun toggleItemChecked(id: Long) {
- if (!selection.remove(id)) {
- selection.add(id)
- }
- }
-
- fun setItemIsChecked(id: Long, isChecked: Boolean) {
- if (isChecked) {
- selection.add(id)
- } else {
- selection.remove(id)
- }
- }
-
- fun checkAll(ids: Collection) {
- selection.addAll(ids)
- }
-
- fun clearSelection() {
- selection.clear()
- }
-
- override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
- canvas.save()
- if (parent.clipToPadding) {
- canvas.clipRect(
- parent.paddingLeft, parent.paddingTop, parent.width - parent.paddingRight,
- parent.height - parent.paddingBottom
- )
- }
-
- for (child in parent.children) {
- val itemId = parent.getChildItemId(child)
- if (itemId in selection) {
- parent.getDecoratedBoundsWithMargins(child, bounds)
- bounds.offset(child.translationX.toInt(), child.translationY.toInt())
- canvas.drawRect(bounds, paint)
- }
- }
- canvas.restore()
+ override fun onDrawBackground(
+ canvas: Canvas,
+ parent: RecyclerView,
+ child: View,
+ bounds: RectF,
+ state: RecyclerView.State,
+ ) {
+ canvas.drawRoundRect(bounds, radius, radius, paint)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
index 2e1ac64bd..6f37c8e53 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
@@ -1,6 +1,6 @@
package org.koitharu.kotatsu.details.ui.model
-import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaChapter
class ChapterListItem(
val chapter: MangaChapter,
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
index 98a7f9c4b..22d272346 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt
@@ -1,11 +1,11 @@
package org.koitharu.kotatsu.details.ui.model
-import org.koitharu.kotatsu.core.model.MangaChapter
import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_CURRENT
import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_DOWNLOADED
import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_MISSING
import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_NEW
import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_UNREAD
+import org.koitharu.kotatsu.parsers.model.MangaChapter
import java.text.DateFormat
fun MangaChapter.toListItem(
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index b4de213d5..e1933a683 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -8,30 +8,33 @@ import coil.ImageLoader
import coil.request.ImageRequest
import coil.size.Scale
import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.sync.Semaphore
import okhttp3.OkHttpClient
import okhttp3.Request
import okio.IOException
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.core.network.CommonHeaders
import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.local.data.MangaZip
import org.koitharu.kotatsu.local.data.PagesCache
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
-import org.koitharu.kotatsu.utils.ext.await
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.await
import org.koitharu.kotatsu.utils.ext.deleteAwait
import org.koitharu.kotatsu.utils.ext.referer
import org.koitharu.kotatsu.utils.ext.waitForNetwork
+import org.koitharu.kotatsu.utils.progress.ProgressJob
import java.io.File
private const val MAX_DOWNLOAD_ATTEMPTS = 3
+private const val MAX_PARALLEL_DOWNLOADS = 2
private const val DOWNLOAD_ERROR_DELAY = 500L
private const val TEMP_PAGE_FILE = "page.tmp"
class DownloadManager(
+ private val coroutineScope: CoroutineScope,
private val context: Context,
private val imageLoader: ImageLoader,
private val okHttp: OkHttpClient,
@@ -39,7 +42,7 @@ class DownloadManager(
private val localMangaRepository: LocalMangaRepository,
) {
- private val connectivityManager = context.getSystemService(
+ private val connectivityManager = context.applicationContext.getSystemService(
Context.CONNECTIVITY_SERVICE
) as ConnectivityManager
private val coverWidth = context.resources.getDimensionPixelSize(
@@ -48,9 +51,29 @@ class DownloadManager(
private val coverHeight = context.resources.getDimensionPixelSize(
androidx.core.R.dimen.compat_notification_large_icon_max_height
)
+ private val semaphore = Semaphore(MAX_PARALLEL_DOWNLOADS)
- fun downloadManga(manga: Manga, chaptersIds: Set?, startId: Int) = flow {
- emit(State.Preparing(startId, manga, null))
+ fun downloadManga(
+ manga: Manga,
+ chaptersIds: Set?,
+ startId: Int,
+ ): ProgressJob {
+ val stateFlow = MutableStateFlow(
+ DownloadState.Queued(startId = startId, manga = manga, cover = null)
+ )
+ val job = downloadMangaImpl(manga, chaptersIds, stateFlow, startId)
+ return ProgressJob(job, stateFlow)
+ }
+
+ private fun downloadMangaImpl(
+ manga: Manga,
+ chaptersIds: Set?,
+ outState: MutableStateFlow,
+ startId: Int,
+ ): Job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(outState)) {
+ semaphore.acquire()
+ coroutineContext[WakeLockNode]?.acquire()
+ outState.value = DownloadState.Preparing(startId, manga, null)
var cover: Drawable? = null
val destination = localMangaRepository.getOutputDir()
checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
@@ -67,7 +90,7 @@ class DownloadManager(
.build()
).drawable
}.getOrNull()
- emit(State.Preparing(startId, manga, cover))
+ outState.value = DownloadState.Preparing(startId, manga, cover)
val data = if (manga.chapters == null) repo.getDetails(manga) else manga
output = MangaZip.findInDir(destination, data)
output.prepare(data)
@@ -96,43 +119,43 @@ class DownloadManager(
MimeTypeMap.getFileExtensionFromUrl(url)
)
} catch (e: IOException) {
- emit(State.WaitingForNetwork(startId, manga, cover))
+ outState.value = DownloadState.WaitingForNetwork(startId, data, cover)
connectivityManager.waitForNetwork()
continue@failsafe
}
} while (false)
- emit(State.Progress(
- startId, manga, cover,
+ outState.value = DownloadState.Progress(
+ startId, data, cover,
totalChapters = chapters.size,
currentChapter = chapterIndex,
totalPages = pages.size,
currentPage = pageIndex,
- ))
+ )
}
}
}
- emit(State.PostProcessing(startId, manga, cover))
+ outState.value = DownloadState.PostProcessing(startId, data, cover)
if (!output.compress()) {
throw RuntimeException("Cannot create target file")
}
val localManga = localMangaRepository.getFromFile(output.file)
- emit(State.Done(startId, manga, cover, localManga))
+ outState.value = DownloadState.Done(startId, data, cover, localManga)
} catch (_: CancellationException) {
- emit(State.Cancelling(startId, manga, cover))
+ outState.value = DownloadState.Cancelled(startId, manga, cover)
} catch (e: Throwable) {
if (BuildConfig.DEBUG) {
e.printStackTrace()
}
- emit(State.Error(startId, manga, cover, e))
+ outState.value = DownloadState.Error(startId, manga, cover, e)
} finally {
withContext(NonCancellable) {
output?.cleanup()
File(destination, TEMP_PAGE_FILE).deleteAwait()
}
+ coroutineContext[WakeLockNode]?.release()
+ semaphore.release()
}
- }.catch { e ->
- emit(State.Error(startId, manga, null, e))
}
private suspend fun downloadFile(url: String, referer: String, destination: File): File {
@@ -165,71 +188,13 @@ class DownloadManager(
}
}
- sealed interface State {
-
- val startId: Int
- val manga: Manga
- val cover: Drawable?
-
- data class Queued(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- ) : State
-
- data class Preparing(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- ) : State
-
- data class Progress(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- val totalChapters: Int,
- val currentChapter: Int,
- val totalPages: Int,
- val currentPage: Int,
- ): State {
-
- val max: Int = totalChapters * totalPages
-
- val progress: Int = totalPages * currentChapter + currentPage + 1
-
- val percent: Float = progress.toFloat() / max
- }
-
- data class WaitingForNetwork(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- ): State
-
- data class Done(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- val localManga: Manga,
- ) : State
-
- data class Error(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- val error: Throwable,
- ) : State
-
- data class Cancelling(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- ): State
-
- data class PostProcessing(
- override val startId: Int,
- override val manga: Manga,
- override val cover: Drawable?,
- ) : State
+ private fun errorStateHandler(outState: MutableStateFlow) = CoroutineExceptionHandler { _, throwable ->
+ val prevValue = outState.value
+ outState.value = DownloadState.Error(
+ startId = prevValue.startId,
+ manga = prevValue.manga,
+ cover = prevValue.cover,
+ error = throwable,
+ )
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
new file mode 100644
index 000000000..a0a78ac7a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
@@ -0,0 +1,251 @@
+package org.koitharu.kotatsu.download.domain
+
+import android.graphics.drawable.Drawable
+import org.koitharu.kotatsu.parsers.model.Manga
+
+sealed interface DownloadState {
+
+ val startId: Int
+ val manga: Manga
+ val cover: Drawable?
+
+ class Queued(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Queued
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ return result
+ }
+ }
+
+ class Preparing(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Preparing
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ return result
+ }
+ }
+
+ class Progress(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ val totalChapters: Int,
+ val currentChapter: Int,
+ val totalPages: Int,
+ val currentPage: Int,
+ ) : DownloadState {
+
+ val max: Int = totalChapters * totalPages
+
+ val progress: Int = totalPages * currentChapter + currentPage + 1
+
+ val percent: Float = progress.toFloat() / max
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Progress
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+ if (totalChapters != other.totalChapters) return false
+ if (currentChapter != other.currentChapter) return false
+ if (totalPages != other.totalPages) return false
+ if (currentPage != other.currentPage) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ result = 31 * result + totalChapters
+ result = 31 * result + currentChapter
+ result = 31 * result + totalPages
+ result = 31 * result + currentPage
+ return result
+ }
+ }
+
+ class WaitingForNetwork(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as WaitingForNetwork
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ return result
+ }
+ }
+
+ class Done(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ val localManga: Manga,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Done
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+ if (localManga != other.localManga) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ result = 31 * result + localManga.hashCode()
+ return result
+ }
+ }
+
+ class Error(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ val error: Throwable,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Error
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+ if (error != other.error) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ result = 31 * result + error.hashCode()
+ return result
+ }
+ }
+
+ class Cancelled(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as Cancelled
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ return result
+ }
+ }
+
+ class PostProcessing(
+ override val startId: Int,
+ override val manga: Manga,
+ override val cover: Drawable?,
+ ) : DownloadState {
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as PostProcessing
+
+ if (startId != other.startId) return false
+ if (manga != other.manga) return false
+ if (cover != other.cover) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = startId
+ result = 31 * result + manga.hashCode()
+ result = 31 * result + (cover?.hashCode() ?: 0)
+ return result
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/WakeLockNode.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/WakeLockNode.kt
new file mode 100644
index 000000000..8bbfc2f2d
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/WakeLockNode.kt
@@ -0,0 +1,25 @@
+package org.koitharu.kotatsu.download.domain
+
+import android.os.PowerManager
+import kotlin.coroutines.AbstractCoroutineContextElement
+import kotlin.coroutines.CoroutineContext
+
+class WakeLockNode(
+ private val wakeLock: PowerManager.WakeLock,
+ private val timeout: Long,
+) : AbstractCoroutineContextElement(Key) {
+
+ init {
+ wakeLock.setReferenceCounted(true)
+ }
+
+ fun acquire() {
+ wakeLock.acquire(timeout)
+ }
+
+ fun release() {
+ wakeLock.release()
+ }
+
+ companion object Key : CoroutineContext.Key
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
index e854a23b8..1a86d0153 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
@@ -9,18 +9,20 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.databinding.ItemDownloadBinding
-import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.download.domain.DownloadState
+import org.koitharu.kotatsu.parsers.util.format
import org.koitharu.kotatsu.utils.ext.*
import org.koitharu.kotatsu.utils.progress.ProgressJob
fun downloadItemAD(
scope: CoroutineScope,
coil: ImageLoader,
-) = adapterDelegateViewBinding, ProgressJob, ItemDownloadBinding>(
+) = adapterDelegateViewBinding, ProgressJob, ItemDownloadBinding>(
{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
) {
var job: Job? = null
+ val percentPattern = context.resources.getString(R.string.percent_string_pattern)
bind {
job?.cancel()
@@ -35,62 +37,62 @@ fun downloadItemAD(
}.onEach { state ->
binding.textViewTitle.text = state.manga.title
when (state) {
- is DownloadManager.State.Cancelling -> {
+ is DownloadState.Cancelled -> {
binding.textViewStatus.setText(R.string.cancelling_)
- binding.progressBar.setIndeterminateCompat(true)
+ binding.progressBar.isIndeterminate = true
binding.progressBar.isVisible = true
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
}
- is DownloadManager.State.Done -> {
+ is DownloadState.Done -> {
binding.textViewStatus.setText(R.string.download_complete)
- binding.progressBar.setIndeterminateCompat(false)
+ binding.progressBar.isIndeterminate = false
binding.progressBar.isVisible = false
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
}
- is DownloadManager.State.Error -> {
+ is DownloadState.Error -> {
binding.textViewStatus.setText(R.string.error_occurred)
- binding.progressBar.setIndeterminateCompat(false)
+ binding.progressBar.isIndeterminate = false
binding.progressBar.isVisible = false
binding.textViewPercent.isVisible = false
binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
binding.textViewDetails.isVisible = true
}
- is DownloadManager.State.PostProcessing -> {
+ is DownloadState.PostProcessing -> {
binding.textViewStatus.setText(R.string.processing_)
- binding.progressBar.setIndeterminateCompat(true)
+ binding.progressBar.isIndeterminate = true
binding.progressBar.isVisible = true
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
}
- is DownloadManager.State.Preparing -> {
+ is DownloadState.Preparing -> {
binding.textViewStatus.setText(R.string.preparing_)
- binding.progressBar.setIndeterminateCompat(true)
+ binding.progressBar.isIndeterminate = true
binding.progressBar.isVisible = true
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
}
- is DownloadManager.State.Progress -> {
+ is DownloadState.Progress -> {
binding.textViewStatus.setText(R.string.manga_downloading_)
- binding.progressBar.setIndeterminateCompat(false)
+ binding.progressBar.isIndeterminate = false
binding.progressBar.isVisible = true
binding.progressBar.max = state.max
binding.progressBar.setProgressCompat(state.progress, true)
- binding.textViewPercent.text = (state.percent * 100f).format(1) + "%"
+ binding.textViewPercent.text = percentPattern.format((state.percent * 100f).format(1))
binding.textViewPercent.isVisible = true
binding.textViewDetails.isVisible = false
}
- is DownloadManager.State.Queued -> {
+ is DownloadState.Queued -> {
binding.textViewStatus.setText(R.string.queued)
- binding.progressBar.setIndeterminateCompat(false)
+ binding.progressBar.isIndeterminate = false
binding.progressBar.isVisible = false
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
}
- is DownloadManager.State.WaitingForNetwork -> {
+ is DownloadState.WaitingForNetwork -> {
binding.textViewStatus.setText(R.string.waiting_for_network)
- binding.progressBar.setIndeterminateCompat(false)
+ binding.progressBar.isIndeterminate = false
binding.progressBar.isVisible = false
binding.textViewPercent.isVisible = false
binding.textViewDetails.isVisible = false
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
index d590a724d..e249e4dc5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsActivity.kt
@@ -47,15 +47,10 @@ class DownloadsActivity : BaseActivity() {
right = insets.right,
bottom = insets.bottom
)
- with(binding.toolbar) {
- updatePadding(
- left = insets.left,
- right = insets.right
- )
- updateLayoutParams {
- topMargin = insets.top
- }
- }
+ binding.toolbar.updatePadding(
+ left = insets.left,
+ right = insets.right
+ )
}
companion object {
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
index 37df8b9d8..0c3629d1b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
@@ -4,13 +4,13 @@ import androidx.recyclerview.widget.DiffUtil
import coil.ImageLoader
import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
import kotlinx.coroutines.CoroutineScope
-import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.download.domain.DownloadState
import org.koitharu.kotatsu.utils.progress.ProgressJob
class DownloadsAdapter(
scope: CoroutineScope,
coil: ImageLoader,
-) : AsyncListDifferDelegationAdapter>(DiffCallback()) {
+) : AsyncListDifferDelegationAdapter>(DiffCallback()) {
init {
delegatesManager.addDelegate(downloadItemAD(scope, coil))
@@ -21,18 +21,18 @@ class DownloadsAdapter(
return items[position].progressValue.startId.toLong()
}
- private class DiffCallback : DiffUtil.ItemCallback>() {
+ private class DiffCallback : DiffUtil.ItemCallback>() {
override fun areItemsTheSame(
- oldItem: ProgressJob,
- newItem: ProgressJob,
+ oldItem: ProgressJob,
+ newItem: ProgressJob,
): Boolean {
return oldItem.progressValue.startId == newItem.progressValue.startId
}
override fun areContentsTheSame(
- oldItem: ProgressJob,
- newItem: ProgressJob,
+ oldItem: ProgressJob,
+ newItem: ProgressJob,
): Boolean {
return oldItem.progressValue == newItem.progressValue
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
index 46054d901..dd3fa3035 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -11,19 +11,17 @@ import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.toBitmap
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.ui.CrashActivity
import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.download.domain.DownloadState
import org.koitharu.kotatsu.download.ui.DownloadsActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.format
import org.koitharu.kotatsu.utils.PendingIntentCompat
-import org.koitharu.kotatsu.utils.ext.format
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
import com.google.android.material.R as materialR
-class DownloadNotification(
- private val context: Context,
- startId: Int,
-) {
+class DownloadNotification(private val context: Context, startId: Int) {
private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
private val cancelAction = NotificationCompat.Action(
@@ -47,9 +45,11 @@ class DownloadNotification(
builder.setOnlyAlertOnce(true)
builder.setDefaults(0)
builder.color = ContextCompat.getColor(context, R.color.blue_primary)
+ builder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
+ builder.setSilent(true)
}
- fun create(state: DownloadManager.State): Notification {
+ fun create(state: DownloadState): Notification {
builder.setContentTitle(state.manga.title)
builder.setContentText(context.getString(R.string.manga_downloading_))
builder.setProgress(1, 0, true)
@@ -59,13 +59,14 @@ class DownloadNotification(
builder.setLargeIcon(state.cover?.toBitmap())
builder.clearActions()
when (state) {
- is DownloadManager.State.Cancelling -> {
+ is DownloadState.Cancelled -> {
builder.setProgress(1, 0, true)
builder.setContentText(context.getString(R.string.cancelling_))
builder.setContentIntent(null)
builder.setStyle(null)
+ builder.setOngoing(true)
}
- is DownloadManager.State.Done -> {
+ is DownloadState.Done -> {
builder.setProgress(0, 0, false)
builder.setContentText(context.getString(R.string.download_complete))
builder.setContentIntent(createMangaIntent(context, state.localManga))
@@ -73,40 +74,60 @@ class DownloadNotification(
builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
builder.setCategory(null)
builder.setStyle(null)
+ builder.setOngoing(false)
}
- is DownloadManager.State.Error -> {
+ is DownloadState.Error -> {
val message = state.error.getDisplayMessage(context.resources)
builder.setProgress(0, 0, false)
builder.setSmallIcon(android.R.drawable.stat_notify_error)
builder.setSubText(context.getString(R.string.error))
builder.setContentText(message)
builder.setAutoCancel(true)
+ builder.setOngoing(false)
+ builder.setContentIntent(
+ PendingIntent.getActivity(
+ context,
+ state.manga.hashCode(),
+ CrashActivity.newIntent(context, state.error),
+ PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+ )
+ )
builder.setCategory(NotificationCompat.CATEGORY_ERROR)
builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
}
- is DownloadManager.State.PostProcessing -> {
+ is DownloadState.PostProcessing -> {
builder.setProgress(1, 0, true)
builder.setContentText(context.getString(R.string.processing_))
builder.setStyle(null)
+ builder.setOngoing(true)
}
- is DownloadManager.State.Queued,
- is DownloadManager.State.Preparing -> {
+ is DownloadState.Queued -> {
+ builder.setProgress(0, 0, false)
+ builder.setContentText(context.getString(R.string.queued))
+ builder.setStyle(null)
+ builder.setOngoing(true)
+ builder.addAction(cancelAction)
+ }
+ is DownloadState.Preparing -> {
builder.setProgress(1, 0, true)
builder.setContentText(context.getString(R.string.preparing_))
builder.setStyle(null)
+ builder.setOngoing(true)
builder.addAction(cancelAction)
}
- is DownloadManager.State.Progress -> {
+ is DownloadState.Progress -> {
builder.setProgress(state.max, state.progress, false)
builder.setContentText((state.percent * 100).format() + "%")
builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
builder.setStyle(null)
+ builder.setOngoing(true)
builder.addAction(cancelAction)
}
- is DownloadManager.State.WaitingForNetwork -> {
+ is DownloadState.WaitingForNetwork -> {
builder.setProgress(0, 0, false)
builder.setContentText(context.getString(R.string.waiting_for_network))
builder.setStyle(null)
+ builder.setOngoing(true)
builder.addAction(cancelAction)
}
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index 5d62833fc..a005346f4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -8,64 +8,68 @@ import android.os.Binder
import android.os.IBinder
import android.os.PowerManager
import android.widget.Toast
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.ServiceCompat
import androidx.core.content.ContextCompat
import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Dispatchers
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.isActive
+import kotlinx.coroutines.flow.transformWhile
import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.plus
import org.koin.android.ext.android.get
import org.koin.core.context.GlobalContext
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseService
import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.model.withoutChapters
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.download.domain.DownloadManager
+import org.koitharu.kotatsu.download.domain.DownloadState
+import org.koitharu.kotatsu.download.domain.WakeLockNode
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.connectivityManager
+import org.koitharu.kotatsu.utils.ext.throttle
import org.koitharu.kotatsu.utils.ext.toArraySet
import org.koitharu.kotatsu.utils.progress.ProgressJob
import java.util.concurrent.TimeUnit
-import kotlin.collections.set
class DownloadService : BaseService() {
- private lateinit var notificationManager: NotificationManagerCompat
- private lateinit var wakeLock: PowerManager.WakeLock
private lateinit var downloadManager: DownloadManager
+ private lateinit var notificationSwitcher: ForegroundNotificationSwitcher
- private val jobs = LinkedHashMap>()
+ private val jobs = LinkedHashMap>()
private val jobCount = MutableStateFlow(0)
- private val mutex = Mutex()
private val controlReceiver = ControlReceiver()
private var binder: DownloadBinder? = null
override fun onCreate() {
super.onCreate()
- notificationManager = NotificationManagerCompat.from(this)
- wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
+ notificationSwitcher = ForegroundNotificationSwitcher(this)
+ val wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
- downloadManager = DownloadManager(this, get(), get(), get(), get())
+ downloadManager = DownloadManager(
+ coroutineScope = lifecycleScope + WakeLockNode(wakeLock, TimeUnit.HOURS.toMillis(1)),
+ context = this,
+ imageLoader = get(),
+ okHttp = get(),
+ cache = get(),
+ localMangaRepository = get(),
+ )
DownloadNotification.createChannel(this)
registerReceiver(controlReceiver, IntentFilter(ACTION_DOWNLOAD_CANCEL))
}
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
super.onStartCommand(intent, flags, startId)
- val manga = intent?.getParcelableExtra(EXTRA_MANGA)
+ val manga = intent?.getParcelableExtra(EXTRA_MANGA)?.manga
val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
return if (manga != null) {
jobs[startId] = downloadManga(startId, manga, chapters)
jobCount.value = jobs.size
- Toast.makeText(this, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
START_REDELIVER_INTENT
} else {
stopSelf(startId)
@@ -93,47 +97,50 @@ class DownloadService : BaseService() {
startId: Int,
manga: Manga,
chaptersIds: Set?,
- ): ProgressJob {
- val initialState = DownloadManager.State.Queued(startId, manga, null)
- val stateFlow = MutableStateFlow(initialState)
- val job = lifecycleScope.launch {
- mutex.withLock {
- wakeLock.acquire(TimeUnit.HOURS.toMillis(1))
- val notification = DownloadNotification(this@DownloadService, startId)
- startForeground(startId, notification.create(initialState))
- try {
- withContext(Dispatchers.Default) {
- downloadManager.downloadManga(manga, chaptersIds, startId)
- .collect { state ->
- stateFlow.value = state
- notificationManager.notify(startId, notification.create(state))
- }
- }
- if (stateFlow.value is DownloadManager.State.Done) {
- sendBroadcast(
- Intent(ACTION_DOWNLOAD_COMPLETE)
- .putExtra(EXTRA_MANGA, manga)
- )
- }
- } finally {
- ServiceCompat.stopForeground(
- this@DownloadService,
- if (isActive) {
- ServiceCompat.STOP_FOREGROUND_DETACH
- } else {
- ServiceCompat.STOP_FOREGROUND_REMOVE
- }
- )
- if (wakeLock.isHeld) {
- wakeLock.release()
- }
- stopSelf(startId)
- }
- }
- }
- return ProgressJob(job, stateFlow)
+ ): ProgressJob {
+ val job = downloadManager.downloadManga(manga, chaptersIds, startId)
+ listenJob(job)
+ return job
}
+ private fun listenJob(job: ProgressJob) {
+ lifecycleScope.launch {
+ val startId = job.progressValue.startId
+ val notification = DownloadNotification(this@DownloadService, startId)
+ notificationSwitcher.notify(startId, notification.create(job.progressValue))
+ job.progressAsFlow()
+ .throttle { state -> if (state is DownloadState.Progress) 400L else 0L }
+ .whileActive()
+ .collect { state ->
+ notificationSwitcher.notify(startId, notification.create(state))
+ }
+ job.join()
+ (job.progressValue as? DownloadState.Done)?.let {
+ sendBroadcast(
+ Intent(ACTION_DOWNLOAD_COMPLETE)
+ .putExtra(EXTRA_MANGA, ParcelableManga(it.localManga.withoutChapters()))
+ )
+ }
+ notificationSwitcher.detach(
+ startId,
+ if (job.isCancelled) {
+ null
+ } else {
+ notification.create(job.progressValue)
+ }
+ )
+ stopSelf(startId)
+ }
+ }
+
+ private fun Flow.whileActive(): Flow = transformWhile { state ->
+ emit(state)
+ !state.isTerminal
+ }
+
+ private val DownloadState.isTerminal: Boolean
+ get() = this is DownloadState.Done || this is DownloadState.Error || this is DownloadState.Cancelled
+
inner class ControlReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent?) {
@@ -149,7 +156,7 @@ class DownloadService : BaseService() {
class DownloadBinder(private val service: DownloadService) : Binder() {
- val downloads: Flow>>
+ val downloads: Flow>>
get() = service.jobCount.mapLatest { service.jobs.values }
}
@@ -171,16 +178,47 @@ class DownloadService : BaseService() {
}
confirmDataTransfer(context) {
val intent = Intent(context, DownloadService::class.java)
- intent.putExtra(EXTRA_MANGA, manga)
+ intent.putExtra(EXTRA_MANGA, ParcelableManga(manga))
if (chaptersIds != null) {
intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
}
ContextCompat.startForegroundService(context, intent)
+ Toast.makeText(context, R.string.manga_downloading_, Toast.LENGTH_SHORT).show()
}
}
+ fun start(context: Context, manga: Collection) {
+ if (manga.isEmpty()) {
+ return
+ }
+ confirmDataTransfer(context) {
+ for (item in manga) {
+ val intent = Intent(context, DownloadService::class.java)
+ intent.putExtra(EXTRA_MANGA, ParcelableManga(item))
+ ContextCompat.startForegroundService(context, intent)
+ }
+ }
+ }
+
+ fun confirmAndStart(context: Context, items: Set) {
+ MaterialAlertDialogBuilder(context)
+ .setTitle(R.string.save_manga)
+ .setMessage(R.string.batch_manga_save_confirm)
+ .setNegativeButton(android.R.string.cancel, null)
+ .setPositiveButton(R.string.save) { _, _ ->
+ start(context, items)
+ }.show()
+ }
+
fun getCancelIntent(startId: Int) = Intent(ACTION_DOWNLOAD_CANCEL)
- .putExtra(ACTION_DOWNLOAD_CANCEL, startId)
+ .putExtra(EXTRA_CANCEL_ID, startId)
+
+ fun getDownloadedManga(intent: Intent?): Manga? {
+ if (intent?.action == ACTION_DOWNLOAD_COMPLETE) {
+ return intent.getParcelableExtra(EXTRA_MANGA)?.manga
+ }
+ return null
+ }
private fun confirmDataTransfer(context: Context, callback: () -> Unit) {
val settings = GlobalContext.get().get()
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt
new file mode 100644
index 000000000..c7d0b0191
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt
@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.download.ui.service
+
+import android.app.Notification
+import android.app.NotificationManager
+import android.app.Service
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.util.SparseArray
+import androidx.core.app.ServiceCompat
+import androidx.core.util.isEmpty
+import androidx.core.util.size
+
+private const val DEFAULT_DELAY = 500L
+
+class ForegroundNotificationSwitcher(
+ private val service: Service,
+) {
+
+ private val notificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+ private val notifications = SparseArray()
+ private val handler = Handler(Looper.getMainLooper())
+
+ @Synchronized
+ fun notify(startId: Int, notification: Notification) {
+ if (notifications.isEmpty()) {
+ StartForegroundRunnable(startId, notification)
+ } else {
+ notificationManager.notify(startId, notification)
+ }
+ notifications[startId] = notification
+ }
+
+ @Synchronized
+ fun detach(startId: Int, notification: Notification?) {
+ notifications.remove(startId)
+ if (notifications.isEmpty()) {
+ ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_DETACH)
+ }
+ val nextIndex = notifications.size - 1
+ if (nextIndex >= 0) {
+ val nextStartId = notifications.keyAt(nextIndex)
+ val nextNotification = notifications.valueAt(nextIndex)
+ service.startForeground(nextStartId, nextNotification)
+ }
+ handler.postDelayed(NotifyRunnable(startId, notification), DEFAULT_DELAY)
+ }
+
+ private inner class StartForegroundRunnable(
+ private val startId: Int,
+ private val notification: Notification,
+ ) : Runnable {
+
+ override fun run() {
+ service.startForeground(startId, notification)
+ }
+ }
+
+ private inner class NotifyRunnable(
+ private val startId: Int,
+ private val notification: Notification?,
+ ) : Runnable {
+
+ override fun run() {
+ if (notification != null) {
+ notificationManager.notify(startId, notification)
+ } else {
+ notificationManager.cancel(startId)
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
new file mode 100644
index 000000000..801f2566a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.favourites.data
+
+import java.util.*
+import org.koitharu.kotatsu.core.db.entity.SortOrder
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.parsers.model.SortOrder
+
+fun FavouriteCategoryEntity.toFavouriteCategory(id: Long = categoryId.toLong()) = FavouriteCategory(
+ id = id,
+ title = title,
+ sortKey = sortKey,
+ order = SortOrder(order, SortOrder.NEWEST),
+ createdAt = Date(createdAt),
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
index aa054c441..d2b0bc7ed 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
@@ -3,9 +3,6 @@ package org.koitharu.kotatsu.favourites.data
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.SortOrder
-import java.util.*
@Entity(tableName = "favourite_categories")
class FavouriteCategoryEntity(
@@ -15,13 +12,4 @@ class FavouriteCategoryEntity(
@ColumnInfo(name = "sort_key") val sortKey: Int,
@ColumnInfo(name = "title") val title: String,
@ColumnInfo(name = "order") val order: String,
-) {
-
- fun toFavouriteCategory(id: Long? = null) = FavouriteCategory(
- id = id ?: categoryId.toLong(),
- title = title,
- sortKey = sortKey,
- order = SortOrder.values().find { x -> x.name == order } ?: SortOrder.NEWEST,
- createdAt = Date(createdAt),
- )
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
index cf7d0f8f9..9e5da45f7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
@@ -5,7 +5,7 @@ import androidx.sqlite.db.SimpleSQLiteQuery
import androidx.sqlite.db.SupportSQLiteQuery
import kotlinx.coroutines.flow.Flow
import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
@Dao
abstract class FavouritesDao {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 48d6a34aa..5cb19fda5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -6,36 +6,35 @@ import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
+import org.koitharu.kotatsu.core.db.entity.*
import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.SortOrder
import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
import org.koitharu.kotatsu.favourites.data.FavouriteEntity
+import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.utils.ext.mapItems
-import org.koitharu.kotatsu.utils.ext.mapToSet
class FavouritesRepository(private val db: MangaDatabase) {
suspend fun getAllManga(): List {
val entities = db.favouritesDao.findAll()
- return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
+ return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
}
fun observeAll(order: SortOrder): Flow> {
return db.favouritesDao.observeAll(order)
- .mapItems { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
+ .mapItems { it.manga.toManga(it.tags.toMangaTags()) }
}
suspend fun getManga(categoryId: Long): List {
val entities = db.favouritesDao.findAll(categoryId)
- return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
+ return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
}
fun observeAll(categoryId: Long, order: SortOrder): Flow> {
return db.favouritesDao.observeAll(categoryId, order)
- .mapItems { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
+ .mapItems { it.manga.toManga(it.tags.toMangaTags()) }
}
fun observeAll(categoryId: Long): Flow> {
@@ -43,21 +42,6 @@ class FavouritesRepository(private val db: MangaDatabase) {
.flatMapLatest { order -> observeAll(categoryId, order) }
}
- suspend fun getManga(categoryId: Long, offset: Int): List {
- val entities = db.favouritesDao.findAll(categoryId, offset, 20)
- return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
- }
-
- suspend fun getAllCategories(): List {
- val entities = db.favouriteCategoriesDao.findAll()
- return entities.map { it.toFavouriteCategory() }
- }
-
- suspend fun getCategories(mangaId: Long): List {
- val entities = db.favouritesDao.find(mangaId)?.categories
- return entities?.map { it.toFavouriteCategory() }.orEmpty()
- }
-
fun observeCategories(): Flow> {
return db.favouriteCategoriesDao.observeAll().mapItems {
it.toFavouriteCategory()
@@ -70,8 +54,8 @@ class FavouritesRepository(private val db: MangaDatabase) {
}.distinctUntilChanged()
}
- fun observeCategoriesIds(mangaId: Long): Flow> {
- return db.favouritesDao.observeIds(mangaId)
+ fun observeCategoriesIds(mangaId: Long): Flow> {
+ return db.favouritesDao.observeIds(mangaId).map { it.toSet() }
}
suspend fun addCategory(title: String): FavouriteCategory {
@@ -107,27 +91,37 @@ class FavouritesRepository(private val db: MangaDatabase) {
}
}
- suspend fun addToCategory(manga: Manga, categoryId: Long) {
- val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
+ suspend fun addToCategory(categoryId: Long, mangas: Collection) {
db.withTransaction {
- db.tagsDao.upsert(tags)
- db.mangaDao.upsert(MangaEntity.from(manga), tags)
- val entity = FavouriteEntity(manga.id, categoryId, System.currentTimeMillis())
- db.favouritesDao.insert(entity)
+ for (manga in mangas) {
+ val tags = manga.tags.toEntities()
+ db.tagsDao.upsert(tags)
+ db.mangaDao.upsert(manga.toEntity(), tags)
+ val entity = FavouriteEntity(manga.id, categoryId, System.currentTimeMillis())
+ db.favouritesDao.insert(entity)
+ }
}
}
- suspend fun removeFromCategory(manga: Manga, categoryId: Long) {
- db.favouritesDao.delete(categoryId, manga.id)
+ suspend fun removeFromFavourites(ids: Collection) {
+ db.withTransaction {
+ for (id in ids) {
+ db.favouritesDao.delete(id)
+ }
+ }
}
- suspend fun removeFromFavourites(manga: Manga) {
- db.favouritesDao.delete(manga.id)
+ suspend fun removeFromCategory(categoryId: Long, ids: Collection) {
+ db.withTransaction {
+ for (id in ids) {
+ db.favouritesDao.delete(categoryId, id)
+ }
+ }
}
private fun observeOrder(categoryId: Long): Flow {
return db.favouriteCategoriesDao.observe(categoryId)
- .map { x -> SortOrder.values().find { it.name == x.order } ?: SortOrder.NEWEST }
+ .map { x -> SortOrder(x.order, SortOrder.NEWEST) }
.distinctUntilChanged()
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index 096d26cfd..9fc69a228 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -2,33 +2,36 @@ package org.koitharu.kotatsu.favourites.ui
import android.os.Bundle
import android.view.*
+import androidx.appcompat.view.ActionMode
import androidx.core.graphics.Insets
+import androidx.core.view.children
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
+import java.util.*
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseFragment
+import org.koitharu.kotatsu.base.ui.util.ActionModeListener
import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.core.ui.titleRes
import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
import org.koitharu.kotatsu.main.ui.AppBarOwner
-import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
+import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
import org.koitharu.kotatsu.utils.ext.measureHeight
import org.koitharu.kotatsu.utils.ext.showPopupMenu
-import java.util.*
-class FavouritesContainerFragment : BaseFragment(),
- FavouritesTabLongClickListener, CategoriesEditDelegate.CategoriesEditCallback,
- RecycledViewPoolHolder {
-
- override val recycledViewPool = RecyclerView.RecycledViewPool()
+class FavouritesContainerFragment :
+ BaseFragment(),
+ FavouritesTabLongClickListener,
+ CategoriesEditDelegate.CategoriesEditCallback,
+ ActionModeListener {
private val viewModel by viewModel()
private val editDelegate by lazy(LazyThreadSafetyMode.NONE) {
@@ -55,6 +58,7 @@ class FavouritesContainerFragment : BaseFragment(),
binding.pager.adapter = adapter
pagerAdapter = adapter
TabLayoutMediator(binding.tabs, binding.pager, adapter).attach()
+ actionModeDelegate.addListener(this, viewLifecycleOwner)
viewModel.categories.observe(viewLifecycleOwner, ::onCategoriesChanged)
viewModel.onError.observe(viewLifecycleOwner, ::onError)
@@ -65,6 +69,16 @@ class FavouritesContainerFragment : BaseFragment(),
super.onDestroyView()
}
+ override fun onActionModeStarted(mode: ActionMode) {
+ binding.pager.isUserInputEnabled = false
+ binding.tabs.setTabsEnabled(false)
+ }
+
+ override fun onActionModeFinished(mode: ActionMode) {
+ binding.pager.isUserInputEnabled = true
+ binding.tabs.setTabsEnabled(true)
+ }
+
override fun onWindowInsetsChanged(insets: Insets) {
val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
binding.root.updatePadding(
@@ -103,10 +117,6 @@ class FavouritesContainerFragment : BaseFragment(),
else -> super.onOptionsItemSelected(item)
}
- override fun getTitle(): CharSequence? {
- return context?.getString(R.string.favourites)
- }
-
private fun onError(e: Throwable) {
Snackbar.make(binding.pager, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
}
@@ -154,18 +164,20 @@ class FavouritesContainerFragment : BaseFragment(),
private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
- val menuItem = submenu.add(
- R.id.group_order,
- Menu.NONE,
- i,
- item.titleRes
- )
+ val menuItem = submenu.add(R.id.group_order, Menu.NONE, i, item.titleRes)
menuItem.isCheckable = true
menuItem.isChecked = item == category.order
}
submenu.setGroupCheckable(R.id.group_order, true, true)
}
+ private fun TabLayout.setTabsEnabled(enabled: Boolean) {
+ val tabStrip = getChildAt(0) as? ViewGroup ?: return
+ for (tab in tabStrip.children) {
+ tab.isEnabled = enabled
+ }
+ }
+
companion object {
fun newInstance() = FavouritesContainerFragment()
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index 8a1076d37..c147351b0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -12,15 +12,15 @@ import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.divider.MaterialDividerItemDecoration
import com.google.android.material.snackbar.Snackbar
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.BaseActivity
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.core.ui.titleRes
import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
+import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
import org.koitharu.kotatsu.utils.ext.measureHeight
import org.koitharu.kotatsu.utils.ext.showPopupMenu
@@ -41,7 +41,6 @@ class CategoriesActivity : BaseActivity(),
supportActionBar?.setDisplayHomeAsUpEnabled(true)
adapter = CategoriesAdapter(this)
editDelegate = CategoriesEditDelegate(this, this)
- binding.recyclerView.addItemDecoration(MaterialDividerItemDecoration(this, RecyclerView.VERTICAL))
binding.recyclerView.setHasFixedSize(true)
binding.recyclerView.adapter = adapter
binding.fabAdd.setOnClickListener(this)
@@ -93,15 +92,6 @@ class CategoriesActivity : BaseActivity(),
right = insets.right,
bottom = 2 * insets.bottom + binding.fabAdd.measureHeight()
)
- with(binding.toolbar) {
- updatePadding(
- left = insets.left,
- right = insets.right
- )
- updateLayoutParams {
- topMargin = insets.top
- }
- }
}
private fun onCategoriesChanged(categories: List) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index a9202d749..c87e44c76 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.SortOrder
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
import java.util.*
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
index c1496aa4c..184c6cfe6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
@@ -2,31 +2,36 @@ package org.koitharu.kotatsu.favourites.ui.categories.select
import android.os.Bundle
import android.view.LayoutInflater
+import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
+import androidx.appcompat.widget.Toolbar
import androidx.fragment.app.FragmentManager
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.domain.MangaIntent
import org.koitharu.kotatsu.base.ui.BaseBottomSheet
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.model.withoutChapters
import org.koitharu.kotatsu.databinding.DialogFavoriteCategoriesBinding
import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
import org.koitharu.kotatsu.utils.ext.withArgs
-class FavouriteCategoriesDialog : BaseBottomSheet(),
- OnListItemClickListener, CategoriesEditDelegate.CategoriesEditCallback,
- View.OnClickListener {
+class FavouriteCategoriesDialog :
+ BaseBottomSheet(),
+ OnListItemClickListener,
+ CategoriesEditDelegate.CategoriesEditCallback,
+ Toolbar.OnMenuItemClickListener {
private val viewModel by viewModel {
- parametersOf(requireNotNull(arguments?.getParcelable(MangaIntent.KEY_MANGA)))
+ parametersOf(requireNotNull(arguments?.getParcelableArrayList(KEY_MANGA_LIST)).map { it.manga })
}
private var adapter: MangaCategoriesAdapter? = null
@@ -43,7 +48,7 @@ class FavouriteCategoriesDialog : BaseBottomSheet editDelegate.createCategory()
+ override fun onMenuItemClick(item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.action_create -> {
+ editDelegate.createCategory()
+ true
+ }
+ else -> false
}
}
@@ -83,10 +92,15 @@ class FavouriteCategoriesDialog : BaseBottomSheet) = FavouriteCategoriesDialog().withArgs(1) {
+ putParcelableArrayList(
+ KEY_MANGA_LIST,
+ manga.mapTo(ArrayList(manga.size)) { ParcelableManga(it.withoutChapters()) }
+ )
+ }.show(fm, TAG)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
index 3b900f34c..84f9cf8f9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
@@ -4,19 +4,20 @@ import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.combine
import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.model.ids
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
class MangaCategoriesViewModel(
- private val manga: Manga,
+ private val manga: List,
private val favouritesRepository: FavouritesRepository
) : BaseViewModel() {
val content = combine(
favouritesRepository.observeCategories(),
- favouritesRepository.observeCategoriesIds(manga.id)
+ observeCategoriesIds(),
) { all, checked ->
all.map {
MangaCategoryItem(
@@ -30,9 +31,9 @@ class MangaCategoriesViewModel(
fun setChecked(categoryId: Long, isChecked: Boolean) {
launchJob(Dispatchers.Default) {
if (isChecked) {
- favouritesRepository.addToCategory(manga, categoryId)
+ favouritesRepository.addToCategory(categoryId, manga)
} else {
- favouritesRepository.removeFromCategory(manga, categoryId)
+ favouritesRepository.removeFromCategory(categoryId, manga.ids())
}
}
}
@@ -42,4 +43,25 @@ class MangaCategoriesViewModel(
favouritesRepository.addCategory(name)
}
}
+
+ private fun observeCategoriesIds() = if (manga.size == 1) {
+ // Fast path
+ favouritesRepository.observeCategoriesIds(manga[0].id)
+ } else {
+ combine(
+ manga.map { favouritesRepository.observeCategoriesIds(it.id) }
+ ) { array ->
+ val result = HashSet()
+ var isFirst = true
+ for (ids in array) {
+ if (isFirst) {
+ result.addAll(ids)
+ isFirst = false
+ } else {
+ result.retainAll(ids.toSet())
+ }
+ }
+ result
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt
index c231cc2cd..c9ce1e8b2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemCategoryCheckableBinding
+import org.koitharu.kotatsu.databinding.ItemCheckableNewBinding
import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
fun mangaCategoryAD(
clickListener: OnListItemClickListener
-) = adapterDelegateViewBinding(
- { inflater, parent -> ItemCategoryCheckableBinding.inflate(inflater, parent, false) }
+) = adapterDelegateViewBinding(
+ { inflater, parent -> ItemCheckableNewBinding.inflate(inflater, parent, false) }
) {
itemView.setOnClickListener {
@@ -16,7 +16,7 @@ fun mangaCategoryAD(
}
bind {
- with(binding.checkedTextView) {
+ with(binding.root) {
text = item.name
isChecked = item.isChecked
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
index a78674817..1bfd8766a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
@@ -1,12 +1,11 @@
package org.koitharu.kotatsu.favourites.ui.list
import android.view.Menu
-import android.view.MenuInflater
import android.view.MenuItem
+import androidx.appcompat.view.ActionMode
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.list.ui.MangaListFragment
import org.koitharu.kotatsu.utils.ext.withArgs
@@ -23,17 +22,20 @@ class FavouritesListFragment : MangaListFragment() {
override fun onScrolledToEnd() = Unit
- override fun onCreatePopupMenu(inflater: MenuInflater, menu: Menu, data: Manga) {
- super.onCreatePopupMenu(inflater, menu, data)
- inflater.inflate(R.menu.popup_favourites, menu)
+ override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+ mode.menuInflater.inflate(R.menu.mode_favourites, menu)
+ return super.onCreateActionMode(mode, menu)
}
- override fun onPopupMenuItemSelected(item: MenuItem, data: Manga) = when (item.itemId) {
- R.id.action_remove -> {
- viewModel.removeFromFavourites(data)
- true
+ override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.action_remove -> {
+ viewModel.removeFromFavourites(selectedItemsIds)
+ mode.finish()
+ true
+ }
+ else -> super.onActionItemClicked(mode, item)
}
- else -> super.onPopupMenuItemSelected(item, data)
}
companion object {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
index 0cd5301a9..476fa6fb1 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
@@ -5,8 +5,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.combine
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.SortOrder
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
import org.koitharu.kotatsu.list.domain.CountersProvider
@@ -15,6 +13,7 @@ import org.koitharu.kotatsu.list.ui.model.EmptyState
import org.koitharu.kotatsu.list.ui.model.LoadingState
import org.koitharu.kotatsu.list.ui.model.toErrorState
import org.koitharu.kotatsu.list.ui.model.toUi
+import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.tracker.domain.TrackingRepository
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
@@ -56,12 +55,15 @@ class FavouritesListViewModel(
override fun onRetry() = Unit
- fun removeFromFavourites(manga: Manga) {
+ fun removeFromFavourites(ids: Set) {
+ if (ids.isEmpty()) {
+ return
+ }
launchJob {
if (categoryId == 0L) {
- repository.removeFromFavourites(manga)
+ repository.removeFromFavourites(ids)
} else {
- repository.removeFromCategory(manga, categoryId)
+ repository.removeFromCategory(categoryId, ids)
}
}
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/data/EntityMapping.kt b/app/src/main/java/org/koitharu/kotatsu/history/data/EntityMapping.kt
new file mode 100644
index 000000000..c03300b99
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/history/data/EntityMapping.kt
@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.history.data
+
+import java.util.*
+import org.koitharu.kotatsu.core.model.MangaHistory
+
+fun HistoryEntity.toMangaHistory() = MangaHistory(
+ createdAt = Date(createdAt),
+ updatedAt = Date(updatedAt),
+ chapterId = chapterId,
+ page = page,
+ scroll = scroll.toInt()
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryDao.kt b/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryDao.kt
index 0b973aa64..062e8d898 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryDao.kt
@@ -5,7 +5,6 @@ import kotlinx.coroutines.flow.Flow
import org.koitharu.kotatsu.core.db.entity.MangaEntity
import org.koitharu.kotatsu.core.db.entity.TagEntity
-
@Dao
abstract class HistoryDao {
@@ -23,8 +22,15 @@ abstract class HistoryDao {
@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM history)")
abstract suspend fun findAllManga(): List
- @Query("SELECT * FROM tags WHERE tag_id IN (SELECT tag_id FROM manga_tags WHERE manga_id IN (SELECT manga_id FROM history))")
- abstract suspend fun findAllTags(): List
+ @Query(
+ """SELECT tags.* FROM tags
+ LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
+ INNER JOIN history ON history.manga_id = manga_tags.manga_id
+ GROUP BY manga_tags.tag_id
+ ORDER BY COUNT(manga_tags.manga_id) DESC
+ LIMIT :limit"""
+ )
+ abstract suspend fun findPopularTags(limit: Int): List
@Query("SELECT * FROM history WHERE manga_id = :id")
abstract suspend fun find(id: Long): HistoryEntity?
@@ -32,6 +38,9 @@ abstract class HistoryDao {
@Query("SELECT * FROM history WHERE manga_id = :id")
abstract fun observe(id: Long): Flow
+ @Query("SELECT COUNT(*) FROM history")
+ abstract fun observeCount(): Flow
+
@Query("DELETE FROM history")
abstract suspend fun clear()
@@ -60,5 +69,4 @@ abstract class HistoryDao {
true
} else false
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryEntity.kt b/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryEntity.kt
index 770181595..24a487c60 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryEntity.kt
@@ -5,11 +5,10 @@ import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.PrimaryKey
import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.model.MangaHistory
-import java.util.*
@Entity(
- tableName = "history", foreignKeys = [
+ tableName = "history",
+ foreignKeys = [
ForeignKey(
entity = MangaEntity::class,
parentColumns = ["manga_id"],
@@ -26,13 +25,4 @@ class HistoryEntity(
@ColumnInfo(name = "chapter_id") val chapterId: Long,
@ColumnInfo(name = "page") val page: Int,
@ColumnInfo(name = "scroll") val scroll: Float,
-) {
-
- fun toMangaHistory() = MangaHistory(
- createdAt = Date(createdAt),
- updatedAt = Date(updatedAt),
- chapterId = chapterId,
- page = page,
- scroll = scroll.toInt()
- )
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryWithManga.kt b/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryWithManga.kt
index 55f41adc6..eda8c0010 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryWithManga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/data/HistoryWithManga.kt
@@ -19,5 +19,5 @@ class HistoryWithManga(
entityColumn = "tag_id",
associateBy = Junction(MangaTagsEntity::class)
)
- val tags: List
+ val tags: List,
)
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt b/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt
index c492e0e0b..a88c8a82d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/domain/HistoryRepository.kt
@@ -2,18 +2,18 @@ package org.koitharu.kotatsu.history.domain
import androidx.room.withTransaction
import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.db.entity.*
import org.koitharu.kotatsu.core.model.MangaHistory
-import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.history.data.toMangaHistory
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.tracker.domain.TrackingRepository
import org.koitharu.kotatsu.utils.ext.mapItems
-import org.koitharu.kotatsu.utils.ext.mapToSet
class HistoryRepository(
private val db: MangaDatabase,
@@ -23,20 +23,25 @@ class HistoryRepository(
suspend fun getList(offset: Int, limit: Int = 20): List {
val entities = db.historyDao.findAll(offset, limit)
- return entities.map { it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)) }
+ return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
+ }
+
+ suspend fun getLastOrNull(): Manga? {
+ val entity = db.historyDao.findAll(0, 1).firstOrNull() ?: return null
+ return entity.manga.toManga(entity.tags.toMangaTags())
}
fun observeAll(): Flow> {
return db.historyDao.observeAll().mapItems {
- it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag))
+ it.manga.toManga(it.tags.toMangaTags())
}
}
fun observeAllWithHistory(): Flow> {
return db.historyDao.observeAll().mapItems {
MangaWithHistory(
- it.manga.toManga(it.tags.mapToSet(TagEntity::toMangaTag)),
- it.history.toMangaHistory()
+ it.manga.toManga(it.tags.toMangaTags()),
+ it.history.toMangaHistory(),
)
}
}
@@ -47,14 +52,20 @@ class HistoryRepository(
}
}
+ fun observeHasItems(): Flow {
+ return db.historyDao.observeCount()
+ .map { it > 0 }
+ .distinctUntilChanged()
+ }
+
suspend fun addOrUpdate(manga: Manga, chapterId: Long, page: Int, scroll: Int) {
if (manga.isNsfw && settings.isHistoryExcludeNsfw) {
return
}
- val tags = manga.tags.map(TagEntity.Companion::fromMangaTag)
+ val tags = manga.tags.toEntities()
db.withTransaction {
db.tagsDao.upsert(tags)
- db.mangaDao.upsert(MangaEntity.from(manga), tags)
+ db.mangaDao.upsert(manga.toEntity(), tags)
db.historyDao.upsert(
HistoryEntity(
mangaId = manga.id,
@@ -62,7 +73,7 @@ class HistoryRepository(
updatedAt = System.currentTimeMillis(),
chapterId = chapterId,
page = page,
- scroll = scroll.toFloat() // we migrate to int, but decide to not update database
+ scroll = scroll.toFloat(), // we migrate to int, but decide to not update database
)
)
trackingRepository.upsert(manga)
@@ -81,17 +92,25 @@ class HistoryRepository(
db.historyDao.delete(manga.id)
}
+ suspend fun delete(ids: Collection) {
+ db.withTransaction {
+ for (id in ids) {
+ db.historyDao.delete(id)
+ }
+ }
+ }
+
/**
* Try to replace one manga with another one
* Useful for replacing saved manga on deleting it with remove source
*/
suspend fun deleteOrSwap(manga: Manga, alternative: Manga?) {
- if (alternative == null || db.mangaDao.update(MangaEntity.from(alternative)) <= 0) {
+ if (alternative == null || db.mangaDao.update(alternative.toEntity()) <= 0) {
db.historyDao.delete(manga.id)
}
}
- suspend fun getAllTags(): Set {
- return db.historyDao.findAllTags().mapToSet { x -> x.toMangaTag() }
+ suspend fun getPopularTags(limit: Int): List {
+ return db.historyDao.findPopularTags(limit).map { x -> x.toMangaTag() }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt b/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt
index 8b657599d..611dd1ded 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/domain/MangaWithHistory.kt
@@ -1,7 +1,7 @@
package org.koitharu.kotatsu.history.domain
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.parsers.model.Manga
data class MangaWithHistory(
val manga: Manga,
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
index 550fab1a5..bdc5cc5c2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
@@ -5,13 +5,11 @@ import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
+import androidx.appcompat.view.ActionMode
import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.utils.ext.ellipsize
class HistoryListFragment : MangaListFragment() {
@@ -20,7 +18,6 @@ class HistoryListFragment : MangaListFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- viewModel.onItemRemoved.observe(viewLifecycleOwner, ::onItemRemoved)
viewModel.isGroupingEnabled.observe(viewLifecycleOwner) {
activity?.invalidateOptionsMenu()
}
@@ -59,34 +56,22 @@ class HistoryListFragment : MangaListFragment() {
}
}
- override fun getTitle(): CharSequence? {
- return context?.getString(R.string.history)
+ override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+ mode.menuInflater.inflate(R.menu.mode_history, menu)
+ return super.onCreateActionMode(mode, menu)
}
- override fun onCreatePopupMenu(inflater: MenuInflater, menu: Menu, data: Manga) {
- super.onCreatePopupMenu(inflater, menu, data)
- inflater.inflate(R.menu.popup_history, menu)
- }
-
- override fun onPopupMenuItemSelected(item: MenuItem, data: Manga): Boolean {
+ override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
return when (item.itemId) {
R.id.action_remove -> {
- viewModel.removeFromHistory(data)
+ viewModel.removeFromHistory(selectedItemsIds)
+ mode.finish()
true
}
- else -> super.onPopupMenuItemSelected(item, data)
+ else -> super.onActionItemClicked(mode, item)
}
}
- private fun onItemRemoved(item: Manga) {
- Snackbar.make(
- binding.recyclerView, getString(
- R.string._s_removed_from_history,
- item.title.ellipsize(16)
- ), Snackbar.LENGTH_SHORT
- ).show()
- }
-
companion object {
fun newInstance() = HistoryListFragment()
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
index b37e01a3c..42dd81e95 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListViewModel.kt
@@ -2,10 +2,11 @@ package org.koitharu.kotatsu.history.ui
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.viewModelScope
+import java.util.*
+import java.util.concurrent.TimeUnit
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.core.os.ShortcutsRepository
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.prefs.ListMode
@@ -15,12 +16,9 @@ import org.koitharu.kotatsu.history.domain.MangaWithHistory
import org.koitharu.kotatsu.list.ui.MangaListViewModel
import org.koitharu.kotatsu.list.ui.model.*
import org.koitharu.kotatsu.tracker.domain.TrackingRepository
-import org.koitharu.kotatsu.utils.SingleLiveEvent
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
import org.koitharu.kotatsu.utils.ext.daysDiff
import org.koitharu.kotatsu.utils.ext.onFirst
-import java.util.*
-import java.util.concurrent.TimeUnit
class HistoryListViewModel(
private val repository: HistoryRepository,
@@ -29,7 +27,6 @@ class HistoryListViewModel(
private val trackingRepository: TrackingRepository,
) : MangaListViewModel(settings) {
- val onItemRemoved = SingleLiveEvent()
val isGroupingEnabled = MutableLiveData()
private val historyGrouping = settings.observe()
@@ -72,10 +69,12 @@ class HistoryListViewModel(
}
}
- fun removeFromHistory(manga: Manga) {
+ fun removeFromHistory(ids: Set) {
+ if (ids.isEmpty()) {
+ return
+ }
launchJob {
- repository.delete(manga)
- onItemRemoved.call(manga)
+ repository.delete(ids)
shortcutsRepository.updateShortcuts()
}
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt b/app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt
deleted file mode 100644
index 414a219db..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/list/domain/AvailableFilters.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.list.domain
-
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
-
-class AvailableFilters(
- val sortOrders: Set,
- val tags: Set,
-) {
-
- val size: Int
- get() = sortOrders.size + tags.size
-
- override fun equals(other: Any?): Boolean {
- if (this === other) return true
- if (javaClass != other?.javaClass) return false
- other as AvailableFilters
- if (sortOrders != other.sortOrders) return false
- if (tags != other.tags) return false
- return true
- }
-
- override fun hashCode(): Int {
- var result = sortOrders.hashCode()
- result = 31 * result + tags.hashCode()
- return result
- }
-
- fun isEmpty(): Boolean = sortOrders.isEmpty() && tags.isEmpty()
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index 70b2d8c93..d0f5f9d78 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -3,9 +3,11 @@ package org.koitharu.kotatsu.list.ui
import android.os.Bundle
import android.view.*
import androidx.annotation.CallSuper
-import androidx.appcompat.widget.PopupMenu
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
+import androidx.collection.ArraySet
import androidx.core.graphics.Insets
-import androidx.core.view.GravityCompat
+import androidx.core.view.isNotEmpty
import androidx.core.view.updatePadding
import androidx.recyclerview.widget.GridLayoutManager
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -20,26 +22,35 @@ import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
import org.koitharu.kotatsu.core.prefs.ListMode
import org.koitharu.kotatsu.databinding.FragmentListBinding
import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesDialog
import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
+import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter.Companion.ITEM_TYPE_MANGA_GRID
import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
import org.koitharu.kotatsu.main.ui.AppBarOwner
import org.koitharu.kotatsu.main.ui.MainActivity
-import org.koitharu.kotatsu.utils.RecycledViewPoolHolder
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.utils.ShareHelper
import org.koitharu.kotatsu.utils.ext.*
-abstract class MangaListFragment : BaseFragment(),
- PaginationScrollListener.Callback, MangaListListener,
- SwipeRefreshLayout.OnRefreshListener {
+abstract class MangaListFragment :
+ BaseFragment(),
+ PaginationScrollListener.Callback,
+ MangaListListener,
+ SwipeRefreshLayout.OnRefreshListener,
+ ActionMode.Callback {
private var listAdapter: MangaListAdapter? = null
private var paginationListener: PaginationScrollListener? = null
+ private var selectionDecoration: MangaSelectionDecoration? = null
+ private var actionMode: ActionMode? = null
private val spanResolver = MangaListSpanResolver()
private val spanSizeLookup = SpanSizeLookup()
private val listCommitCallback = Runnable {
@@ -49,6 +60,12 @@ abstract class MangaListFragment : BaseFragment(),
protected abstract val viewModel: MangaListViewModel
+ protected val selectedItemsIds: Set
+ get() = selectionDecoration?.checkedItemsIds?.toSet().orEmpty()
+
+ protected val selectedItems: Set
+ get() = collectSelectedItems()
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setHasOptionsMenu(true)
@@ -66,10 +83,12 @@ abstract class MangaListFragment : BaseFragment(),
lifecycleOwner = viewLifecycleOwner,
listener = this,
)
+ selectionDecoration = MangaSelectionDecoration(view.context)
paginationListener = PaginationScrollListener(4, this)
with(binding.recyclerView) {
setHasFixedSize(true)
adapter = listAdapter
+ addItemDecoration(selectionDecoration!!)
addOnScrollListener(paginationListener!!)
}
with(binding.swipeRefreshLayout) {
@@ -79,20 +98,17 @@ abstract class MangaListFragment : BaseFragment(),
isEnabled = isSwipeRefreshEnabled
}
- (parentFragment as? RecycledViewPoolHolder)?.let {
- binding.recyclerView.setRecycledViewPool(it.recycledViewPool)
- }
-
- viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
- viewModel.onError.observe(viewLifecycleOwner, ::onError)
- viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
viewModel.listMode.observe(viewLifecycleOwner, ::onListModeChanged)
viewModel.gridScale.observe(viewLifecycleOwner, ::onGridScaleChanged)
+ viewModel.isLoading.observe(viewLifecycleOwner, ::onLoadingStateChanged)
+ viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
+ viewModel.onError.observe(viewLifecycleOwner, ::onError)
}
override fun onDestroyView() {
listAdapter = null
paginationListener = null
+ selectionDecoration = null
spanSizeLookup.invalidateCache()
super.onDestroyView()
}
@@ -111,22 +127,28 @@ abstract class MangaListFragment : BaseFragment(),
}
override fun onItemClick(item: Manga, view: View) {
+ if (selectionDecoration?.checkedItemsCount != 0) {
+ selectionDecoration?.toggleItemChecked(item.id)
+ if (selectionDecoration?.checkedItemsCount == 0) {
+ actionMode?.finish()
+ } else {
+ actionMode?.invalidate()
+ binding.recyclerView.invalidateItemDecorations()
+ }
+ return
+ }
startActivity(DetailsActivity.newIntent(context ?: return, item))
}
override fun onItemLongClick(item: Manga, view: View): Boolean {
- val menu = PopupMenu(context ?: return false, view)
- onCreatePopupMenu(menu.menuInflater, menu.menu, item)
- return if (menu.menu.hasVisibleItems()) {
- menu.setOnMenuItemClickListener {
- onPopupMenuItemSelected(it, item)
- }
- menu.gravity = GravityCompat.END or Gravity.TOP
- menu.show()
- true
- } else {
- false
+ if (actionMode == null) {
+ actionMode = (activity as? AppCompatActivity)?.startSupportActionMode(this)
}
+ return actionMode?.also {
+ selectionDecoration?.setItemIsChecked(item.id, true)
+ binding.recyclerView.invalidateItemDecorations()
+ it.invalidate()
+ } != null
}
@CallSuper
@@ -152,7 +174,7 @@ abstract class MangaListFragment : BaseFragment(),
}
private fun resolveException(e: Throwable) {
- if (e is ResolvableException) {
+ if (ExceptionResolver.canResolve(e)) {
viewLifecycleScope.launch {
if (exceptionResolver.resolve(e)) {
viewModel.onRetry()
@@ -166,7 +188,7 @@ abstract class MangaListFragment : BaseFragment(),
@CallSuper
protected open fun onLoadingStateChanged(isLoading: Boolean) {
binding.swipeRefreshLayout.isEnabled = binding.swipeRefreshLayout.isRefreshing ||
- isSwipeRefreshEnabled && !isLoading
+ isSwipeRefreshEnabled && !isLoading
if (!isLoading) {
binding.swipeRefreshLayout.isRefreshing = false
}
@@ -176,17 +198,21 @@ abstract class MangaListFragment : BaseFragment(),
val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
binding.root.updatePadding(
left = insets.left,
- right = insets.right
+ right = insets.right,
)
if (activity is MainActivity) {
binding.recyclerView.updatePadding(
top = headerHeight,
- bottom = insets.bottom
+ bottom = insets.bottom,
)
binding.swipeRefreshLayout.setProgressViewOffset(
true,
headerHeight + resources.resolveDp(-72),
- headerHeight + resources.resolveDp(10)
+ headerHeight + resources.resolveDp(10),
+ )
+ } else {
+ binding.recyclerView.updatePadding(
+ bottom = insets.bottom,
)
}
}
@@ -236,12 +262,67 @@ abstract class MangaListFragment : BaseFragment(),
addOnLayoutChangeListener(spanResolver)
}
}
+ selectionDecoration?.let { addItemDecoration(it) }
}
}
- protected open fun onCreatePopupMenu(inflater: MenuInflater, menu: Menu, data: Manga) = Unit
+ override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+ return menu.isNotEmpty()
+ }
- protected open fun onPopupMenuItemSelected(item: MenuItem, data: Manga) = false
+ @CallSuper
+ override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+ mode.title = selectionDecoration?.checkedItemsCount?.toString()
+ return true
+ }
+
+ override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.action_select_all -> {
+ val ids = listAdapter?.items?.mapNotNull {
+ (it as? MangaItemModel)?.id
+ } ?: return false
+ selectionDecoration?.checkAll(ids)
+ binding.recyclerView.invalidateItemDecorations()
+ mode.invalidate()
+ true
+ }
+ R.id.action_share -> {
+ ShareHelper(requireContext()).shareMangaLinks(selectedItems)
+ mode.finish()
+ true
+ }
+ R.id.action_favourite -> {
+ FavouriteCategoriesDialog.show(childFragmentManager, selectedItems)
+ mode.finish()
+ true
+ }
+ R.id.action_save -> {
+ DownloadService.confirmAndStart(requireContext(), selectedItems)
+ mode.finish()
+ true
+ }
+ else -> false
+ }
+ }
+
+ override fun onDestroyActionMode(mode: ActionMode) {
+ selectionDecoration?.clearSelection()
+ binding.recyclerView.invalidateItemDecorations()
+ actionMode = null
+ }
+
+ private fun collectSelectedItems(): Set {
+ val checkedIds = selectionDecoration?.checkedItemsIds ?: return emptySet()
+ val items = listAdapter?.items ?: return emptySet()
+ val result = ArraySet(checkedIds.size)
+ for (item in items) {
+ if (item is MangaItemModel && item.id in checkedIds) {
+ result.add(item.manga)
+ }
+ }
+ return result
+ }
private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup() {
@@ -254,7 +335,7 @@ abstract class MangaListFragment : BaseFragment(),
val total =
(binding.recyclerView.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
return when (listAdapter?.getItemViewType(position)) {
- MangaListAdapter.ITEM_TYPE_MANGA_GRID -> 1
+ ITEM_TYPE_MANGA_GRID -> 1
else -> total
}
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
index 6a04449b6..20f768c2f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListViewModel.kt
@@ -6,10 +6,13 @@ import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.prefs.ListMode
import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.MangaGridModel
+import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
+import org.koitharu.kotatsu.list.ui.model.MangaListModel
+import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
abstract class MangaListViewModel(
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
new file mode 100644
index 000000000..939d5b256
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
@@ -0,0 +1,71 @@
+package org.koitharu.kotatsu.list.ui
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.view.View
+import androidx.cardview.widget.CardView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_ID
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.list.ui.model.MangaItemModel
+import org.koitharu.kotatsu.utils.ext.getItem
+import org.koitharu.kotatsu.utils.ext.getThemeColor
+import com.google.android.material.R as materialR
+
+class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecoration() {
+
+ private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+ private val checkIcon = ContextCompat.getDrawable(context, materialR.drawable.ic_mtrl_checked_circle)
+ private val iconOffset = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing_outer)
+ private val strokeColor = context.getThemeColor(materialR.attr.colorPrimary, Color.RED)
+ private val fillColor = ColorUtils.setAlphaComponent(
+ ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
+ 0x74
+ )
+
+ init {
+ hasBackground = false
+ hasForeground = true
+ isIncludeDecorAndMargins = false
+
+ paint.strokeWidth = context.resources.getDimension(R.dimen.selection_stroke_width)
+ checkIcon?.setTint(strokeColor)
+ }
+
+ override fun getItemId(parent: RecyclerView, child: View): Long {
+ val holder = parent.getChildViewHolder(child) ?: return NO_ID
+ val item = holder.getItem() ?: return NO_ID
+ return item.id
+ }
+
+ override fun onDrawForeground(
+ canvas: Canvas,
+ parent: RecyclerView,
+ child: View,
+ bounds: RectF,
+ state: RecyclerView.State,
+ ) {
+ val radius = (child as? CardView)?.radius ?: 0f
+ paint.color = fillColor
+ paint.style = Paint.Style.FILL
+ canvas.drawRoundRect(bounds, radius, radius, paint)
+ paint.color = strokeColor
+ paint.style = Paint.Style.STROKE
+ canvas.drawRoundRect(bounds, radius, radius, paint)
+ checkIcon?.run {
+ setBounds(
+ (bounds.left + iconOffset).toInt(),
+ (bounds.top + iconOffset).toInt(),
+ (bounds.left + iconOffset + intrinsicWidth).toInt(),
+ (bounds.top + iconOffset + intrinsicHeight).toInt(),
+ )
+ draw(canvas)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
index 5508f9f9c..86b72c738 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/CurrentFilterAD.kt
@@ -3,9 +3,9 @@ package org.koitharu.kotatsu.list.ui.adapter
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.widgets.ChipsView
-import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.list.ui.model.CurrentFilterModel
import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaTag
fun currentFilterAD(
listener: MangaListListener,
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
index df322b010..ec44f2ab9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
@@ -4,6 +4,7 @@ import android.widget.TextView
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.titleRes
import org.koitharu.kotatsu.databinding.ItemHeaderWithFilterBinding
import org.koitharu.kotatsu.list.ui.model.ListHeader
import org.koitharu.kotatsu.list.ui.model.ListModel
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
index 002281c70..ced1697b0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
@@ -8,10 +8,10 @@ import com.google.android.material.badge.BadgeDrawable
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.databinding.ItemMangaGridBinding
import org.koitharu.kotatsu.list.ui.model.ListModel
import org.koitharu.kotatsu.list.ui.model.MangaGridModel
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.enqueueWith
import org.koitharu.kotatsu.utils.ext.newImageRequest
import org.koitharu.kotatsu.utils.ext.referer
@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.utils.ext.referer
fun mangaGridItemAD(
coil: ImageLoader,
lifecycleOwner: LifecycleOwner,
- clickListener: OnListItemClickListener
+ clickListener: OnListItemClickListener,
) = adapterDelegateViewBinding(
{ inflater, parent -> ItemMangaGridBinding.inflate(inflater, parent, false) }
) {
@@ -52,6 +52,7 @@ fun mangaGridItemAD(
itemView.clearBadge(badge)
badge = null
imageRequest?.dispose()
+ imageRequest = null
CoilUtils.clear(binding.imageViewCover)
binding.imageViewCover.setImageDrawable(null)
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
index 5c801760d..2b359a8a9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt
@@ -16,14 +16,8 @@ class MangaListAdapter(
init {
delegatesManager
- .addDelegate(
- ITEM_TYPE_MANGA_LIST,
- mangaListItemAD(coil, lifecycleOwner, listener)
- )
- .addDelegate(
- ITEM_TYPE_MANGA_LIST_DETAILED,
- mangaListDetailedItemAD(coil, lifecycleOwner, listener)
- )
+ .addDelegate(ITEM_TYPE_MANGA_LIST, mangaListItemAD(coil, lifecycleOwner, listener))
+ .addDelegate(ITEM_TYPE_MANGA_LIST_DETAILED, mangaListDetailedItemAD(coil, lifecycleOwner, listener))
.addDelegate(ITEM_TYPE_MANGA_GRID, mangaGridItemAD(coil, lifecycleOwner, listener))
.addDelegate(ITEM_TYPE_LOADING_FOOTER, loadingFooterAD())
.addDelegate(ITEM_TYPE_LOADING_STATE, loadingStateAD())
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
index 042540184..10e9a473d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
@@ -8,10 +8,10 @@ import com.google.android.material.badge.BadgeDrawable
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.databinding.ItemMangaListDetailsBinding
import org.koitharu.kotatsu.list.ui.model.ListModel
import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.enqueueWith
import org.koitharu.kotatsu.utils.ext.newImageRequest
import org.koitharu.kotatsu.utils.ext.referer
@@ -20,7 +20,7 @@ import org.koitharu.kotatsu.utils.ext.textAndVisible
fun mangaListDetailedItemAD(
coil: ImageLoader,
lifecycleOwner: LifecycleOwner,
- clickListener: OnListItemClickListener
+ clickListener: OnListItemClickListener,
) = adapterDelegateViewBinding(
{ inflater, parent -> ItemMangaListDetailsBinding.inflate(inflater, parent, false) }
) {
@@ -56,6 +56,7 @@ fun mangaListDetailedItemAD(
itemView.clearBadge(badge)
badge = null
imageRequest?.dispose()
+ imageRequest = null
CoilUtils.clear(binding.imageViewCover)
binding.imageViewCover.setImageDrawable(null)
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
index 0a17d4bc5..18696de6b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
@@ -8,10 +8,10 @@ import com.google.android.material.badge.BadgeDrawable
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.databinding.ItemMangaListBinding
import org.koitharu.kotatsu.list.ui.model.ListModel
import org.koitharu.kotatsu.list.ui.model.MangaListModel
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.ext.enqueueWith
import org.koitharu.kotatsu.utils.ext.newImageRequest
import org.koitharu.kotatsu.utils.ext.referer
@@ -20,7 +20,7 @@ import org.koitharu.kotatsu.utils.ext.textAndVisible
fun mangaListItemAD(
coil: ImageLoader,
lifecycleOwner: LifecycleOwner,
- clickListener: OnListItemClickListener
+ clickListener: OnListItemClickListener,
) = adapterDelegateViewBinding(
{ inflater, parent -> ItemMangaListBinding.inflate(inflater, parent, false) }
) {
@@ -54,6 +54,7 @@ fun mangaListItemAD(
itemView.clearBadge(badge)
badge = null
imageRequest?.dispose()
+ imageRequest = null
CoilUtils.clear(binding.imageViewCover)
binding.imageViewCover.setImageDrawable(null)
}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt
index 5b372f2f8..d9cc8d8e4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListListener.kt
@@ -1,8 +1,8 @@
package org.koitharu.kotatsu.list.ui.adapter
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaTag
interface MangaListListener : OnListItemClickListener {
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt
index 8898c5d07..e34b5ad94 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterAdapterDelegates.kt
@@ -5,14 +5,14 @@ import androidx.core.view.isVisible
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ItemCheckableMultipleBinding
-import org.koitharu.kotatsu.databinding.ItemCheckableSingleBinding
+import org.koitharu.kotatsu.core.ui.titleRes
+import org.koitharu.kotatsu.databinding.ItemCheckableNewBinding
import org.koitharu.kotatsu.databinding.ItemFilterHeaderBinding
fun filterSortDelegate(
listener: OnFilterChangedListener,
-) = adapterDelegateViewBinding(
- { layoutInflater, parent -> ItemCheckableSingleBinding.inflate(layoutInflater, parent, false) }
+) = adapterDelegateViewBinding(
+ { layoutInflater, parent -> ItemCheckableNewBinding.inflate(layoutInflater, parent, false) }
) {
itemView.setOnClickListener {
@@ -27,8 +27,8 @@ fun filterSortDelegate(
fun filterTagDelegate(
listener: OnFilterChangedListener,
-) = adapterDelegateViewBinding(
- { layoutInflater, parent -> ItemCheckableMultipleBinding.inflate(layoutInflater, parent, false) }
+) = adapterDelegateViewBinding(
+ { layoutInflater, parent -> ItemCheckableNewBinding.inflate(layoutInflater, parent, false) }
) {
itemView.setOnClickListener {
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
index 8e6075362..acba2466c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
@@ -9,8 +9,8 @@ import kotlinx.coroutines.flow.*
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.domain.MangaDataRepository
-import org.koitharu.kotatsu.core.model.MangaTag
import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
import java.util.*
@@ -20,7 +20,7 @@ class FilterCoordinator(
private val coroutineScope: CoroutineScope,
) : OnFilterChangedListener {
- private val currentState = MutableStateFlow(FilterState(repository.sortOrders.firstOrNull(), emptySet()))
+ private val currentState = MutableStateFlow(FilterState(repository.defaultSortOrder, emptySet()))
private var searchQuery = MutableStateFlow("")
private val localTagsDeferred = coroutineScope.async(Dispatchers.Default, CoroutineStart.LAZY) {
dataRepository.findTags(repository.source)
@@ -38,6 +38,7 @@ class FilterCoordinator(
currentState.update { oldValue ->
FilterState(item.order, oldValue.tags)
}
+ repository.defaultSortOrder = item.order
}
override fun onTagItemClick(item: FilterItem.Tag) {
@@ -59,6 +60,12 @@ class FilterCoordinator(
}
}
+ fun setTags(tags: Set) {
+ currentState.update { oldValue ->
+ FilterState(oldValue.sortOrder, tags)
+ }
+ }
+
fun reset() {
currentState.update { oldValue ->
FilterState(oldValue.sortOrder, emptySet())
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt
index c9819304d..bbef939cb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterItem.kt
@@ -1,8 +1,8 @@
package org.koitharu.kotatsu.list.ui.filter
import androidx.annotation.StringRes
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
sealed interface FilterItem {
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt
index fdb42a261..d9e387b89 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterState.kt
@@ -1,15 +1,12 @@
package org.koitharu.kotatsu.list.ui.filter
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
-@Parcelize
class FilterState(
val sortOrder: SortOrder?,
val tags: Set,
-) : Parcelable {
+) {
override fun equals(other: Any?): Boolean {
if (this === other) return true
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
index a14db0f3a..94f13444c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
@@ -1,7 +1,7 @@
package org.koitharu.kotatsu.list.ui.model
import androidx.annotation.StringRes
-import org.koitharu.kotatsu.core.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder
data class ListHeader(
val text: CharSequence?,
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
index 749e38369..0d9de41f3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
@@ -1,12 +1,13 @@
package org.koitharu.kotatsu.list.ui.model
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
import org.koitharu.kotatsu.core.prefs.ListMode
import org.koitharu.kotatsu.list.domain.CountersProvider
+import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.ifZero
fun Manga.toListModel(counter: Int) = MangaListModel(
id = id,
@@ -21,7 +22,7 @@ fun Manga.toListDetailedModel(counter: Int) = MangaListDetailedModel(
id = id,
title = title,
subtitle = altTitle,
- rating = if (rating == Manga.NO_RATING) null else String.format("%.1f", rating * 5),
+ rating = if (hasRating) String.format("%.1f", rating * 5) else null,
tags = tags.joinToString(", ") { it.title },
coverUrl = coverUrl,
manga = this,
@@ -76,7 +77,7 @@ fun Throwable.toErrorState(canRetry: Boolean = true) = ErrorState(
exception = this,
icon = getErrorIcon(this),
canRetry = canRetry,
- buttonText = (this as? ResolvableException)?.resolveTextId ?: R.string.try_again
+ buttonText = ExceptionResolver.getResolveStringId(this).ifZero { R.string.try_again }
)
fun Throwable.toErrorFooter() = ErrorFooter(
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
index 3ba8b6b37..9575d82fd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaGridModel.kt
@@ -1,11 +1,11 @@
package org.koitharu.kotatsu.list.ui.model
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
data class MangaGridModel(
- val id: Long,
+ override val id: Long,
val title: String,
val coverUrl: String,
- val manga: Manga,
+ override val manga: Manga,
val counter: Int,
-) : ListModel
\ No newline at end of file
+) : MangaItemModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt
new file mode 100644
index 000000000..64a4f66ae
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaItemModel.kt
@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.list.ui.model
+
+import org.koitharu.kotatsu.parsers.model.Manga
+
+sealed interface MangaItemModel : ListModel {
+
+ val id: Long
+ val manga: Manga
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
index 73735224c..c1cedeb24 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListDetailedModel.kt
@@ -1,14 +1,14 @@
package org.koitharu.kotatsu.list.ui.model
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
data class MangaListDetailedModel(
- val id: Long,
+ override val id: Long,
val title: String,
val subtitle: String?,
val tags: String,
val coverUrl: String,
val rating: String?,
- val manga: Manga,
+ override val manga: Manga,
val counter: Int,
-) : ListModel
\ No newline at end of file
+) : MangaItemModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
index 603f6b197..7533858eb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/model/MangaListModel.kt
@@ -1,12 +1,12 @@
package org.koitharu.kotatsu.list.ui.model
-import org.koitharu.kotatsu.core.model.Manga
+import org.koitharu.kotatsu.parsers.model.Manga
data class MangaListModel(
- val id: Long,
+ override val id: Long,
val title: String,
val subtitle: String,
val coverUrl: String,
- val manga: Manga,
+ override val manga: Manga,
val counter: Int,
-) : ListModel
\ No newline at end of file
+) : MangaItemModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
index 9b5b87822..cda2dbad6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
@@ -2,20 +2,19 @@ package org.koitharu.kotatsu.local
import org.koin.android.ext.koin.androidContext
import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.core.qualifier.named
import org.koin.dsl.module
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.local.data.LocalStorageManager
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
import org.koitharu.kotatsu.local.ui.LocalListViewModel
+import org.koitharu.kotatsu.utils.ExternalStorageHelper
val localModule
get() = module {
single { LocalStorageManager(androidContext(), get()) }
single { LocalMangaRepository(get()) }
- factory(named(MangaSource.LOCAL)) { get() }
+
+ factory { ExternalStorageHelper(androidContext()) }
viewModel { LocalListViewModel(get(), get(), get(), get()) }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
index 791e9985a..f7d1a8aaf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
@@ -3,11 +3,12 @@ package org.koitharu.kotatsu.local.data
import org.json.JSONArray
import org.json.JSONObject
import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.MangaTag
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
+import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
class MangaIndex(source: String?) {
@@ -24,6 +25,7 @@ class MangaIndex(source: String?) {
json.put("description", manga.description)
json.put("rating", manga.rating)
json.put("nsfw", manga.isNsfw)
+ json.put("state", manga.state?.name)
json.put("source", manga.source.name)
json.put("cover_large", manga.largeCoverUrl)
json.put("tags", JSONArray().also { a ->
@@ -55,8 +57,11 @@ class MangaIndex(source: String?) {
rating = json.getDouble("rating").toFloat(),
isNsfw = json.getBooleanOrDefault("nsfw", false),
coverUrl = json.getString("cover"),
+ state = json.getStringOrNull("state")?.let { stateString ->
+ MangaState.values().find { it.name == stateString }
+ },
description = json.getStringOrNull("description"),
- tags = json.getJSONArray("tags").mapToSet { x ->
+ tags = json.getJSONArray("tags").mapJSONToSet { x ->
MangaTag(
title = x.getString("title").toTitleCase(),
key = x.getString("key"),
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
index 533c619a8..0aacb4ee7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
@@ -2,10 +2,10 @@ package org.koitharu.kotatsu.local.data
import androidx.annotation.CheckResult
import androidx.annotation.WorkerThread
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.util.toFileNameSafe
import org.koitharu.kotatsu.utils.ext.takeIfReadable
-import org.koitharu.kotatsu.utils.ext.toFileNameSafe
import java.io.File
@WorkerThread
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
index dd0782493..bf0da97f9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
@@ -3,8 +3,8 @@ package org.koitharu.kotatsu.local.data
import android.content.Context
import com.tomclaw.cache.DiskLruCache
import kotlinx.coroutines.flow.MutableStateFlow
+import org.koitharu.kotatsu.parsers.util.longHashCode
import org.koitharu.kotatsu.utils.FileSize
-import org.koitharu.kotatsu.utils.ext.longHashCode
import org.koitharu.kotatsu.utils.ext.subdir
import org.koitharu.kotatsu.utils.ext.takeIfReadable
import java.io.File
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index 04adc71f8..c6137a485 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -10,14 +10,18 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runInterruptible
import kotlinx.coroutines.withContext
import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
-import org.koitharu.kotatsu.core.model.*
import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.local.data.CbzFilter
import org.koitharu.kotatsu.local.data.LocalStorageManager
import org.koitharu.kotatsu.local.data.MangaIndex
import org.koitharu.kotatsu.local.data.MangaZip
+import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.util.longHashCode
+import org.koitharu.kotatsu.parsers.util.toCamelCase
import org.koitharu.kotatsu.utils.AlphanumComparator
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.deleteAwait
+import org.koitharu.kotatsu.utils.ext.readText
+import org.koitharu.kotatsu.utils.ext.resolveName
import java.io.File
import java.io.IOException
import java.util.*
@@ -29,7 +33,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
override val source = MangaSource.LOCAL
private val filenameFilter = CbzFilter()
- override suspend fun getList2(
+ override suspend fun getList(
offset: Int,
query: String?,
tags: Set?,
@@ -42,9 +46,13 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
return files.mapNotNull { x -> runCatching { getFromFile(x) }.getOrNull() }
}
- override suspend fun getDetails(manga: Manga) = if (manga.chapters == null) {
- getFromFile(Uri.parse(manga.url).toFile())
- } else manga
+ override suspend fun getDetails(manga: Manga) = when {
+ manga.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)) {
+ "Manga is not local or saved"
+ }
+ manga.chapters == null -> getFromFile(Uri.parse(manga.url).toFile())
+ else -> manga
+ }
override suspend fun getPages(chapter: MangaChapter): List {
return runInterruptible(Dispatchers.IO){
@@ -93,17 +101,15 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
val index = entry?.let(zip::readText)?.let(::MangaIndex)
val info = index?.getMangaInfo()
if (index != null && info != null) {
- return info.copy(
+ return info.copy2(
source = MangaSource.LOCAL,
url = fileUri,
coverUrl = zipUri(
file,
- entryName = index.getCoverEntry()
- ?: findFirstEntry(zip.entries(), isImage = true)?.name.orEmpty()
+ entryName = index.getCoverEntry() ?: findFirstImageEntry(zip.entries())?.name.orEmpty()
),
chapters = info.chapters?.map { c ->
- c.copy(url = fileUri,
- source = MangaSource.LOCAL)
+ c.copy(url = fileUri, source = MangaSource.LOCAL)
}
)
}
@@ -122,7 +128,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
url = fileUri,
publicUrl = fileUri,
source = MangaSource.LOCAL,
- coverUrl = zipUri(file, findFirstEntry(zip.entries(), isImage = true)?.name.orEmpty()),
+ coverUrl = zipUri(file, findFirstImageEntry(zip.entries())?.name.orEmpty()),
chapters = chapters.sortedWith(AlphanumComparator()).mapIndexed { i, s ->
MangaChapter(
id = "$i$s".longHashCode(),
@@ -134,7 +140,15 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
scanlator = null,
branch = null,
)
- }
+ },
+ altTitle = null,
+ rating = -1f,
+ isNsfw = false,
+ tags = setOf(),
+ state = null,
+ author = null,
+ largeCoverUrl = null,
+ description = null,
)
}
@@ -162,7 +176,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
val info = index.getMangaInfo() ?: continue
if (info.id == remoteManga.id) {
val fileUri = file.toUri().toString()
- return@runInterruptible info.copy(
+ return@runInterruptible info.copy2(
source = MangaSource.LOCAL,
url = fileUri,
chapters = info.chapters?.map { c -> c.copy(url = fileUri) }
@@ -173,21 +187,16 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
}
}
- private fun zipUri(file: File, entryName: String) =
- Uri.fromParts("cbz", file.path, entryName).toString()
+ private fun zipUri(file: File, entryName: String) = "cbz://${file.path}#$entryName"
- private fun findFirstEntry(entries: Enumeration, isImage: Boolean): ZipEntry? {
+ private fun findFirstImageEntry(entries: Enumeration): ZipEntry? {
val list = entries.toList()
.filterNot { it.isDirectory }
.sortedWith(compareBy(AlphanumComparator()) { x -> x.name })
- return if (isImage) {
- val map = MimeTypeMap.getSingleton()
- list.firstOrNull {
- map.getMimeTypeFromExtension(it.name.substringAfterLast('.'))
- ?.startsWith("image/") == true
- }
- } else {
- list.firstOrNull()
+ val map = MimeTypeMap.getSingleton()
+ return list.firstOrNull {
+ map.getMimeTypeFromExtension(it.name.substringAfterLast('.'))
+ ?.startsWith("image/") == true
}
}
@@ -231,4 +240,41 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
private suspend fun getAllFiles() = storageManager.getReadableDirs().flatMap { dir ->
dir.listFiles(filenameFilter)?.toList().orEmpty()
}
+
+ private fun Manga.copy2(
+ url: String = this.url,
+ coverUrl: String = this.coverUrl,
+ chapters: List? = this.chapters,
+ source: MangaSource = this.source,
+ ) = Manga(
+ id = id,
+ title = title,
+ altTitle = altTitle,
+ url = url,
+ publicUrl = publicUrl,
+ rating = rating,
+ isNsfw = isNsfw,
+ coverUrl = coverUrl,
+ tags = tags,
+ state = state,
+ author = author,
+ largeCoverUrl = largeCoverUrl,
+ description = description,
+ chapters = chapters,
+ source = source,
+ )
+
+ private fun MangaChapter.copy(
+ url: String = this.url,
+ source: MangaSource = this.source,
+ ) = MangaChapter(
+ id = id,
+ name = name,
+ number = number,
+ url = url,
+ scanlator = scanlator,
+ uploadDate = uploadDate,
+ branch = branch,
+ source = source,
+ )
}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
index e30120259..4e5115ac8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListFragment.kt
@@ -9,15 +9,17 @@ import android.view.MenuItem
import android.view.View
import androidx.activity.result.ActivityResultCallback
import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.view.ActionMode
+import androidx.core.net.toFile
+import androidx.core.net.toUri
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.download.ui.service.DownloadService
import org.koitharu.kotatsu.list.ui.MangaListFragment
-import org.koitharu.kotatsu.utils.ext.ellipsize
+import org.koitharu.kotatsu.utils.ShareHelper
import org.koitharu.kotatsu.utils.progress.Progress
class LocalListFragment : MangaListFragment(), ActivityResultCallback> {
@@ -46,7 +48,7 @@ class LocalListFragment : MangaListFragment(), ActivityResultCallback) {
if (result.isEmpty()) return
viewModel.importFiles(result)
}
- override fun onCreatePopupMenu(inflater: MenuInflater, menu: Menu, data: Manga) {
- super.onCreatePopupMenu(inflater, menu, data)
- inflater.inflate(R.menu.popup_local, menu)
+ override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+ mode.menuInflater.inflate(R.menu.mode_local, menu)
+ return super.onCreateActionMode(mode, menu)
}
- override fun onPopupMenuItemSelected(item: MenuItem, data: Manga): Boolean {
+ override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
return when (item.itemId) {
- R.id.action_delete -> {
- MaterialAlertDialogBuilder(context ?: return false)
- .setTitle(R.string.delete_manga)
- .setMessage(getString(R.string.text_delete_local_manga, data.title))
- .setPositiveButton(R.string.delete) { _, _ ->
- viewModel.delete(data)
- }
- .setNegativeButton(android.R.string.cancel, null)
- .show()
+ R.id.action_remove -> {
+ showDeletionConfirm(selectedItemsIds, mode)
true
}
- else -> super.onPopupMenuItemSelected(item, data)
+ R.id.action_share -> {
+ val files = selectedItems.map { it.url.toUri().toFile() }
+ ShareHelper(requireContext()).shareCbz(files)
+ mode.finish()
+ true
+ }
+ else -> super.onActionItemClicked(mode, item)
}
}
- private fun onItemRemoved(item: Manga) {
- Snackbar.make(
- binding.recyclerView, getString(
- R.string._s_deleted_from_local_storage,
- item.title.ellipsize(16)
- ), Snackbar.LENGTH_SHORT
- ).show()
+ private fun showDeletionConfirm(ids: Set, mode: ActionMode) {
+ MaterialAlertDialogBuilder(context ?: return)
+ .setTitle(R.string.delete_manga)
+ .setMessage(getString(R.string.text_delete_local_manga_batch))
+ .setPositiveButton(R.string.delete) { _, _ ->
+ viewModel.delete(ids)
+ mode.finish()
+ }
+ .setNegativeButton(android.R.string.cancel, null)
+ .show()
+ }
+
+ private fun onItemRemoved() {
+ Snackbar.make(binding.recyclerView, R.string.removal_completed, Snackbar.LENGTH_SHORT).show()
}
private fun onImportProgressChanged(progress: Progress?) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
index 1050475c2..f4568b23f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
@@ -3,23 +3,24 @@ package org.koitharu.kotatsu.local.ui
import android.net.Uri
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.viewModelScope
+import java.io.IOException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.withContext
import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.core.os.ShortcutsRepository
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.history.domain.HistoryRepository
import org.koitharu.kotatsu.list.ui.MangaListViewModel
import org.koitharu.kotatsu.list.ui.model.*
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.utils.SingleLiveEvent
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
import org.koitharu.kotatsu.utils.progress.Progress
-import java.io.IOException
class LocalListViewModel(
private val repository: LocalMangaRepository,
@@ -28,7 +29,7 @@ class LocalListViewModel(
private val shortcutsRepository: ShortcutsRepository,
) : MangaListViewModel(settings) {
- val onMangaRemoved = SingleLiveEvent()
+ val onMangaRemoved = SingleLiveEvent()
val importProgress = MutableLiveData(null)
private val listError = MutableStateFlow(null)
private val mangaList = MutableStateFlow?>(null)
@@ -87,25 +88,30 @@ class LocalListViewModel(
}
}
- fun delete(manga: Manga) {
- launchJob {
+ fun delete(ids: Set