From d302a0fbc7e9671411bcaf748f7639218da529f7 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 20 Dec 2020 18:41:38 -0500 Subject: [PATCH] Cleanup --- .../main/java/exh/metadata/MetadataUtil.kt | 21 +++++----- .../metadata/EHentaiSearchMetadata.kt | 34 ++-------------- .../metadata/EightMusesSearchMetadata.kt | 9 +---- .../metadata/HBrowseSearchMetadata.kt | 10 +---- .../metadata/HentaiCafeSearchMetadata.kt | 9 +---- .../metadata/metadata/HitomiSearchMetadata.kt | 40 +------------------ .../metadata/NHentaiSearchMetadata.kt | 4 +- .../metadata/PervEdenSearchMetadata.kt | 36 +---------------- .../metadata/PururinSearchMetadata.kt | 16 +------- .../metadata/TsuminoSearchMetadata.kt | 27 +------------ 10 files changed, 22 insertions(+), 184 deletions(-) diff --git a/app/src/main/java/exh/metadata/MetadataUtil.kt b/app/src/main/java/exh/metadata/MetadataUtil.kt index 25a6df1fa..ced4b258b 100755 --- a/app/src/main/java/exh/metadata/MetadataUtil.kt +++ b/app/src/main/java/exh/metadata/MetadataUtil.kt @@ -35,18 +35,17 @@ object MetadataUtil { private const val GB_FACTOR = 1000 * MB_FACTOR private const val GIB_FACTOR = 1024 * MIB_FACTOR - fun parseHumanReadableByteCount(arg0: String): Double? { - val spaceNdx = arg0.indexOf(" ") - val ret = java.lang.Double.parseDouble(arg0.substring(0, spaceNdx)) - when (arg0.substring(spaceNdx + 1)) { - "GB" -> return ret * GB_FACTOR - "GiB" -> return ret * GIB_FACTOR - "MB" -> return ret * MB_FACTOR - "MiB" -> return ret * MIB_FACTOR - "KB" -> return ret * KB_FACTOR - "KiB" -> return ret * KIB_FACTOR + fun parseHumanReadableByteCount(bytes: String): Double? { + val ret = bytes.substringBefore(' ').toDouble() + return when (bytes.substringAfter(' ')) { + "GB" -> ret * GB_FACTOR + "GiB" -> ret * GIB_FACTOR + "MB" -> ret * MB_FACTOR + "MiB" -> ret * MIB_FACTOR + "KB" -> ret * KB_FACTOR + "KiB" -> ret * KIB_FACTOR + else -> null } - return null } val ONGOING_SUFFIX = arrayOf( diff --git a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt index 23b29ef86..8a141a271 100644 --- a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt @@ -59,8 +59,8 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { titleObj?.let { manga.title = it } // Set artist (if we can find one) - tags.filter { it.namespace == EH_ARTIST_NAMESPACE }.let { - if (it.isNotEmpty()) manga.artist = it.joinToString(transform = { it.name }) + tags.filter { it.namespace == EH_ARTIST_NAMESPACE }.let { tags -> + if (tags.isNotEmpty()) manga.artist = tags.joinToString(transform = { it.name }) } // Copy tags -> genres @@ -77,35 +77,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { } } - // Build a nice looking description out of what we know - /* val titleDesc = StringBuilder() - title?.let { titleDesc += "Title: $it\n" } - altTitle?.let { titleDesc += "Alternate Title: $it\n" } - - val detailsDesc = StringBuilder() - genre?.let { detailsDesc += "Genre: $it\n" } - uploader?.let { detailsDesc += "Uploader: $it\n" } - datePosted?.let { detailsDesc += "Posted: ${EX_DATE_FORMAT.format(Date(it))}\n" } - visible?.let { detailsDesc += "Visible: $it\n" } - language?.let { - detailsDesc += "Language: $it" - if (translated == true) detailsDesc += " TR" - detailsDesc += "\n" - } - size?.let { detailsDesc += "File size: ${humanReadableByteCount(it, true)}\n" } - length?.let { detailsDesc += "Length: $it pages\n" } - favorites?.let { detailsDesc += "Favorited: $it times\n" } - averageRating?.let { - detailsDesc += "Rating: $it" - ratingCount?.let { detailsDesc += " ($it)" } - detailsDesc += "\n" - } - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc.toString(), detailsDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt index c440259d6..446efe4e9 100644 --- a/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt @@ -29,14 +29,7 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() { manga.genre = tagsToGenreString() - /*val titleDesc = StringBuilder() - title?.let { titleDesc += "Title: $it\n" } - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt index 637d09cae..3d6788af5 100644 --- a/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt @@ -37,15 +37,7 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() { manga.genre = tagsToGenreString() - /*val titleDesc = StringBuilder() - title?.let { titleDesc += "Title: $it\n" } - length?.let { titleDesc += "Length: $it page(s)\n" } - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/HentaiCafeSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HentaiCafeSearchMetadata.kt index 3cb97a152..b8568207e 100644 --- a/app/src/main/java/exh/metadata/metadata/HentaiCafeSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/HentaiCafeSearchMetadata.kt @@ -36,14 +36,7 @@ class HentaiCafeSearchMetadata : RaisedSearchMetadata() { manga.genre = tagsToGenreString() - /* val detailsDesc = "Title: $title\n" + - "Artist: $artist\n" - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(detailsDesc, tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt index 4522fdd05..c35fa888b 100644 --- a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt @@ -51,45 +51,7 @@ class HitomiSearchMetadata : RaisedSearchMetadata() { manga.status = SManga.UNKNOWN - /*val titleDesc = StringBuilder() - - title?.let { - titleDesc += "Title: $it\n" - } - - val detailsDesc = StringBuilder() - - detailsDesc += "Artist(s): ${manga.artist}\n" - - group?.let { - detailsDesc += "Group: $it\n" - } - - type?.let { - detailsDesc += "Type: ${it.capitalize()}\n" - } - - (language ?: "unknown").let { - detailsDesc += "Language: ${it.capitalize()}\n" - } - - if (series.isNotEmpty()) { - detailsDesc += "Series: ${series.joinToString()}\n" - } - - if (characters.isNotEmpty()) { - detailsDesc += "Characters: ${characters.joinToString()}\n" - } - - uploadDate?.let { - detailsDesc += "Upload date: ${EX_DATE_FORMAT.format(Date(it))}\n" - } - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc.toString(), detailsDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt index 4103b034b..37e2562a5 100644 --- a/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt @@ -53,8 +53,8 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() { } // Set artist (if we can find one) - tags.filter { it.namespace == NHENTAI_ARTIST_NAMESPACE }.let { - if (it.isNotEmpty()) manga.artist = it.joinToString(transform = { it.name }) + tags.filter { it.namespace == NHENTAI_ARTIST_NAMESPACE }.let { tags -> + if (tags.isNotEmpty()) manga.artist = tags.joinToString(transform = { it.name }) } // Copy tags -> genres diff --git a/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt index 6179bb0e2..fb8c769f4 100644 --- a/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt @@ -56,41 +56,7 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() { // Copy tags -> genres manga.genre = tagsToGenreString() - /*val titleDesc = StringBuilder() - - title?.let { - titleDesc += "Title: $it\n" - } - if (altTitles.isNotEmpty()) { - titleDesc += "Alternate Titles: \n" + altTitles - .joinToString(separator = "\n", postfix = "\n") { - "▪ $it" - } - } - - val detailsDesc = StringBuilder() - artist?.let { - detailsDesc += "Artist: $it\n" - } - - type?.let { - detailsDesc += "Type: $it\n" - } - - status?.let { - detailsDesc += "Status: $it\n" - } - - rating?.let { - detailsDesc += "Rating: %.2\n".format(it) - } - - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc.toString(), detailsDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt index 5b6e42723..3e848879c 100644 --- a/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt @@ -45,21 +45,7 @@ class PururinSearchMetadata : RaisedSearchMetadata() { manga.genre = tagsToGenreString() - /*val titleDesc = StringBuilder() - title?.let { titleDesc += "English Title: $it\n" } - altTitle?.let { titleDesc += "Japanese Title: $it\n" } - - val detailsDesc = StringBuilder() - (uploaderDisp ?: uploader)?.let { detailsDesc += "Uploader: $it\n" } - pages?.let { detailsDesc += "Length: $it pages\n" } - fileSize?.let { detailsDesc += "Size: $it\n" } - ratingCount?.let { detailsDesc += "Rating: $averageRating ($ratingCount)\n" } - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc.toString(), detailsDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> { diff --git a/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt index a68c51502..7cbff0176 100644 --- a/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt @@ -52,32 +52,7 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() { // Copy tags -> genres manga.genre = tagsToGenreString() - /*val titleDesc = "Title: $title\n" - - val detailsDesc = StringBuilder() - uploader?.let { detailsDesc += "Uploader: $it\n" } - uploadDate?.let { detailsDesc += "Uploaded: ${EX_DATE_FORMAT.format(Date(it))}\n" } - length?.let { detailsDesc += "Length: $it pages\n" } - ratingString?.let { detailsDesc += "Rating: $it\n" } - category?.let { - detailsDesc += "Category: $it\n" - } - collection?.let { detailsDesc += "Collection: $it\n" } - group?.let { detailsDesc += "Group: $it\n" } - val parodiesString = parody.joinToString() - if (parodiesString.isNotEmpty()) { - detailsDesc += "Parody: $parodiesString\n" - } - val charactersString = character.joinToString() - if (charactersString.isNotEmpty()) { - detailsDesc += "Character: $charactersString\n" - } - - val tagsDesc = tagsToDescription()*/ - - manga.description = "meta" /*listOf(titleDesc, detailsDesc.toString(), tagsDesc.toString()) - .filter(String::isNotBlank) - .joinToString(separator = "\n")*/ + manga.description = "meta" } override fun getExtraInfoPairs(context: Context): List> {