Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use more core-ktx

Browse Source
This commit is contained in:
Jobobby04 2020-11-21 16:24:16 -05:00
parent 2bece67f6e
commit 1e98b09f24
9 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt
View File

@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.source.online.all
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage
@ -45,7 +46,7 @@ class PervEden(delegate: HttpSource, val context: Context) :
override fun parseIntoMetadata(metadata: PervEdenSearchMetadata, input: Document) {
with(metadata) {
url = Uri.parse(input.location()).path
url = input.location().toUri().path
pvId = PervEdenSearchMetadata.pvIdFromUrl(url!!)
@ -129,7 +130,7 @@ class PervEden(delegate: HttpSource, val context: Context) :
}
override fun mapUrlToMangaUrl(uri: Uri): String? {
val newUri = Uri.parse("http://www.perveden.com/").buildUpon()
val newUri = "http://www.perveden.com/".toUri().buildUpon()
uri.pathSegments.take(3).forEach {
newUri.appendPath(it)
}

3
app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt
View File

@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage
@ -58,7 +59,7 @@ class EightMuses(delegate: HttpSource, val context: Context) :
override fun parseIntoMetadata(metadata: EightMusesSearchMetadata, input: Document) {
with(metadata) {
path = Uri.parse(input.location()).pathSegments
path = input.location().toUri().pathSegments
val breadcrumbs = input.selectFirst(".top-menu-breadcrumb > ol")

7
app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt
View File

@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage
@ -60,7 +61,7 @@ class Pururin(delegate: HttpSource, val context: Context) :
override fun parseIntoMetadata(metadata: PururinSearchMetadata, input: Document) {
val selfLink = input.select("[itemprop=name]").last().parent()
val parsedSelfLink = Uri.parse(selfLink.attr("href")).pathSegments
val parsedSelfLink = selfLink.attr("href").toUri().pathSegments
with(metadata) {
prId = parsedSelfLink[parsedSelfLink.lastIndex - 1].toIntOrNull()
@ -89,11 +90,11 @@ class Pururin(delegate: HttpSource, val context: Context) :
}
"uploader" -> {
uploaderDisp = value.text()
uploader = Uri.parse(value.child(0).attr("href")).lastPathSegment
uploader = value.child(0).attr("href").toUri().lastPathSegment
}
else -> {
value.select("a").forEach { link ->
val searchUrl = Uri.parse(link.attr("href"))
val searchUrl = link.attr("href").toUri()
val namespace = searchUrl.pathSegments[searchUrl.pathSegments.lastIndex - 2]
tags += RaisedTag(
namespace,

5
app/src/main/java/exh/GalleryAdder.kt
View File

@ -2,6 +2,7 @@ package exh
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import com.elvishew.xlog.XLog
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.DatabaseHelper
@ -23,7 +24,7 @@ class GalleryAdder {
private val sourceManager: SourceManager by injectLazy()
fun pickSource(url: String): List<UrlImportableSource> {
val uri = Uri.parse(url)
val uri = url.toUri()
return sourceManager.getVisibleCatalogueSources()
.map { it.getMainSource() }
.filterIsInstance<UrlImportableSource>()
@ -45,7 +46,7 @@ class GalleryAdder {
): GalleryAddEvent {
XLog.d(context.getString(R.string.gallery_adder_importing_manga, url, fav.toString(), forceSource))
try {
val uri = Uri.parse(url)
val uri = url.toUri()
// Find matching source
val source = if (forceSource != null) {

2
app/src/main/java/exh/debug/SettingsDebugController.kt
View File

@ -31,7 +31,7 @@ class SettingsDebugController : SettingsController() {
it.visibility == KVisibility.PUBLIC
}.forEach {
preference {
title = it.name.replace(Regex("(.)(\\p{Upper})"), "$1 $2").toLowerCase(Locale.getDefault()).capitalize(Locale.getDefault())
title = it.name.replace("(.)(\\p{Upper})".toRegex(), "$1 $2").toLowerCase(Locale.getDefault()).capitalize(Locale.getDefault())
isPersistent = false
onClick {

5
app/src/main/java/exh/md/utils/MdUtil.kt
View File

@ -1,5 +1,6 @@
package exh.md.utils
import androidx.core.net.toUri
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager
@ -268,8 +269,8 @@ fun SManga.setMDUrlWithoutDomain(url: String) {
*/
private fun getMDUrlWithoutDomain(orig: String): String {
return try {
val uri = URI(orig)
var out = uri.path
val uri = orig.toUri()
var out = uri.path.orEmpty()
if (uri.query != null) {
out += "?" + uri.query
}

3
app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt
View File

@ -2,6 +2,7 @@ package exh.metadata.metadata
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.model.SManga
@ -148,7 +149,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
url.let {
// Only parse URL if is full URL
val pathSegments = if (it.startsWith("http")) {
Uri.parse(it).pathSegments
it.toUri().pathSegments
} else {
it.split('/')
}

3
app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt
View File

@ -2,6 +2,7 @@ package exh.metadata.metadata
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import exh.metadata.metadata.base.RaisedSearchMetadata
@ -119,7 +120,7 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
private fun splitGalleryUrl(url: String) =
url.let {
Uri.parse(it).pathSegments.filterNot(String::isNullOrBlank)
it.toUri().pathSegments.filterNot(String::isNullOrBlank)
}
fun pvIdFromUrl(url: String): String = splitGalleryUrl(url).last()

4
app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt
View File

@ -2,6 +2,7 @@ package exh.metadata.metadata
import android.content.Context
import android.net.Uri
import androidx.core.net.toUri
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import exh.metadata.MetadataUtil
@ -114,8 +115,7 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
val TSUMINO_DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd", Locale.US)
fun tmIdFromUrl(url: String) =
Uri.parse(url).lastPathSegment
fun tmIdFromUrl(url: String) = url.toUri().lastPathSegment
fun thumbUrlFromId(id: String) = "/thumbs/$id/1"
}