From 5f81f24261af1aea5abd36532eeaa0055114cc56 Mon Sep 17 00:00:00 2001 From: hasanpasha Date: Fri, 21 Mar 2025 21:15:01 +0300 Subject: [PATCH] apply PR suggestion on safely handling null values, and remove redundant code --- .../all/shabakatycinemana/ShabakatyCinemana.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt index b88155c5..1ac74c0c 100644 --- a/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt +++ b/src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt @@ -138,14 +138,13 @@ object SAnimeDeserializer : DeserializationStrategy { it.jsonObject["en_title"]?.jsonPrimitive?.content }.orEmpty() val language = jsonObject["videoLanguages"]?.jsonObject?.get("en_title")?.jsonPrimitive?.content - - val genreText = (categories + language).joinToString(", ") - val directors = jsonObject["directorsInfo"]?.jsonArray?.map { + val genreText = (categories + language).mapNotNull { it }.joinToString() + val directors = jsonObject["directorsInfo"]?.jsonArray?.mapNotNull { it.jsonObject["name"]?.jsonPrimitive?.content - }?.joinToString(", ") - val actors = jsonObject["actorsInfo"]?.jsonArray?.map { + }?.joinToString() + val actors = jsonObject["actorsInfo"]?.jsonArray?.mapNotNull { it.jsonObject["name"]?.jsonPrimitive?.content - }?.joinToString(", ") + }?.joinToString() val enContent = jsonObject["en_content"]?.jsonPrimitive?.content val year = jsonObject["year"]?.jsonPrimitive?.content ?: "N/A" val stars = jsonObject["stars"]?.jsonPrimitive?.content?.parseAs()?.toInt() ?: 0 @@ -161,7 +160,10 @@ object SAnimeDeserializer : DeserializationStrategy { genre = genreText author = directors artist = actors - description = "$year | $starsText | $likes\uD83D\uDC4D $dislikes\uD83D\uDC4E\n\n$enContent" + description = listOfNotNull( + "$year | $starsText | $likes\uD83D\uDC4D $dislikes\uD83D\uDC4E", + enContent, + ).joinToString("\n\n") } } }