Update parsers
This commit is contained in:
@@ -66,7 +66,7 @@ android {
|
|||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
|
||||||
implementation('com.github.nv95:kotatsu-parsers:05a93e2380') {
|
implementation('com.github.nv95:kotatsu-parsers:f46c5add46') {
|
||||||
exclude group: 'org.json', module: 'json'
|
exclude group: 'org.json', module: 'json'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ dependencies {
|
|||||||
implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
|
implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
|
||||||
|
|
||||||
implementation 'io.insert-koin:koin-android:3.2.0'
|
implementation 'io.insert-koin:koin-android:3.2.0'
|
||||||
implementation 'io.coil-kt:coil-base:2.0.0'
|
implementation 'io.coil-kt:coil-base:2.1.0'
|
||||||
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
|
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
|
||||||
implementation 'com.github.solkin:disk-lru-cache:1.4'
|
implementation 'com.github.solkin:disk-lru-cache:1.4'
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ package org.koitharu.kotatsu.core.db.entity
|
|||||||
import java.util.*
|
import java.util.*
|
||||||
import org.koitharu.kotatsu.core.model.TrackingLogItem
|
import org.koitharu.kotatsu.core.model.TrackingLogItem
|
||||||
import org.koitharu.kotatsu.parsers.model.*
|
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.mapToSet
|
||||||
import org.koitharu.kotatsu.parsers.util.toTitleCase
|
import org.koitharu.kotatsu.parsers.util.toTitleCase
|
||||||
|
import org.koitharu.kotatsu.utils.ext.longHashCode
|
||||||
|
|
||||||
// Entity to model
|
// Entity to model
|
||||||
|
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.local.data
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.tomclaw.cache.DiskLruCache
|
import com.tomclaw.cache.DiskLruCache
|
||||||
import java.io.File
|
|
||||||
import java.io.InputStream
|
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import org.koitharu.kotatsu.parsers.util.longHashCode
|
|
||||||
import org.koitharu.kotatsu.utils.FileSize
|
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.subdir
|
||||||
import org.koitharu.kotatsu.utils.ext.takeIfReadable
|
import org.koitharu.kotatsu.utils.ext.takeIfReadable
|
||||||
|
import java.io.File
|
||||||
|
import java.io.InputStream
|
||||||
|
|
||||||
class PagesCache(context: Context) {
|
class PagesCache(context: Context) {
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,11 @@ import org.koitharu.kotatsu.local.data.LocalStorageManager
|
|||||||
import org.koitharu.kotatsu.local.data.MangaIndex
|
import org.koitharu.kotatsu.local.data.MangaIndex
|
||||||
import org.koitharu.kotatsu.local.data.TempFileFilter
|
import org.koitharu.kotatsu.local.data.TempFileFilter
|
||||||
import org.koitharu.kotatsu.parsers.model.*
|
import org.koitharu.kotatsu.parsers.model.*
|
||||||
import org.koitharu.kotatsu.parsers.util.longHashCode
|
|
||||||
import org.koitharu.kotatsu.parsers.util.toCamelCase
|
import org.koitharu.kotatsu.parsers.util.toCamelCase
|
||||||
import org.koitharu.kotatsu.utils.AlphanumComparator
|
import org.koitharu.kotatsu.utils.AlphanumComparator
|
||||||
import org.koitharu.kotatsu.utils.CompositeMutex
|
import org.koitharu.kotatsu.utils.CompositeMutex
|
||||||
import org.koitharu.kotatsu.utils.ext.deleteAwait
|
import org.koitharu.kotatsu.utils.ext.deleteAwait
|
||||||
|
import org.koitharu.kotatsu.utils.ext.longHashCode
|
||||||
import org.koitharu.kotatsu.utils.ext.readText
|
import org.koitharu.kotatsu.utils.ext.readText
|
||||||
import org.koitharu.kotatsu.utils.ext.resolveName
|
import org.koitharu.kotatsu.utils.ext.resolveName
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
|
|||||||
|
|
||||||
fun Manga.filterChapters(branch: String?): Manga {
|
fun Manga.filterChapters(branch: String?): Manga {
|
||||||
if (chapters.isNullOrEmpty()) return this
|
if (chapters.isNullOrEmpty()) return this
|
||||||
return copy(chapters = chapters?.filter { it.branch == branch })
|
return withChapters(chapters = chapters?.filter { it.branch == branch })
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun Manga.copy(chapters: List<MangaChapter>?) = Manga(
|
private fun Manga.withChapters(chapters: List<MangaChapter>?) = Manga(
|
||||||
id = id,
|
id = id,
|
||||||
title = title,
|
title = title,
|
||||||
altTitle = altTitle,
|
altTitle = altTitle,
|
||||||
|
|||||||
@@ -3,3 +3,12 @@ package org.koitharu.kotatsu.utils.ext
|
|||||||
inline fun String?.ifNullOrEmpty(defaultValue: () -> String): String {
|
inline fun String?.ifNullOrEmpty(defaultValue: () -> String): String {
|
||||||
return if (this.isNullOrEmpty()) defaultValue() else this
|
return if (this.isNullOrEmpty()) defaultValue() else this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun String.longHashCode(): Long {
|
||||||
|
var h = 1125899906842597L
|
||||||
|
val len: Int = this.length
|
||||||
|
for (i in 0 until len) {
|
||||||
|
h = 31 * h + this[i].code
|
||||||
|
}
|
||||||
|
return h
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user