From 83df69a7dd3587234049b262b7cd08b3cdbaccab Mon Sep 17 00:00:00 2001
From: KhooLy <73142442+KhooLy@users.noreply.github.com>
Date: Fri, 10 Jul 2026 13:28:32 +0300
Subject: [PATCH] Stop excluding catalogs from discover when they lack declared
 genre support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Excluding a catalog entirely whenever it didn't declare genre as a supported
extra was too strict: once genre filtering actually started reaching the
core (previous commit), any user whose installed addons don't declare genre
support at all got zero catalogs and "No content found." Instead, only skip
sending the genre query param to catalogs that don't support it — they still
contribute their normal item list, which then goes through the existing
post-fetch genre filter in discover_sort_plan_json (checks each item's own
genres tag), so mismatched items still get filtered out without starving
the catalog list entirely.

Also switched to the canonical, case-insensitive catalog_supports_extra in
addon_protocol.rs instead of the ad-hoc case-sensitive duplicate added
earlier, matching the pattern already used by search_plan.rs.
---
 src/platform_plan.rs | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/platform_plan.rs b/src/platform_plan.rs
index f9d476b..501c79d 100644
--- a/src/platform_plan.rs
+++ b/src/platform_plan.rs
@@ -1,4 +1,6 @@
-use crate::addon_protocol::{build_resource_url, supports_resource};
+use crate::addon_protocol::{
+    build_resource_url, catalog_supports_extra as manifest_catalog_supports_extra, supports_resource,
+};
 use crate::content_identity::parse_extra_args_json;
 use crate::repository_flow::addon_streams_with_provider_json;
 use crate::stream_policy::stream_playback_info_json;
@@ -152,9 +154,10 @@ pub(crate) fn resource_fetch_plan_json(request_json: &str) -> Option<String> {
             for catalog in discover_catalog_options(
                 &request.addons,
                 request.content_type.as_deref().unwrap_or(""),
-                genre,
             ) {
-                let extra = genre.map(|value| json!({"genre": value}).to_string());
+                let extra = genre
+                    .filter(|_| catalog.supports_genre)
+                    .map(|value| json!({"genre": value}).to_string());
                 requests.push(json!({
                         "url": build_resource_url(
                             &catalog.transport_url,
@@ -519,18 +522,9 @@ fn addon_display_name(addon: &Value) -> String {
 }
 
 fn catalog_supports_extra(catalog: &Value, name: &str) -> bool {
-    catalog
-        .get("extra")
-        .and_then(Value::as_array)
-        .is_some_and(|extra| {
-            extra
-                .iter()
-                .any(|item| item.get("name").and_then(Value::as_str) == Some(name))
-        })
-        || catalog
-            .get("extraSupported")
-            .and_then(Value::as_array)
-            .is_some_and(|extra| extra.iter().any(|item| item.as_str() == Some(name)))
+    serde_json::to_string(catalog)
+        .ok()
+        .is_some_and(|json| manifest_catalog_supports_extra(&json, name))
 }
 
 fn catalog_supports_search(catalog: &Value) -> bool {
@@ -556,13 +550,10 @@ struct DiscoverCatalog {
     transport_url: String,
     content_type: String,
     id: String,
+    supports_genre: bool,
 }
 
-fn discover_catalog_options(
-    addons: &[Value],
-    selected_type: &str,
-    genre: Option<&str>,
-) -> Vec<DiscoverCatalog> {
+fn discover_catalog_options(addons: &[Value], selected_type: &str) -> Vec<DiscoverCatalog> {
     let mut options = Vec::new();
     for addon in addons {
         let Some(transport_url) = addon_transport_url(addon) else {
@@ -578,14 +569,12 @@ fn discover_catalog_options(
             if !selected_type.is_empty() && content_type != selected_type {
                 continue;
             }
-            if genre.is_some() && !catalog_supports_extra(&catalog, "genre") {
-                continue;
-            }
             options.push(DiscoverCatalog {
                 key: format!("{}:{}", transport_url, id),
                 transport_url: transport_url.to_string(),
                 content_type: content_type.to_string(),
                 id: id.to_string(),
+                supports_genre: catalog_supports_extra(&catalog, "genre"),
             });
         }
     }