From eeb0f76ccea755d87ec214bccd276fa8467759b2 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 14 Aug 2020 18:28:02 -0400 Subject: [PATCH] Cleanup --- .../kanade/tachiyomi/source/online/LewdSource.kt | 16 ++++++---------- .../metadata/metadata/EHentaiSearchMetadata.kt | 4 ++-- .../metadata/metadata/HitomiSearchMetadata.kt | 1 - .../metadata/metadata/TsuminoSearchMetadata.kt | 2 -- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/LewdSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/LewdSource.kt index f7e957e12..1a3e36610 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/LewdSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/LewdSource.kt @@ -55,8 +55,7 @@ interface LewdSource : CatalogueSource { Single.fromCallable { db.getFlatMetadataForManga(mangaId).executeAsBlocking() }.map { - if (it != null) it.raise(metaClass) - else newMetaInstance() + it?.raise(metaClass) ?: newMetaInstance() } } else { Single.just(newMetaInstance()) @@ -115,14 +114,11 @@ interface LewdSource : CatalogueSource { fun Source.isLewdSource() = (this is LewdSource<*, *> || (this is EnhancedHttpSource && this.enhancedSource is LewdSource<*, *>)) fun Source.getLewdSource(): LewdSource<*, *>? { - return if (!this.isLewdSource()) { - null - } else if (this is LewdSource<*, *>) { - this - } else if (this is EnhancedHttpSource && this.enhancedSource is LewdSource<*, *>) { - this.enhancedSource - } else { - null + return when { + !this.isLewdSource() -> null + this is LewdSource<*, *> -> this + this is EnhancedHttpSource && this.enhancedSource is LewdSource<*, *> -> this.enhancedSource + else -> null } } } diff --git a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt index a92c76e39..77701d229 100644 --- a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt @@ -154,9 +154,9 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { pathSegments.filterNot(String::isNullOrBlank) } - fun galleryId(url: String) = splitGalleryUrl(url)[1] + fun galleryId(url: String): String = splitGalleryUrl(url)[1] - fun galleryToken(url: String) = + fun galleryToken(url: String): String = splitGalleryUrl(url)[2] fun normalizeUrl(url: String) = diff --git a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt index 098ca68de..9c60ec289 100644 --- a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt @@ -120,7 +120,6 @@ class HitomiSearchMetadata : RaisedSearchMetadata() { const val TAG_TYPE_DEFAULT = 0 - const val LTN_BASE_URL = "https://ltn.hitomi.la" const val BASE_URL = "https://hitomi.la" fun hlIdFromUrl(url: String) = diff --git a/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt index 203d4e405..cced84702 100644 --- a/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt @@ -115,8 +115,6 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() { fun tmIdFromUrl(url: String) = Uri.parse(url).lastPathSegment - fun mangaUrlFromId(id: String) = "/Book/Info/$id" - fun thumbUrlFromId(id: String) = "/thumbs/$id/1" } }