Merge branch #Hans-Den/instance1' into 'Hans-Den/instance3'

app.py

@@ -1,4 +1,4 @@
-from fastapi.responses import JSONResponse, FileResponse, Response
+from fastapi.responses import JSONResponse, StreamingResponse, Response
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi import FastAPI, HTTPException, Request
 import mimetypes
@@ -32,9 +32,8 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-
 async def serve_video(file_path: str, request: Request):
-    """Serve video file with support for range requests."""
+    """Serve video file with support for range requests and proper CORS headers."""
     if not os.path.isfile(file_path):
         raise HTTPException(status_code=404, detail="Video file not found")
     
@@ -46,48 +45,68 @@ async def serve_video(file_path: str, request: Request):
     if mime_type is None:
         mime_type = 'application/octet-stream'  # Fallback MIME type
 
+    # CORS headers to attach to all responses
+    cors_headers = {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Expose-Headers': 'Content-Length, Content-Range'
+    }
+
     if range_header:
-        # Simple parsing for range values
+        # Parse range header (e.g., "bytes=START-END")
         range_specifier = range_header.replace('bytes=', '').strip()
         start, end = (None, None)
-
         if '-' in range_specifier:
             start_str, end_str = range_specifier.split('-')
             start = int(start_str)
             end = int(end_str) if end_str else file_size - 1
 
-        # Validate range
+        # Validate the range values
         if start is None or start >= file_size or (end is not None and end >= file_size) or (end is not None and start > end):
             raise HTTPException(status_code=416, detail="Requested range not satisfiable")
 
+        # Calculate content length and prepare headers
+        content_length = (end - start + 1) if end is not None else file_size - start
         headers = {
-            'Content-Range': f'bytes {start}-{end or file_size - 1}/{file_size}',
+            'Content-Range': f'bytes {start}-{end}/{file_size}',
             'Accept-Ranges': 'bytes',
-            'Content-Length': str((end - start + 1) if end is not None else file_size - start),
+            'Content-Length': str(content_length),
             'Content-Type': mime_type
         }
+        headers.update(cors_headers)
 
         async with aiofiles.open(file_path, 'rb') as f:
             await f.seek(start)
-            chunk_size = 8388608  # Read in 8MB chunks
+            chunk_size = 8 * 1024 * 1024  # 8 MB
             data = bytearray()
-
-            while start <= (end or file_size - 1):
-                remaining = (end or file_size - 1) - start + 1
+            current = start
+            while current <= end:
+                remaining = end - current + 1
                 read_size = min(chunk_size, remaining)
                 chunk = await f.read(read_size)
-
-                if not chunk:  # EOF
+                if not chunk:
                     break
-                
                 data.extend(chunk)
-                start += read_size
+                current += len(chunk)
+
+        return Response(content=bytes(data), status_code=206, headers=headers)
+    else:
+        # Fallback: Stream the entire file using StreamingResponse with proper headers
+        def iterfile():
+            with open(file_path, 'rb') as f:
+                while True:
+                    chunk = f.read(8192)
+                    if not chunk:
+                        break
+                    yield chunk
 
-            return Response(content=bytes(data), status_code=206, headers=headers)  # Convert bytearray to bytes
-
-    # Fallback for serving the whole file if no range requested
-    return FileResponse(file_path, media_type=mime_type)
+        headers = {
+            'Content-Length': str(file_size),
+            'Accept-Ranges': 'bytes',
+            'Content-Type': mime_type,
+        }
+        headers.update(cors_headers)
 
+        return StreamingResponse(iterfile(), media_type=mime_type, headers=headers)
 
 @app.get("/")
 async def index():
@@ -95,7 +114,7 @@ async def index():
 
 @app.get("/api/get/report")
 async def get_report():
-    report=instance.compile_report()
+    report = instance.compile_report()
     return JSONResponse(report)
 
 @app.get('/api/get/tv/store')
@@ -105,7 +124,7 @@ async def get_tv_store_api():
 
 @app.get('/api/get/film/store')
 async def get_film_store_api():
-    """Endpoint to get the TV store JSON."""
+    """Endpoint to get the film store JSON."""
     return JSONResponse(instance.FILM_STORE)
 
 @app.get("/api/get/film/{title}")