Cleanup

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? {
+    fun parseHumanReadableByteCount(bytes: String): Double? {
-        val spaceNdx = arg0.indexOf(" ")
+        val ret = bytes.substringBefore(' ').toDouble()
-        val ret = java.lang.Double.parseDouble(arg0.substring(0, spaceNdx))
+        return when (bytes.substringAfter(' ')) {
-        when (arg0.substring(spaceNdx + 1)) {
+            "GB" -> ret * GB_FACTOR
-            "GB" -> return ret * GB_FACTOR
+            "GiB" -> ret * GIB_FACTOR
-            "GiB" -> return ret * GIB_FACTOR
+            "MB" -> ret * MB_FACTOR
-            "MB" -> return ret * MB_FACTOR
+            "MiB" -> ret * MIB_FACTOR
-            "MiB" -> return ret * MIB_FACTOR
+            "KB" -> ret * KB_FACTOR
-            "KB" -> return ret * KB_FACTOR
+            "KiB" -> ret * KIB_FACTOR
-            "KiB" -> return ret * KIB_FACTOR
+            else -> null
         }
-        return null
     }
 
     val ONGOING_SUFFIX = arrayOf(

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 {
+        tags.filter { it.namespace == EH_ARTIST_NAMESPACE }.let { tags ->
-            if (it.isNotEmpty()) manga.artist = it.joinToString(transform = { it.name })
+            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
+        manga.description = "meta"
-        /* 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")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt

@@ -29,14 +29,7 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() {
 
         manga.genre = tagsToGenreString()
 
-        /*val titleDesc = StringBuilder()
+        manga.description = "meta"
-        title?.let { titleDesc += "Title: $it\n" }
-
-        val tagsDesc = tagsToDescription()*/
-
-        manga.description = "meta" /*listOf(titleDesc.toString(), tagsDesc.toString())
-            .filter(String::isNotBlank)
-            .joinToString(separator = "\n")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt

@@ -37,15 +37,7 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
 
         manga.genre = tagsToGenreString()
 
-        /*val titleDesc = StringBuilder()
+        manga.description = "meta"
-        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")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

app/src/main/java/exh/metadata/metadata/HentaiCafeSearchMetadata.kt

@@ -36,14 +36,7 @@ class HentaiCafeSearchMetadata : RaisedSearchMetadata() {
 
         manga.genre = tagsToGenreString()
 
-        /* val detailsDesc = "Title: $title\n" +
+        manga.description = "meta"
-            "Artist: $artist\n"
-
-        val tagsDesc = tagsToDescription()*/
-
-        manga.description = "meta" /*listOf(detailsDesc, tagsDesc.toString())
-            .filter(String::isNotBlank)
-            .joinToString(separator = "\n")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt

@@ -51,45 +51,7 @@ class HitomiSearchMetadata : RaisedSearchMetadata() {
 
         manga.status = SManga.UNKNOWN
 
-        /*val titleDesc = StringBuilder()
+        manga.description = "meta"
-
-        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")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

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 {
+        tags.filter { it.namespace == NHENTAI_ARTIST_NAMESPACE }.let { tags ->
-            if (it.isNotEmpty()) manga.artist = it.joinToString(transform = { it.name })
+            if (tags.isNotEmpty()) manga.artist = tags.joinToString(transform = { it.name })
         }
 
         // Copy tags -> genres

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()
+        manga.description = "meta"
-
-        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")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt

@@ -45,21 +45,7 @@ class PururinSearchMetadata : RaisedSearchMetadata() {
 
         manga.genre = tagsToGenreString()
 
-        /*val titleDesc = StringBuilder()
+        manga.description = "meta"
-        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")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {

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"
+        manga.description = "meta"
-
-        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")*/
     }
 
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {