Update main.py

main.py

@@ -6,6 +6,7 @@ import httpx
 import random
 import asyncio
 import urllib.parse
+import mimetypes
 from bs4 import BeautifulSoup
 from fastapi import FastAPI, HTTPException, Request
 from fastapi.responses import StreamingResponse
@@ -66,6 +67,8 @@ async def download_proxy(request: Request, url: str, key: str = None):
         clean_url = urllib.parse.unquote(clean_url)
         if prev_url == clean_url: break
 
+    # ဖိုင်နာမည်ကို URL ထဲမှ ကြိုတင်ထုတ်ယူထားခြင်း (Media Type သိရှိနိုင်ရန်)
+    filename = clean_url.split('/')[-1] if '/' in clean_url else "video.mp4"
     range_header = request.headers.get('range')
 
     # --- MediaFire ---
@@ -74,9 +77,7 @@ async def download_proxy(request: Request, url: str, key: str = None):
             browser_headers = {
                 'User-Agent': ua.random,
                 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
-                'Accept-Language': 'en-US,en;q=0.5',
                 'Referer': 'https://www.mediafire.com/',
-                'Connection': 'keep-alive',
             }
             
             r = await client.get(clean_url, headers=browser_headers)
@@ -84,32 +85,27 @@ async def download_proxy(request: Request, url: str, key: str = None):
                 raise HTTPException(status_code=r.status_code, detail="MediaFire page access denied")
 
             target_link = None
-            # Method 1: Regex
+            # Direct link ရှာခြင်း
             match = re.search(r"https?://download[0-9]+\.mediafire\.com/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+/[^\s'\"]+", r.text)
             if match:
                 target_link = match.group(0).replace('"', '').replace("'", "")
             
-            # Method 2: BS4
             if not target_link:
                 soup = BeautifulSoup(r.text, 'html.parser')
                 btn = soup.find('a', {'id': 'downloadButton'})
                 if btn and btn.get('href'):
                     target_link = btn.get('href')
 
-            # --- အရေးကြီးသောပြင်ဆင်ချက်: Relative URL ကို Absolute URL သို့ပြောင်းခြင်း ---
             if target_link:
-                if target_link.startswith("//"):
-                    target_link = f"https:{target_link}"
-                elif target_link.startswith("/"):
-                    target_link = f"https://www.mediafire.com{target_link}"
+                if target_link.startswith("//"): target_link = f"https:{target_link}"
+                elif target_link.startswith("/"): target_link = f"https://www.mediafire.com{target_link}"
             
             if not target_link:
-                raise HTTPException(status_code=404, detail="Direct link extraction failed")
+                raise HTTPException(status_code=404, detail="Direct link not found")
             
-            return await stream_file(target_link, range_header, referer=clean_url)
+            return await stream_file(target_link, range_header, filename, referer=clean_url)
             
         except Exception as e:
-            print(f"MediaFire Error: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
 
     # --- Google Drive ---
@@ -131,17 +127,17 @@ async def download_proxy(request: Request, url: str, key: str = None):
                 req = client.build_request("GET", api_link, headers=headers)
                 r = await client.send(req, stream=True)
                 if r.status_code in [200, 206]:
-                    return await process_response(r)
+                    return await process_response(r, filename)
                 await r.aclose()
             except: continue
 
         public_url = f"https://drive.google.com/uc?export=download&id={file_id}"
-        return await stream_file(public_url, range_header)
+        return await stream_file(public_url, range_header, filename)
 
     else:
-        return await stream_file(clean_url, range_header)
+        return await stream_file(clean_url, range_header, filename)
 
-async def stream_file(target_url, range_header, referer=None):
+async def stream_file(target_url, range_header, filename, referer=None):
     headers = {'User-Agent': ua.random}
     if range_header: headers['Range'] = range_header
     if referer: headers['Referer'] = referer
@@ -151,24 +147,30 @@ async def stream_file(target_url, range_header, referer=None):
         r = await client.send(req, stream=True)
         if r.status_code >= 400:
             await r.aclose()
-            raise HTTPException(status_code=r.status_code, detail=f"Remote server returned {r.status_code}")
-        return await process_response(r)
+            raise HTTPException(status_code=r.status_code, detail="Remote server rejected")
+        return await process_response(r, filename)
     except Exception as e:
-        print(f"Stream Error: {e}")
         raise HTTPException(status_code=500, detail=str(e))
 
-async def process_response(r):
-    # Player များအတွက် မရှိမဖြစ်လိုအပ်သော Header များ
+async def process_response(r, filename):
+    # MIME type ခန့်မှန်းခြင်း
+    mime_type, _ = mimetypes.guess_type(filename)
+    if not mime_type or mime_type == 'application/octet-stream':
+        if filename.endswith('.mkv'): mime_type = 'video/x-matroska'
+        elif filename.endswith('.mp4'): mime_type = 'video/mp4'
+        else: mime_type = r.headers.get('content-type', 'video/mp4')
+
     safe_headers = [
-        'content-type', 'content-length', 'content-range', 
-        'accept-ranges', 'content-disposition', 'cache-control'
+        'content-length', 'content-range', 'accept-ranges', 'cache-control'
     ]
     response_headers = {n: v for n, v in r.headers.items() if n.lower() in safe_headers}
     
-    if 'accept-ranges' not in [k.lower() for k in response_headers.keys()]:
-        response_headers['Accept-Ranges'] = 'bytes'
-    
-    media_type = r.headers.get('content-type', 'application/octet-stream')
+    # nPlayer အတွက် မရှိမဖြစ်လိုအပ်ချက်များ
+    response_headers['Accept-Ranges'] = 'bytes'
+    response_headers['Content-Type'] = mime_type
+    # filename အတိအကျကို header ထဲထည့်ပေးခြင်း
+    encoded_filename = urllib.parse.quote(filename)
+    response_headers['Content-Disposition'] = f'inline; filename="{encoded_filename}"; filename*=UTF-8\'\'{encoded_filename}'
 
     async def stream_generator():
         try:
@@ -181,7 +183,7 @@ async def process_response(r):
         stream_generator(),
         status_code=r.status_code,
         headers=response_headers,
-        media_type=media_type
+        media_type=mime_type
     )
 
 if __name__ == "__main__":