Update src/streamlit_app.py

src/streamlit_app.py

@@ -94,55 +94,71 @@ def filter_content(content_list, filters):
     filtered = []
     
     for content in content_list:
+        matches_all_filters = True
+        
         # For debugging
         title = content.get('title', 'N/A')
         
-        # Type filter
-        if filters['content_type'] and content.get('type') != filters['content_type']:
-            continue
+        # Type filter - only apply if not "All"
+        if filters['content_type']:
+            if content.get('type') != filters['content_type']:
+                matches_all_filters = False
+                continue
             
         # Genre filter - check if ALL selected genres are in the content's genres
         if filters['genres']:
-            content_genres = [g.strip().lower() for g in content.get('listed_in', '').split(',')]
-            selected_genres = [g.strip().lower() for g in filters['genres']]
-            if not all(genre in content_genres for genre in selected_genres):
+            content_genres = set(g.strip().lower() for g in content.get('listed_in', '').split(','))
+            selected_genres = set(g.strip().lower() for g in filters['genres'])
+            
+            if not selected_genres.issubset(content_genres):
+                matches_all_filters = False
                 continue
             
         # Rating filter
-        if filters['ratings'] and content.get('rating') not in filters['ratings']:
-            continue
+        if filters['ratings']:
+            if content.get('rating') not in filters['ratings']:
+                matches_all_filters = False
+                continue
             
         # Release year filter
         try:
             release_year = int(content.get('release_year', 0))
             if release_year < filters['year_range'][0] or release_year > filters['year_range'][1]:
+                matches_all_filters = False
                 continue
         except (ValueError, TypeError):
+            matches_all_filters = False
             continue
             
         # Duration filter (different handling for movies and shows)
-        duration = content.get('duration', '')
-        if filters['content_type'] == 'Movie' and 'min' in duration:
-            try:
-                minutes = int(duration.split()[0])
-                if minutes < filters['duration_range'][0] or minutes > filters['duration_range'][1]:
+        if filters['content_type'] == 'Movie':
+            duration = content.get('duration', '')
+            if 'min' in duration:
+                try:
+                    minutes = int(duration.split()[0])
+                    if minutes < filters['duration_range'][0] or minutes > filters['duration_range'][1]:
+                        matches_all_filters = False
+                        continue
+                except (ValueError, IndexError):
+                    matches_all_filters = False
                     continue
-            except (ValueError, IndexError):
-                continue
 
         # Director filter (optional)
         if filters['director']:
             director = (content.get('director', '') or '').lower()
-            if filters['director'].lower() not in director:
+            if not any(name.strip().lower() in director for name in filters['director'].split(',')):
+                matches_all_filters = False
                 continue
 
         # Cast filter (optional)
         if filters['cast']:
             cast = (content.get('cast', '') or '').lower()
-            if filters['cast'].lower() not in cast:
+            if not any(name.strip().lower() in cast for name in filters['cast'].split(',')):
+                matches_all_filters = False
                 continue
         
-        filtered.append(content)
+        if matches_all_filters:
+            filtered.append(content)
     
     return filtered