From 9bb31fca23be60122a1b77602ce3e64bfabf304f Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Wed, 25 Oct 2023 00:03:04 -0300
Subject: [PATCH] refactor: Fix more codefactor issues

---
 .../animeshouse/src/extractors/JsUnpacker.kt  |  2 +-
 .../animeextension/all/jellyfin/Jellyfin.kt   | 91 +++++++++----------
 .../animeextension/all/kamyroll/Yomiroll.kt   | 42 ++++-----
 .../anime4up/extractors/MoshahdaExtractor.kt  | 33 -------
 .../animeextension/ar/okanime/Okanime.kt      |  2 +-
 .../de/moflixstream/MoflixStream.kt           |  2 +-
 .../animeextension/en/putlocker/JSONUtil.java | 91 -------------------
 .../animeextension/en/putlocker/JSONUtil.kt   | 76 ++++++++++++++++
 .../extractors/ProteaExtractor.kt             |  3 +-
 .../animeextension/it/vvvvid/VVVVID.kt        |  2 +-
 10 files changed, 144 insertions(+), 200 deletions(-)
 delete mode 100644 src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/extractors/MoshahdaExtractor.kt
 delete mode 100644 src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.java
 create mode 100644 src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.kt

diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/JsUnpacker.kt b/multisrc/overrides/dooplay/animeshouse/src/extractors/JsUnpacker.kt
index f893983a67..45cb9696ff 100644
--- a/multisrc/overrides/dooplay/animeshouse/src/extractors/JsUnpacker.kt
+++ b/multisrc/overrides/dooplay/animeshouse/src/extractors/JsUnpacker.kt
@@ -27,7 +27,7 @@ object JsUnpacker {
         val count = args[3].toInt()
         val origList = args[4].split("|")
 
-        val replaceMap = (0..(count - 1)).map {
+        val replaceMap = (0..count - 1).map {
             val key = convert(base, it)
             key to try { origList[it] } catch (e: Exception) { key }
         }.toMap()
diff --git a/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt b/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt
index 3d1391647c..e8ef557f33 100644
--- a/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt
+++ b/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt
@@ -663,60 +663,59 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
     }
 
     private fun medialibPreference(screen: PreferenceScreen) =
-        (
-            object : MediaLibPreference(screen.context) {
-                override fun reload() {
-                    this.apply {
-                        key = JFConstants.MEDIALIB_KEY
-                        title = JFConstants.MEDIALIB_TITLE
-                        summary = "%s"
-
-                        Thread {
-                            try {
-                                val mediaLibsResponse = client.newCall(
-                                    GET("$baseUrl/Users/$userId/Items?api_key=$apiKey"),
-                                ).execute()
-                                val mediaJson = mediaLibsResponse.body.let { json.decodeFromString<ItemsResponse>(it.string()) }?.Items
-
-                                val entriesArray = mutableListOf<String>()
-                                val entriesValueArray = mutableListOf<String>()
-
-                                if (mediaJson != null) {
-                                    for (media in mediaJson) {
-                                        entriesArray.add(media.Name)
-                                        entriesValueArray.add(media.Id)
-                                    }
+        object : MediaLibPreference(screen.context) {
+            override fun reload() {
+                this.apply {
+                    key = JFConstants.MEDIALIB_KEY
+                    title = JFConstants.MEDIALIB_TITLE
+                    summary = "%s"
+
+                    Thread {
+                        try {
+                            val mediaLibsResponse = client.newCall(
+                                GET("$baseUrl/Users/$userId/Items?api_key=$apiKey"),
+                            ).execute()
+                            val mediaJson = mediaLibsResponse.body.let { json.decodeFromString<ItemsResponse>(it.string()) }?.Items
+
+                            val entriesArray = mutableListOf<String>()
+                            val entriesValueArray = mutableListOf<String>()
+
+                            if (mediaJson != null) {
+                                for (media in mediaJson) {
+                                    entriesArray.add(media.Name)
+                                    entriesValueArray.add(media.Id)
                                 }
-
-                                entries = entriesArray.toTypedArray()
-                                entryValues = entriesValueArray.toTypedArray()
-                            } catch (ex: Exception) {
-                                entries = emptyArray()
-                                entryValues = emptyArray()
                             }
-                        }.start()
-
-                        setOnPreferenceChangeListener { _, newValue ->
-                            val selected = newValue as String
-                            val index = findIndexOfValue(selected)
-                            val entry = entryValues[index] as String
-                            parentId = entry
-                            preferences.edit().putString(key, entry).commit()
+
+                            entries = entriesArray.toTypedArray()
+                            entryValues = entriesValueArray.toTypedArray()
+                        } catch (ex: Exception) {
+                            entries = emptyArray()
+                            entryValues = emptyArray()
                         }
+                    }.start()
+
+                    setOnPreferenceChangeListener { _, newValue ->
+                        val selected = newValue as String
+                        val index = findIndexOfValue(selected)
+                        val entry = entryValues[index] as String
+                        parentId = entry
+                        preferences.edit().putString(key, entry).commit()
                     }
                 }
             }
-            ).apply { reload() }
+        }.apply { reload() }
+
+    private fun getSummary(isPassword: Boolean, value: String, placeholder: String) = when {
+        isPassword && value.isNotEmpty() || !isPassword && value.isEmpty() -> placeholder
+        else -> value
+    }
 
     private fun PreferenceScreen.editTextPreference(key: String, title: String, default: String, value: String, isPassword: Boolean = false, placeholder: String, mediaLibPref: MediaLibPreference): EditTextPreference {
         return EditTextPreference(context).apply {
             this.key = key
             this.title = title
-            summary = if ((isPassword && value.isNotEmpty()) || (!isPassword && value.isEmpty())) {
-                placeholder
-            } else {
-                value
-            }
+            summary = getSummary(isPassword, value, placeholder)
             this.setDefaultValue(default)
             dialogTitle = title
 
@@ -732,11 +731,7 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
                 try {
                     val newValueString = newValue as String
                     val res = preferences.edit().putString(key, newValueString).commit()
-                    summary = if ((isPassword && newValueString.isNotEmpty()) || (!isPassword && newValueString.isEmpty())) {
-                        placeholder
-                    } else {
-                        newValueString
-                    }
+                    summary = getSummary(isPassword, newValueString, placeholder)
                     val loginRes = login(true, context)
                     if (loginRes == true) {
                         mediaLibPref.reload()
diff --git a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt
index 540da21834..96e28d865b 100644
--- a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt
+++ b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt
@@ -379,7 +379,7 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
                     }
                     ) +
                 (
-                    if ((series_metadata?.audio_locales?.size ?: 0) > 1 ||
+                    if (series_metadata?.audio_locales?.size ?: 0 > 1 ||
                         movie_metadata?.is_dubbed == true
                     ) {
                         " Dub"
@@ -501,33 +501,31 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     private fun localSubsPreference(screen: PreferenceScreen) =
-        (
-            object : LocalSubsPreference(screen.context) {
-                override fun reload() {
-                    this.apply {
-                        key = PREF_USE_LOCAL_TOKEN_KEY
-                        title = PREF_USE_LOCAL_TOKEN_TITLE
-                        summary = runBlocking {
-                            withContext(Dispatchers.IO) { getTokenDetail() }
-                        }
-                        setDefaultValue(false)
-                        setOnPreferenceChangeListener { _, newValue ->
-                            val new = newValue as Boolean
-                            preferences.edit().putBoolean(key, new).commit().also {
-                                Thread {
-                                    summary = runBlocking {
-                                        withContext(Dispatchers.IO) { getTokenDetail(true) }
-                                    }
-                                }.start()
-                            }
+        object : LocalSubsPreference(screen.context) {
+            override fun reload() {
+                this.apply {
+                    key = PREF_USE_LOCAL_TOKEN_KEY
+                    title = PREF_USE_LOCAL_TOKEN_TITLE
+                    summary = runBlocking {
+                        withContext(Dispatchers.IO) { getTokenDetail() }
+                    }
+                    setDefaultValue(false)
+                    setOnPreferenceChangeListener { _, newValue ->
+                        val new = newValue as Boolean
+                        preferences.edit().putBoolean(key, new).commit().also {
+                            Thread {
+                                summary = runBlocking {
+                                    withContext(Dispatchers.IO) { getTokenDetail(true) }
+                                }
+                            }.start()
                         }
                     }
                 }
             }
-            ).apply { reload() }
+        }.apply { reload() }
 
     // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
+    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
         runBlocking {
             map { async(Dispatchers.Default) { f(it) } }.awaitAll()
         }
diff --git a/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/extractors/MoshahdaExtractor.kt b/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/extractors/MoshahdaExtractor.kt
deleted file mode 100644
index 225122bee8..0000000000
--- a/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/extractors/MoshahdaExtractor.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.anime4up.extractors
-
-import android.util.Log
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class MoshahdaExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        val callPlayer = client.newCall(GET(url, headers)).execute().asJsoup()
-        Log.i("embeddd", "$callPlayer")
-
-        val data = callPlayer.data().substringAfter("sources: [").substringBefore("],")
-        val sources = data.split("file: \"").drop(1)
-        val videoList = mutableListOf<Video>()
-        for (source in sources) {
-            val masterUrl = source.substringBefore("\"}")
-            val masterPlaylist = client.newCall(GET(masterUrl)).execute().body.string()
-            val videoList = mutableListOf<Video>()
-            masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:")
-                .forEach {
-                    val quality = it.substringAfter("RESOLUTION=").substringAfter("x")
-                        .substringBefore(",") + "p"
-                    val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                    videoList.add(Video(videoUrl, quality, videoUrl))
-                }
-            return videoList
-        }
-        return videoList
-    }
-}
diff --git a/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt b/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
index 4188ff235c..83b07468e4 100644
--- a/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
+++ b/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
@@ -165,7 +165,7 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private fun extractVideosFromUrl(url: String, quality: String, selection: Set<String>): List<Video> {
         return runCatching {
             when {
-                ("https://doo" in url && "/e/" in url) && selection.contains("Dood") -> {
+                "https://doo" in url && "/e/" in url && selection.contains("Dood") -> {
                     doodExtractor.videoFromUrl(url, "DoodStream - $quality")
                         ?.let(::listOf)
                 }
diff --git a/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt b/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt
index 17e331e96a..9d33095c02 100644
--- a/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt
+++ b/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt
@@ -65,7 +65,7 @@ class MoflixStream : ConfigurableAnimeSource, AnimeHttpSource() {
         val pagination = response.parseAs<PopularPaginationDto>().pagination
 
         val animeList = pagination.data.parseItems()
-        val hasNextPage = pagination.current_page < (pagination.next_page ?: 1)
+        val hasNextPage = pagination.current_page < pagination.next_page ?: 1
         return AnimesPage(animeList, hasNextPage)
     }
 
diff --git a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.java b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.java
deleted file mode 100644
index 4b024c12db..0000000000
--- a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.putlocker;
-
-public class JSONUtil {
-    public static String escape(String input) {
-        StringBuilder output = new StringBuilder();
-
-        for(int i=0; i<input.length(); i++) {
-            char ch = input.charAt(i);
-            int chx = (int) ch;
-
-            // let's not put any nulls in our strings
-            assert(chx != 0);
-
-            if(ch == '\n') {
-                output.append("\\n");
-            } else if(ch == '\t') {
-                output.append("\\t");
-            } else if(ch == '\r') {
-                output.append("\\r");
-            } else if(ch == '\\') {
-                output.append("\\\\");
-            } else if(ch == '"') {
-                output.append("\\\"");
-            } else if(ch == '\b') {
-                output.append("\\b");
-            } else if(ch == '\f') {
-                output.append("\\f");
-            } else if(chx >= 0x10000) {
-                assert false : "Java stores as u16, so it should never give us a character that's bigger than 2 bytes. It literally can't.";
-            } else if(chx > 127) {
-                output.append(String.format("\\u%04x", chx));
-            } else {
-                output.append(ch);
-            }
-        }
-
-        return output.toString();
-    }
-
-    public static String unescape(String input) {
-        StringBuilder builder = new StringBuilder();
-
-        int i = 0;
-        while (i < input.length()) {
-            // consume letter or backslash
-            char delimiter = input.charAt(i);
-            i++;
-
-            if(delimiter == '\\' && i < input.length()) {
-
-                // consume first after backslash
-                char ch = input.charAt(i);
-                i++;
-
-                if(ch == '\\' || ch == '/' || ch == '"' || ch == '\'') {
-                    builder.append(ch);
-                }
-                else if(ch == 'n') builder.append('\n');
-                else if(ch == 'r') builder.append('\r');
-                else if(ch == 't') builder.append('\t');
-                else if(ch == 'b') builder.append('\b');
-                else if(ch == 'f') builder.append('\f');
-                else if(ch == 'u') {
-
-                    StringBuilder hex = new StringBuilder();
-
-                    // expect 4 digits
-                    if (i+4 > input.length()) {
-                        throw new RuntimeException("Not enough unicode digits! ");
-                    }
-                    for (char x : input.substring(i, i + 4).toCharArray()) {
-                        if(!Character.isLetterOrDigit(x)) {
-                            throw new RuntimeException("Bad character in unicode escape.");
-                        }
-                        hex.append(Character.toLowerCase(x));
-                    }
-                    i+=4; // consume those four digits.
-
-                    int code = Integer.parseInt(hex.toString(), 16);
-                    builder.append((char) code);
-                } else {
-                    throw new RuntimeException("Illegal escape sequence: \\"+ch);
-                }
-            } else { // it's not a backslash, or it's the last character.
-                builder.append(delimiter);
-            }
-        }
-
-        return builder.toString();
-    }
-}
diff --git a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.kt b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.kt
new file mode 100644
index 0000000000..15aeef2e1d
--- /dev/null
+++ b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/JSONUtil.kt
@@ -0,0 +1,76 @@
+package eu.kanade.tachiyomi.animeextension.en.putlocker
+
+object JSONUtil {
+    fun escape(input: String): String {
+        val output = StringBuilder()
+
+        for (ch in input) {
+            // let's not put any nulls in our strings
+            val charInt = ch.code
+            assert(charInt != 0)
+
+            // 0x10000 = 65536 = 2^16 = u16 max value
+            assert(charInt < 0x10000) { "Java stores as u16, so it should never give us a character that's bigger than 2 bytes. It literally can't." }
+
+            val escapedChar = when (ch) {
+                '\b' -> "\\b"
+                '\u000C' -> "\\f" // '\u000C' == '\f', Kotlin doesnt support \f
+                '\n' -> "\\n"
+                '\r' -> "\\r"
+                '\t' -> "\\t"
+                '\\' -> "\\\\"
+                '"' -> "\\\""
+                else -> {
+                    if (charInt > 127) {
+                        String.format("\\u%04x", charInt)
+                    } else {
+                        ch
+                    }
+                }
+            }
+            output.append(escapedChar)
+        }
+        return output.toString()
+    }
+
+    fun unescape(input: String): String {
+        val builder = StringBuilder()
+
+        var index = 0
+        while (index < input.length) {
+            val delimiter = input.get(index) // consume letter or backslash
+            index++
+
+            if (delimiter == '\\' && index < input.length) {
+                // consume first after backslash
+                val ch = input.get(index)
+                index++
+
+                val unescaped = when (ch) {
+                    '\\', '/', '"', '\'' -> ch // "
+                    'b' -> '\b'
+                    'f' -> '\u000C' // '\f' in java
+                    'n' -> '\n'
+                    'r' -> '\r'
+                    't' -> '\t'
+                    'u' -> {
+                        if (index + 4 > input.length) {
+                            throw RuntimeException("Not enough unicode digits!")
+                        }
+                        val hex = input.substring(index, index + 4)
+                        if (hex.any { !it.isLetterOrDigit() }) {
+                            throw RuntimeException("Bad character in unicode escape.")
+                        }
+                        hex.toInt(16).toChar()
+                    }
+                    else -> throw RuntimeException("Illegal escape sequence: \\" + ch)
+                }
+                builder.append(unescaped)
+            } else {
+                builder.append(delimiter)
+            }
+        }
+
+        return builder.toString()
+    }
+}
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt
index e521083a67..72190b4072 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/ProteaExtractor.kt
@@ -16,7 +16,7 @@ class ProteaExtractor() {
     private val json: Json by injectLazy()
     fun videosFromUrl(url: String, qualityPrefix: String = "Protea", headers: Headers): List<Video> {
         val videoList = mutableListOf<Video>()
-        try {
+        runCatching {
             val document = Jsoup.connect(url).headers(headers.toMap()).ignoreContentType(true).method(Connection.Method.POST).execute()
             if (document!!.body()!!.isNotEmpty()) {
                 val responseString = document.body().removePrefix("[").removeSuffix("]")
@@ -44,7 +44,6 @@ class ProteaExtractor() {
                     videoList.add(Video("https://$urlVideo", quality, "https://$urlVideo", headers = newHeaders))
                 }
             }
-        } catch (e: Exception) {
         }
         return videoList
     }
diff --git a/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt b/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt
index 28ab5a4fae..3d4906fdbe 100644
--- a/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt
+++ b/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt
@@ -547,7 +547,7 @@ class VVVVID : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     private fun getRandomIntString(): String {
-        val allowedChars = ('0'..'9')
+        val allowedChars = '0'..'9'
         return (1..16)
             .map { allowedChars.random() }
             .joinToString("")