From ed9ae3d0e037329824c85f03428ea93e172c4eb6 Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Mon, 15 Aug 2022 15:57:09 +0800
Subject: [PATCH] [Additional feature] Also apply quality filter to HomePage
 list

---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 46 ++++++++++++++-----
 .../cloudstream3/ui/home/HomeViewModel.kt     |  7 ++-
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 408e7c63..f342836c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -256,19 +256,41 @@ object APIHolder {
 
     fun Context.filterSearchResultByFilmQuality(data: List<SearchResponse>): List<SearchResponse> {
         // Filter results omitting entries with certain quality
-        if (data.isEmpty()) {
-            return data
+        if (data.isNotEmpty()) {
+            val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
+                ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
+                ?.mapNotNull { entry ->
+                    entry.toIntOrNull() ?: return@mapNotNull null
+                } ?: listOf()
+            if (filteredSearchQuality.isNotEmpty()) {
+                return data.filter { item ->
+                    val searchQualVal = item.quality?.ordinal ?: -1
+                    //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
+                    !filteredSearchQuality.contains(searchQualVal)
+                }
+            }
         }
-        val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
-            ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
-            ?.mapNotNull { entry ->
-                entry.toIntOrNull() ?: return@mapNotNull null
-            } ?: listOf()
-        if (filteredSearchQuality.isNotEmpty()) {
-            return data.filter { item ->
-                val searchQualVal = item.quality?.ordinal ?: -1
-                //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
-                !filteredSearchQuality.contains(searchQualVal)
+        return data
+    }
+
+    fun Context.filterHomePageListByFilmQuality(data: HomePageList): HomePageList {
+        // Filter results omitting entries with certain quality
+        if (data.list.isNotEmpty()) {
+            val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this)
+                ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf())
+                ?.mapNotNull { entry ->
+                    entry.toIntOrNull() ?: return@mapNotNull null
+                } ?: listOf()
+            if (filteredSearchQuality.isNotEmpty()) {
+                return HomePageList(
+                    name = data.name,
+                    isHorizontalImages = data.isHorizontalImages,
+                    list = data.list.filter { item ->
+                        val searchQualVal = item.quality?.ordinal ?: -1
+                        //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}")
+                        !filteredSearchQuality.contains(searchQualVal)
+                    }
+                )
             }
         }
         return data
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 9c9bfb36..7ae0af79 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -5,7 +5,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.APIHolder.apis
+import com.lagradost.cloudstream3.APIHolder.filterHomePageListByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
+import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
@@ -225,8 +227,9 @@ class HomeViewModel : ViewModel() {
                         expandable.clear()
                         data.value.forEach { home ->
                             home?.items?.forEach { list ->
+                                val filteredList = context?.filterHomePageListByFilmQuality(list) ?: list
                                 expandable[list.name] =
-                                    ExpandableHomepageList(list, 1, home.hasNext)
+                                    ExpandableHomepageList(filteredList, 1, home.hasNext)
                             }
                         }
                         _page.postValue(Resource.Success(expandable))
@@ -241,7 +244,7 @@ class HomeViewModel : ViewModel() {
                                     .toList()
 
                             if (currentList.isNotEmpty()) {
-                                val randomItems = currentList.shuffled()
+                                val randomItems = context?.filterSearchResultByFilmQuality(currentList.shuffled()) ?: currentList.shuffled()
 
                                 _randomItems.postValue(randomItems)
                             }