Update app.py

app.py

@@ -24,7 +24,6 @@ def base62_to_int(e):
 # Construct the base URL for the shared album
 def get_base_url(token: str) -> str:
     first_char = token[0]
-    # If first char is "A", use only the next character; otherwise use the next two characters
     n = base62_to_int(token[1]) if first_char == "A" else base62_to_int(token[1:3])
     base_url = f"https://p{n:02d}-sharedstreams.icloud.com/{token}/sharedstreams/"
     return base_url
@@ -66,7 +65,7 @@ def get_asset_urls(base_url: str, guids: list):
     response = requests.post(url, headers=headers, data=data)
     return response.json().get("items", {})
 
-# Main endpoint to extract videos
+# Main endpoint to extract videos with enhanced checks
 @app.get("/album/{token}")
 def get_album(token: str):
     try:
@@ -81,10 +80,13 @@ def get_album(token: str):
         for photo in metadata:
             best_video = None
             best_size = 0
-            # Check all derivatives for potential video files
+            # First, check the derivatives field
             for derivative in photo.get("derivatives", {}).values():
-                # Check if it's a video based on mediaAssetType or type field
-                if derivative.get("mediaAssetType") == "video" or derivative.get("type", "").startswith("video"):
+                if (
+                    derivative.get("mediaAssetType") == "video" or
+                    derivative.get("type", "").startswith("video") or
+                    derivative.get("filename", "").endswith(".mp4")
+                ):
                     try:
                         file_size = int(derivative.get("fileSize", 0))
                     except ValueError:
@@ -92,7 +94,18 @@ def get_album(token: str):
                     if file_size > best_size:
                         best_size = file_size
                         best_video = derivative
-            # If a best video candidate is found, try to build the video URL
+            # If no derivative qualifies, check a potential 'movies' field
+            if not best_video and "movies" in photo:
+                for movie in photo["movies"]:
+                    if movie.get("filename", "").endswith(".mp4"):
+                        try:
+                            file_size = int(movie.get("fileSize", 0))
+                        except ValueError:
+                            file_size = 0
+                        if file_size > best_size:
+                            best_size = file_size
+                            best_video = movie
+            # Build the video URL if found and if its checksum is in the asset_urls
             if best_video and best_video.get("checksum") in asset_urls:
                 url_info = asset_urls[best_video["checksum"]]
                 video_url = f"https://{url_info['url_location']}{url_info['url_path']}"