Update main.py

main.py

@@ -1,5 +1,4 @@
 import os
-from datetime import datetime
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from pymongo import MongoClient, DESCENDING
@@ -12,6 +11,10 @@ client = MongoClient(os.environ.get("MONGODB_URI"))
 db = client['myanmarswe_cinema']
 metas_col, streams_col, users_col = db['metas'], db['streams'], db['users']
 
+# Genre list များ (Manifest တွင် ပြသရန်)
+MOVIE_GENRES = ["Action", "Adventure", "Animation", "Comedy", "Crime", "Documentary", "Drama", "Family", "Fantasy", "History", "Horror", "Music", "Mystery", "Romance", "Sci-Fi", "Thriller", "War"]
+SERIES_GENRES = ["Action & Adventure", "Animation", "Comedy", "Crime", "Documentary", "Drama", "Family", "Kids", "Mystery", "News", "Reality", "Sci-Fi & Fantasy", "Soap", "Talk", "War & Politics"]
+
 def is_user_valid(key):
     user = users_col.find_one({"key": key})
     return user and user.get("status") == "active"
@@ -26,15 +29,29 @@ def manifest(user_key: str):
     valid = is_user_valid(user_key)
     return {
         "id": "com.myanmarswe.pro",
-        "version": "2.7.0",
+        "version": "2.8.0",
         "name": f"MSwe Cinema {'💎' if valid else '⚠️'}",
         "resources": ["catalog", "meta", "stream"],
         "types": ["movie", "series"],
         "idPrefixes": ["tmdb:", "tmdb_col:"],
         "catalogs": [
-            {"type": "movie", "id": "mswe_m", "name": "Latest Movies", "extra": [{"name": "search"}]},
-            {"type": "series", "id": "mswe_s", "name": "Latest TV Shows", "extra": [{"name": "search"}]},
-            {"type": "series", "id": "mswe_col", "name": "Collections"}
+            {
+                "type": "movie", 
+                "id": "mswe_m", 
+                "name": "Latest Movies", 
+                "extra": [{"name": "search"}, {"name": "genre", "options": MOVIE_GENRES}]
+            },
+            {
+                "type": "series", 
+                "id": "mswe_s", 
+                "name": "Latest TV Shows", 
+                "extra": [{"name": "search"}, {"name": "genre", "options": SERIES_GENRES}]
+            },
+            {
+                "type": "series", 
+                "id": "mswe_col", 
+                "name": "Collections"
+            }
         ]
     }
 
@@ -42,16 +59,22 @@ def manifest(user_key: str):
 @app.get("/{user_key}/catalog/{m_type}/{cat_id}/{extra}.json")
 def catalog(user_key: str, m_type: str, cat_id: str, extra: str = None):
     if not is_user_valid(user_key): return {"metas": []}
-    query = {}
-    if extra and "search=" in extra:
-        query["name"] = {"$regex": extra.replace("search=", ""), "$options": "i"}
     
+    query = {}
     if cat_id == "mswe_col":
         query["id"] = {"$regex": "^tmdb_col:"}
     else:
         query["type"] = m_type
         if "id" not in query: query["id"] = {"$regex": "^tmdb:"}
 
+    # Genre နှင့် Search Filter ကို ကိုင်တွယ်ခြင်း
+    if extra:
+        params = dict(x.split('=') for x in extra.split('&') if '=' in x)
+        if "search" in params:
+            query["name"] = {"$regex": params["search"], "$options": "i"}
+        if "genre" in params:
+            query["genres"] = params["genre"]
+
     cursor = metas_col.find(query).sort("updated_at", DESCENDING).limit(100)
     
     metas_list = []
@@ -61,10 +84,10 @@ def catalog(user_key: str, m_type: str, cat_id: str, extra: str = None):
             "type": m.get("type", m_type),
             "name": m.get("name"),
             "poster": m.get("poster"),
-            "logo": m.get("logo"), # Logo ပါဝင်အောင်ထည့်ထားသည်
+            "logo": m.get("logo"), # Logo ရှိလျှင် Stremio မှ စာသားအစား Logo ပြပေးမည်
             "description": m.get("description"),
             "genres": m.get("genres", []),
-            "releaseInfo": m.get("releaseInfo", m.get("year", "")),
+            "releaseInfo": str(m.get("releaseInfo", m.get("year", ""))),
             "imdbRating": m.get("imdbRating"),
             "runtime": m.get("runtime")
         })
@@ -75,12 +98,15 @@ def meta(user_key: str, m_type: str, meta_id: str):
     if not is_user_valid(user_key): return {"meta": {}}
     m = metas_col.find_one({"id": meta_id})
     if not m: return {"meta": {}}
-    m.pop("_id", None)
     
-    # Cast, Director များကို List string အဖြစ် သေချာပြောင်းပေးခြင်း
-    if "cast" in m: m["cast"] = list(m["cast"]) if isinstance(m["cast"], (list, set)) else []
-    if "director" in m: m["director"] = list(m["director"]) if isinstance(m["director"], (list, set)) else []
+    m.pop("_id", None)
     
+    # Cast နှင့် Director ကို String List ဖြစ်အောင် သေချာပြန်ပြင်ပေးခြင်း
+    if "cast" in m:
+        m["cast"] = [str(x) for x in m["cast"] if x]
+    if "director" in m:
+        m["director"] = [str(x) for x in m["director"] if x]
+        
     return {"meta": m}
 
 @app.get("/{user_key}/stream/{m_type}/{id}.json")