[shabakatycinemana] add staff filter, and more Anime info (#837)

* add shabakaty cinemana extension

* fix kinds default value retrieving from preferences

* fix browse langauge without category

* fix episodes order: reverse

* fix: animePage hasNextPage for popular, search, and latest

* remove debug prints

* bump version to 2

* more Anime info, and add staff title filter

* bump shabakatycinemana version to `3`

* apply PR suggestion on safely handling null values, and remove redundant code

src/all/shabakatycinemana/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'ShabakatyCinemana'
     extClass = '.ShabakatyCinemana'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = false
 }
 

src/all/shabakatycinemana/src/eu/kanade/tachiyomi/animeextension/all/shabakatycinemana/ShabakatyCinemana.kt

@@ -134,9 +134,17 @@ object SAnimeDeserializer : DeserializationStrategy<SAnime> {
         val nb = jsonObject["nb"]?.jsonPrimitive?.content!!
         val enTitle = jsonObject["en_title"]?.jsonPrimitive?.content ?: "no title"
         val imgObjUrl = jsonObject["imgObjUrl"]?.jsonPrimitive?.content
-        val categories = jsonObject["categories"]?.jsonArray?.map {
+        val categories = jsonObject["categories"]?.jsonArray?.mapNotNull {
             it.jsonObject["en_title"]?.jsonPrimitive?.content
-        }?.joinToString(", ")
+        }.orEmpty()
+        val language = jsonObject["videoLanguages"]?.jsonObject?.get("en_title")?.jsonPrimitive?.content
+        val genreText = (categories + language).mapNotNull { it }.joinToString()
+        val directors = jsonObject["directorsInfo"]?.jsonArray?.mapNotNull {
+            it.jsonObject["name"]?.jsonPrimitive?.content
+        }?.joinToString()
+        val actors = jsonObject["actorsInfo"]?.jsonArray?.mapNotNull {
+            it.jsonObject["name"]?.jsonPrimitive?.content
+        }?.joinToString()
         val enContent = jsonObject["en_content"]?.jsonPrimitive?.content
         val year = jsonObject["year"]?.jsonPrimitive?.content ?: "N/A"
         val stars = jsonObject["stars"]?.jsonPrimitive?.content?.parseAs<Float>()?.toInt() ?: 0
@@ -149,8 +157,13 @@ object SAnimeDeserializer : DeserializationStrategy<SAnime> {
             url = nb
             title = enTitle
             thumbnail_url = imgObjUrl
-            genre = categories
+            genre = genreText
-            description = "$year | $starsText | $likes\uD83D\uDC4D  $dislikes\uD83D\uDC4E\n\n$enContent"
+            author = directors
+            artist = actors
+            description = listOfNotNull(
+                "$year | $starsText | $likes\uD83D\uDC4D  $dislikes\uD83D\uDC4E",
+                enContent,
+            ).joinToString("\n\n")
         }
     }
 }
@@ -178,7 +191,8 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         private const val SUB_CATEGORY_FILTER_NAME = "Sub Category"
         private const val LANGUAGE_FILTER_NAME = "Language"
         private const val YEAR_FILTER_NAME = "Year"
-        private const val BROWSE_RESULT_SORT_FILTER = "Browse Sort"
+        private const val BROWSE_RESULT_SORT_FILTER_NAME = "Browse Sort"
+        private const val STAFF_TITLE_FILTER_NAME = "Staff Title"
 
         private const val POPULAR_ITEMS_PER_PAGE = 30
         private const val SEARCH_ITEMS_PER_PAGE = 12
@@ -253,7 +267,8 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         val subCategoryFilter = filterList.find { it.name == SUB_CATEGORY_FILTER_NAME } as MultipleSelectFilter
         val languageFilter = filterList.find { it.name == LANGUAGE_FILTER_NAME } as SingleSelectFilter
         val yearFilter = filterList.find { it.name == YEAR_FILTER_NAME } as YearFilter
-        val browseResultSortFilter = filterList.find { it.name == BROWSE_RESULT_SORT_FILTER } as BrowseResultSort
+        val staffTitleFilter = filterList.find { it.name == STAFF_TITLE_FILTER_NAME } as StaffTitleFilter
+        val browseResultSortFilter = filterList.find { it.name == BROWSE_RESULT_SORT_FILTER_NAME } as BrowseResultSort
         val isBrowsing = isBrowsingFilter.state
         val kindName = kindFilter.getNameValue()
         val kindNumber = kindFilter.getNumberValue().toString()
@@ -263,6 +278,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         val bothCategory = (selectedMainCategories + selectedSubCategories).joinToString(",")
         val language = languageFilter.getNumberValue().toString()
         val year = yearFilter.getFormatted()
+        val staffTitle = staffTitleFilter.state
         val browseResultSort = browseResultSortFilter.getValue()
 
         var url = apiBaseUrl.toHttpUrl()
@@ -311,7 +327,12 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
             if (query.isNotBlank()) {
                 url = url.newBuilder()
                     .addQueryParameter("videoTitle", query)
-                    .addQueryParameter("staffTitle", query)
+                    .build()
+            }
+
+            if (staffTitle.isNotBlank()) {
+                url = url.newBuilder()
+                    .addQueryParameter("staffTitle", staffTitle)
                     .build()
             }
 
@@ -425,8 +446,10 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
+    private open class StaffTitleFilter(displayName: String) : AnimeFilter.Text(displayName)
+
     override fun getFilterList() = AnimeFilterList(
-        AnimeFilter.Header("Filter Search Result"),
+        StaffTitleFilter(STAFF_TITLE_FILTER_NAME),
         CheckBoxFilter(IS_BROWSING_FILTER_NAME, false),
         SingleSelectFilter(
             KIND_FILTER_NAME,
@@ -550,7 +573,7 @@ class ShabakatyCinemana : ConfigurableAnimeSource, AnimeHttpSource() {
                 YearTextFilter("end", Calendar.getInstance().get(Calendar.YEAR).toString()),
         ),
         BrowseResultSort(
-            BROWSE_RESULT_SORT_FILTER,
+            BROWSE_RESULT_SORT_FILTER_NAME,
             arrayOf(
                 Pair("Upload", Pair("asc", "desc")),
                 Pair("Release", Pair("r_asc", "r_desc")),