reduce complexity

Author: Abssdghi

Apple-Music-Scraper/main.py

@@ -635,92 +635,75 @@ def video_scrape(
     headers = {"User-Agent": "Mozilla/5.0"}
 
     try:
-        rspn = requests.get(url, headers=headers, timeout=10)
-        rspn.raise_for_status()
+        resp = requests.get(url, headers=headers, timeout=10)
+        resp.raise_for_status()
     except Exception:
         return result
 
-    soup = BeautifulSoup(rspn.text, "html.parser")
-    tag = soup.find("script", {"id": "serialized-server-data"})
+    soup = BeautifulSoup(resp.text, "html.parser")
+
+    # Load JSON blob
+    tag = soup.find("script", id="serialized-server-data")
     if not tag:
         return result
 
     try:
         data = json.loads(tag.text)
         sections = data[0]["data"]["sections"]
-    except (KeyError, IndexError, json.JSONDecodeError):
+    except Exception:
         return result
 
-    music_video_header = None
-    more = None
-    similar = None
+    # Extract relevant sections
+    music_video_header = next((s for s in sections if "music-video-header" in s.get("id", "")), None)
+    more_sec = next((s for s in sections if "more-by-artist" in s.get("id", "")), None)
+    similar_sec = next((s for s in sections if "more-in-genre" in s.get("id", "")), None)
 
-    for sec in sections:
-        sec_id = sec.get("id", "")
-        if "music-video-header" in sec_id:
-            music_video_header = sec
-        elif "more-by-artist" in sec_id:
-            more = sec
-        elif "more-in-genre" in sec_id:
-            similar = sec
-
-    # TITLE
+    # Parse main item
     item = (music_video_header or {}).get("items", [{}])[0]
     result["title"] = item.get("title", "")
 
-    # IMAGE
-    try:
-        artwork = item.get("artwork", {}).get("dictionary", {})
+    # Artwork
+    artwork = item.get("artwork", {}).get("dictionary", {})
+    if artwork:
         result["image"] = get_cover(
             artwork.get("url", ""),
             artwork.get("width", 0),
-            artwork.get("height", 0),
+            artwork.get("height", 0)
         )
-    except Exception:
-        pass
 
-    # ARTIST
-    try:
-        sl = item.get("subtitleLinks", [])[0]
-        result["artist"]["title"] = sl.get("title", "")
-        result["artist"]["url"] = (
-            sl["segue"]["actionMetrics"]
-            ["data"][0]["fields"]["actionUrl"]
-        )
-    except Exception:
-        pass
-
-    # VIDEO URL
-    try:
-        json_tag = soup.find(
-            "script",
-            {
-                "id": "schema:music-video",
-                "type": "application/ld+json"
-            }
-        )
-        schema_data = json.loads(json_tag.string)
-        result["video-url"] = schema_data["video"]["contentUrl"]
-    except (AttributeError, KeyError, TypeError, json.JSONDecodeError):
-        pass
+    # Artist info
+    sl = item.get("subtitleLinks", [{}])[0]
+    result["artist"]["title"] = sl.get("title", "")
+    result["artist"]["url"] = (
+        sl.get("segue", {})
+          .get("actionMetrics", {})
+          .get("data", [{}])[0]
+          .get("fields", {})
+          .get("actionUrl", "")
+    )
 
-    # MORE BY ARTIST
-    try:
-        for m in more.get("items", []):
+    # Video URL (from JSON-LD)
+    schema_tag = soup.find("script", id="schema:music-video")
+    if schema_tag:
+        try:
+            schema_data = json.loads(schema_tag.string)
+            result["video-url"] = schema_data.get("video", {}).get("contentUrl", "")
+        except Exception:
+            pass
+
+    # More by artist
+    if more_sec:
+        for m in more_sec.get("items", []):
             url = safe_action_url(m)
             if url:
                 result["more"].append(url)
-    except Exception:
-        pass
 
-    # SIMILAR
-    try:
-        for s in similar.get("items", []):
+    # Similar videos
+    if similar_sec:
+        for s in similar_sec.get("items", []):
             url = safe_action_url(s)
             if url:
                 result["similar"].append(url)
-    except Exception:
-        pass
 
     return result
 
@@ -955,6 +938,3 @@ def test_all_functions():
         print("artist_scrape ERROR:", e)
 
     print("\n=== ALL TESTS COMPLETED ===")
-
-
-# test_all_functions()