Use more core-ktx

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
@@ -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('/')
}
@@ -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()
@@ -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"
}