From 93fe927de2dd83bbce4dfb36621233a2d99519d6 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 9 May 2021 18:42:29 -0400 Subject: [PATCH] Cleanup some delegation --- .../kanade/tachiyomi/source/online/all/Hitomi.kt | 14 ++++++++------ .../kanade/tachiyomi/source/online/all/NHentai.kt | 2 +- .../kanade/tachiyomi/source/online/all/PervEden.kt | 2 +- .../tachiyomi/source/online/english/EightMuses.kt | 2 +- .../tachiyomi/source/online/english/HBrowse.kt | 2 +- .../tachiyomi/source/online/english/Pururin.kt | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt index 4342b5d59..a0076b62b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt @@ -56,9 +56,9 @@ class Hitomi(delegate: HttpSource, val context: Context) : artists = galleryElement.select("h2 a").map { it.text() } tags += artists.map { RaisedTag("artist", it, RaisedSearchMetadata.TAG_TYPE_VIRTUAL) } - input.select(".gallery-info tr").forEach { - val content = it.child(1) - when (it.child(0).text().toLowerCase()) { + input.select(".gallery-info tr").forEach { galleryInfoElement -> + val content = galleryInfoElement.child(1) + when (galleryInfoElement.child(0).text().toLowerCase()) { "group" -> { group = content.text() tags += RaisedTag("group", group!!, RaisedSearchMetadata.TAG_TYPE_VIRTUAL) @@ -91,9 +91,11 @@ class Hitomi(delegate: HttpSource, val context: Context) : } "tags" -> { tags += content.select("a").map { - val ns = if (it.attr("href").startsWith("/tag/male")) "male" - else if (it.attr("href").startsWith("/tag/female")) "female" - else "misc" + val ns = when { + it.attr("href").startsWith("/tag/male") -> "male" + it.attr("href").startsWith("/tag/female") -> "female" + else -> "misc" + } RaisedTag( ns, it.text().dropLast(if (ns == "misc") 0 else 2), diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt index 4705be925..615c1f395 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt @@ -55,7 +55,7 @@ class NHentai(delegate: HttpSource, val context: Context) : } override suspend fun parseIntoMetadata(metadata: NHentaiSearchMetadata, input: Response) { - val json = GALLERY_JSON_REGEX.find(input.body!!.string())!!.groupValues[1].replace( + val json = GALLERY_JSON_REGEX.find(input.body?.string().orEmpty())!!.groupValues[1].replace( UNICODE_ESCAPE_REGEX ) { it.groupValues[1].toInt(radix = 16).toChar().toString() } val jsonResponse = jsonParser.decodeFromString(json) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt index 16ebdf403..8ccce05d2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt @@ -125,7 +125,7 @@ class PervEden(delegate: HttpSource, val context: Context) : } } - override suspend fun mapUrlToMangaUrl(uri: Uri): String? { + override suspend fun mapUrlToMangaUrl(uri: Uri): String { val newUri = "http://www.perveden.com/".toUri().buildUpon() uri.pathSegments.take(3).forEach { newUri.appendPath(it) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt index a4ccc897a..8de6a735d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt @@ -89,7 +89,7 @@ class EightMuses(delegate: HttpSource, val context: Context) : "8muses.com" ) - override suspend fun mapUrlToMangaUrl(uri: Uri): String? { + override suspend fun mapUrlToMangaUrl(uri: Uri): String { var path = uri.pathSegments.drop(2) if (uri.pathSegments[1].toLowerCase() == "picture") { path = path.dropLast(1) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt index ad5883eb8..c31ecfd6c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt @@ -80,7 +80,7 @@ class HBrowse(delegate: HttpSource, val context: Context) : ) override suspend fun mapUrlToMangaUrl(uri: Uri): String? { - return "/${uri.pathSegments.first()}/c00001/" + return uri.pathSegments.firstOrNull()?.let { "/$it/c00001/" } } override fun getDescriptionAdapter(controller: MangaController): HBrowseDescriptionAdapter { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt index 11af91ca3..de90c081a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt @@ -62,7 +62,7 @@ class Pururin(delegate: HttpSource, val context: Context) : val parsedSelfLink = selfLink.attr("href").toUri().pathSegments with(metadata) { - prId = parsedSelfLink[parsedSelfLink.lastIndex - 1].toIntOrNull() + prId = parsedSelfLink[parsedSelfLink.lastIndex - 1].toInt() prShortLink = parsedSelfLink.last() val contentWrapper = input.selectFirst(".content-wrapper") @@ -112,7 +112,7 @@ class Pururin(delegate: HttpSource, val context: Context) : ) override suspend fun mapUrlToMangaUrl(uri: Uri): String { - return "${PururinSearchMetadata.BASE_URL}/gallery/${uri.pathSegments[1]}/${uri.lastPathSegment}" + return "${PururinSearchMetadata.BASE_URL}/gallery/${uri.pathSegments.getOrNull(1)}/${uri.lastPathSegment}" } override fun getDescriptionAdapter(controller: MangaController): PururinDescriptionAdapter {