Update main.py

main.py

@@ -1,4 +1,5 @@
 import os
+from datetime import datetime
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from pymongo import MongoClient, DESCENDING
@@ -14,36 +15,54 @@ metas_col, streams_col, users_col = db['metas'], db['streams'], db['users']
 def is_user_valid(key):
     user = users_col.find_one({"key": key})
     if not user or user.get("status") != "active": return False, "Invalid User"
-    try:
-        if datetime.now() > datetime.strptime(user.get("expiry"), "%Y-%m-%d"): return False, "Expired"
-    except: pass
+    expiry_str = user.get("expiry")
+    if expiry_str:
+        try:
+            # Expiry date parsing fix
+            expiry_date = datetime.strptime(expiry_str.split('T')[0], "%Y-%m-%d")
+            if datetime.now() > expiry_date: return False, "Expired"
+        except: pass
     return True, "OK"
 
 @app.get("/{user_key}/manifest.json")
 def manifest(user_key: str):
     valid, msg = is_user_valid(user_key)
     return {
-        "id": "com.myanmarswe.pro", "version": "2.1.0",
+        "id": "com.myanmarswe.pro", "version": "2.2.0",
         "name": f"MSwe Cinema {'⚠️' if not valid else '💎'}",
-        "description": msg if not valid else "Ultra-Detail Private Cinema",
+        "description": msg if not valid else "Premium Cinema Experience",
         "resources": ["catalog", "meta", "stream"],
         "types": ["movie", "series"],
         "idPrefixes": ["tmdb:"],
         "catalogs": [
-            {"type": "movie", "id": "mswe_latest_m", "name": "Latest Movies"},
-            {"type": "series", "id": "mswe_latest_s", "name": "Latest TV Shows"},
-            {"type": "movie", "id": "mswe_collections", "name": "Movie Collections"}
+            {"type": "movie", "id": "mswe_m", "name": "Latest Movies"},
+            {"type": "series", "id": "mswe_s", "name": "Latest TV Shows"},
+            {"type": "movie", "id": "mswe_col", "name": "Collections"}
         ]
     }
 
-@app.get("/{user_key}/catalog/{m_type}/{id}.json")
-def catalog(user_key: str, m_type: str, id: str):
+@app.get("/{user_key}/catalog/{m_type}/{cat_id}.json")
+def catalog(user_key: str, m_type: str, cat_id: str):
     if not is_user_valid(user_key)[0]: return {"metas": []}
     
-    query = {"type": m_type}
-    if id == "mswe_collections":
-        query = {"collection_info": {"$ne": None}}
+    # --- Collection Grouping Logic ---
+    if cat_id == "mswe_col":
+        pipeline = [
+            {"$match": {"collection_info": {"$ne": None}}},
+            {"$group": {
+                "_id": "$collection_info.id",
+                "name": {"$first": "$collection_info.name"},
+                "poster": {"$first": "$collection_info.poster_path"},
+                "updated_at": {"$max": "$updated_at"}
+            }},
+            {"$sort": {"updated_at": -1}}
+        ]
+        results = list(metas_col.aggregate(pipeline))
+        return {"metas": [{"id": f"tmdb:{r['_id']}", "type": "movie", "name": r["name"], "poster": f"https://image.tmdb.org/t/p/w500{r['poster']}"} for r in results]}
 
+    # --- Normal Movie/Series Logic ---
+    # Sheet ရဲ့ type နဲ့ catalog type ကိုက်ညီရပါမယ်
+    query = {"type": m_type}
     cursor = metas_col.find(query).sort("updated_at", DESCENDING).limit(100)
     metas = [{"id": m["id"], "type": m["type"], "name": m["name"], "poster": m["poster"]} for m in cursor]
     return {"metas": metas}
@@ -51,28 +70,23 @@ def catalog(user_key: str, m_type: str, id: str):
 @app.get("/{user_key}/meta/{m_type}/{id}.json")
 def meta(user_key: str, m_type: str, id: str):
     if not is_user_valid(user_key)[0]: return {"meta": {}}
-    
     m = metas_col.find_one({"id": id})
     if not m: return {"meta": {}}
     
-    # Related Movies logic
+    # Recommendation Logic
     related = []
     if m.get("recommendations"):
         rec_cursor = metas_col.find({"id": {"$in": [f"tmdb:{rid}" for rid in m["recommendations"]]}})
         related = [{"id": r["id"], "type": r["type"], "name": r["name"], "poster": r["poster"]} for r in rec_cursor]
 
-    # UI Optimization
-    res_meta = {
-        "id": m["id"], "type": m["type"], "name": m["name"],
-        "poster": m["poster"], "background": m["background"],
-        "logo": m.get("logo"), # Logo link
-        "description": m["description"], "releaseInfo": m["releaseInfo"],
-        "imdbRating": m["imdbRating"], "runtime": m["runtime"],
-        "genres": m["genres"], "cast": m.get("cast", []), # Cast list strings
-        "trailers": m.get("trailers", []), "videos": m.get("videos", []),
-        "related": related
+    return {
+        "meta": {
+            **m, 
+            "related": related,
+            "director": m.get("director", []), # Cast list အပြင် director ပါပို့ပေးခြင်း
+            "logo": m.get("logo") # Transparent logo link
+        }
     }
-    return {"meta": res_meta}
 
 @app.get("/{user_key}/stream/{m_type}/{id}.json")
 def stream(user_key: str, m_type: str, id: str):
@@ -82,7 +96,7 @@ def stream(user_key: str, m_type: str, id: str):
     if m_type == "series" and len(parts) == 4:
         query["season"], query["episode"] = int(parts[2]), int(parts[3])
     
-    streams = streams_col.find(query)
+    streams = list(streams_col.find(query))
     return {"streams": [{"name": "MyanmarSwe 💎", "title": "🚀 High Speed Server", "url": s["url"]} for s in streams]}
 
 @app.post("/sync-data")