fixed genre filtering for external addons

Author: SebastianMorel

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "stremio-aiolists-addon",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "description": "Stremio addon to manage all your lists in one place.",
     "main": "src/server.js",
     "scripts": {

package.json

@@ -272,7 +272,7 @@ async function createAddon(userConfig) {
   await initTraktApi(userConfig);
   const manifest = {
     id: 'org.stremio.aiolists',
-    version: `1.2.5-${Date.now()}`,
+    version: `1.2.6-${Date.now()}`,
     name: 'AIOLists',
     description: 'Manage all your lists in one place.',
     resources: ['catalog', 'meta'],
@@ -1167,14 +1167,44 @@ async function createAddon(userConfig) {
     // Apply genre filtering after enrichment (since we removed it from integration layer)
     if (genre && genre !== 'All' && metas.length > 0) {
         const beforeFilterCount = metas.length;
+        
+        // Debug: Log genre information for external addon items
+        const isExternalAddon = importedAddons && Object.values(importedAddons).some(addon => 
+          addon.catalogs?.some(catalog => String(catalog.id) === String(id))
+        );
+        
+        if (isExternalAddon) {
+          const itemsWithGenres = metas.filter(meta => meta.genres && meta.genres.length > 0);
+          const itemsWithoutGenres = metas.filter(meta => !meta.genres || meta.genres.length === 0);
+          console.log(`[Genre Filter] External addon "${id}": ${itemsWithGenres.length}/${metas.length} items have genre data (metadata source: ${userConfig.metadataSource || 'cinemeta'})`);
+          
+          if (itemsWithGenres.length > 0) {
+            console.log(`[Genre Filter] Sample genres found:`, itemsWithGenres.slice(0, 3).map(item => ({
+              name: item.name,
+              genres: item.genres
+            })));
+          }
+          
+          if (itemsWithoutGenres.length > 0) {
+            console.log(`[Genre Filter] Sample items without genres:`, itemsWithoutGenres.slice(0, 3).map(item => ({
+              id: item.id,
+              name: item.name,
+              hasGenres: !!item.genres
+            })));
+          }
+        }
+        
         metas = metas.filter(meta => {
             if (!meta.genres) return false;
             const itemGenres = Array.isArray(meta.genres) ? meta.genres : [meta.genres];
             return itemGenres.some(g => 
                 String(g).toLowerCase() === String(genre).toLowerCase()
             );
         });
-
+        
+        if (isExternalAddon) {
+          console.log(`[Genre Filter] External addon "${id}": Filtered from ${beforeFilterCount} to ${metas.length} items for genre "${genre}"`);
+        }
     }
 
     const cacheMaxAge = (id === 'random_mdblist_catalog' || isWatchlist(id)) ? 0 : (5 * 60);

src/addon/addonBuilder.js

@@ -204,9 +204,19 @@ async function fetchExternalAddonItems(targetOriginalId, targetOriginalType, sou
         return { metas: [], hasMovies: false, hasShows: false };
       }
     }
+    
+    // Skip genre filtering at external addon level when using TMDB metadata source
+    // This allows TMDB-enriched genre filtering to work properly after enrichment
+    const shouldSkipExternalGenreFilter = userConfig?.metadataSource === 'tmdb' && genre && genre !== 'All';
+    const genreForExternalAddon = shouldSkipExternalGenreFilter ? null : genre;
+    
+    if (shouldSkipExternalGenreFilter) {
+      console.log(`[ExternalAddon] Skipping external addon genre filter for "${genre}" - will filter after TMDB enrichment`);
+    }
+    
     const tempExternalAddon = new ExternalAddon(sourceAddonConfig.apiBaseUrl); 
     tempExternalAddon.apiBaseUrl = sourceAddonConfig.apiBaseUrl;
-    attemptedUrl = tempExternalAddon.buildCatalogUrl(catalogEntry.originalId, catalogEntry.originalType, skip, genre);
+    attemptedUrl = tempExternalAddon.buildCatalogUrl(catalogEntry.originalId, catalogEntry.originalType, skip, genreForExternalAddon);
     const response = await axios.get(attemptedUrl, { timeout: 20000 });
     if (!response.data || !Array.isArray(response.data.metas)) {
       console.error(`[AIOLists ExternalAddon] Invalid metadata response from ${attemptedUrl}: Data or metas array missing. Response:`, response.data);
@@ -227,14 +237,8 @@ async function fetchExternalAddonItems(targetOriginalId, targetOriginalType, sou
     // No metadata enrichment here - this will be done in the addon builder when serving to Stremio
     let enrichedMetas = metasFromExternal;
     let finalMetas = enrichedMetas;
-    if (genre && finalMetas.length > 0) {
-        // Basic genre filtering - comprehensive filtering will happen after enrichment in addon builder
-        finalMetas = finalMetas.filter(meta => {
-            // Most external addon items may not have detailed genre data at this stage
-            // This filtering will be more comprehensive after enrichment in the addon builder
-            return true; // For now, include all items - genre filtering will happen after enrichment
-        });
-    }
+    // Note: Genre filtering is now handled after metadata enrichment in the addon builder
+    // This ensures TMDB-enriched genres are properly used for filtering
     const hasMovies = finalMetas.some(m => m.type === 'movie');
     const hasShows = finalMetas.some(m => m.type === 'series');
     return { metas: finalMetas, hasMovies, hasShows };

src/integrations/externalAddons.js

@@ -270,17 +270,8 @@ async function fetchListItemsFromPublicJson(username, listSlug, skip = 0, sort =
     // No metadata enrichment here - this will be done in the addon builder when serving to Stremio
     let enrichedItems = filteredItems;
 
-    // Apply genre filter after enrichment if specified
-    if (genre && genre !== 'All' && enrichedItems.length > 0) {
-      const beforeFilterCount = enrichedItems.length;
-      // Basic genre filtering - comprehensive filtering will happen after enrichment in addon builder
-      enrichedItems = enrichedItems.filter(item => {
-        // Most raw MDBList items don't have detailed genre data at this stage
-        // This filtering will be more comprehensive after enrichment in the addon builder
-        return true; // For now, include all items - genre filtering will happen after enrichment
-      });
-      
-    }
+    // Note: Genre filtering is now handled after metadata enrichment in the addon builder
+    // This ensures TMDB-enriched genres are properly used for filtering
 
     return {
       allItems: enrichedItems,
@@ -464,13 +455,9 @@ async function fetchListItems(
 
       if (!initialItemsFlat || initialItemsFlat.length === 0) { morePagesFromMdbList = false; break; }
 
-      // For genre filtering, we'll use basic filtering on available data
-      // Full metadata enrichment will happen later in the addon builder when serving to Stremio
-      const genreItemsFromPage = initialItemsFlat.filter(item => {
-        // Basic genre filtering - most MDBList items don't have detailed genre data at this stage
-        // This filtering will be more comprehensive after enrichment in the addon builder
-        return true; // For now, include all items - genre filtering will happen after enrichment
-      });
+      // Note: Genre filtering is now handled after metadata enrichment in the addon builder
+      // This ensures TMDB-enriched genres are properly used for filtering
+      const genreItemsFromPage = initialItemsFlat;
       allEnrichedGenreItems.push(...genreItemsFromPage);
       mdbListOffset += MDBLIST_PAGE_LIMIT;
       attemptsForGenreCompletion++;

src/integrations/mdblist.js

@@ -2342,7 +2342,7 @@ module.exports = function(router) {
 
     const defaultManifest = {
       "id": "org.stremio.aiolists",
-      "version": `1.2.5-${Date.now()}`,
+      "version": `1.2.6-${Date.now()}`,
       "name": "AIOLists",
       "description": "Manage all your lists in one place.",
       "resources": [