change code style for ai checks

Author: Abssdghi

Apple-Music-Scraper/main.py

@@ -1,37 +1,8 @@
 from bs4 import BeautifulSoup
 import requests
 import json
-from utils import convert_album_to_song_url, get_cover, get_all_singles
-
-
-def safe_action_url(item):
-    try:
-        # segue-based URLs (most items)
-        return item["segue"]["actionMetrics"]["data"][0]["fields"]["actionUrl"]
-    except Exception:
-        pass
-
-    try:
-        # fallback: plain contentDescriptor
-        return item["contentDescriptor"]["url"]
-    except Exception:
-        return None
-
-
-def find_section(sections, key):
-    for sec in sections:
-        if key in sec.get("id", ""):
-            return sec
-    return None
-
-
-def append_urls_from_section(section, target_list):
-    if not section:
-        return
-    for it in section.get("items", []):
-        url = safe_action_url(it)
-        if url:
-            target_list.append(url)
+from utils import convert_album_to_song_url, get_cover
+from utils import safe_action_url, find_section, append_urls_from_section
 
 
 def room_scrape(link="https://music.apple.com/us/room/6748797380"):
@@ -697,7 +668,6 @@ def video_scrape(
     item = (music_video_header or {}).get("items", [{}])[0]
     result["title"] = item.get("title", "")
 
-
     # IMAGE
     try:
         artwork = item.get("artwork", {}).get("dictionary", {})
@@ -824,16 +794,16 @@ def artist_scrape(url="https://music.apple.com/us/artist/king-princess/134996853
     except (KeyError, IndexError, json.JSONDecodeError):
         return result
 
-    artist_detail   = find_section(sections, "artist-detail-header-section")
-    latest_and_top  = find_section(sections, "latest-release-and-top-songs")
-    albums          = find_section(sections, "full-albums")
-    playlists       = find_section(sections, "playlists")
-    videos          = find_section(sections, "music-videos")
-    appears_on      = find_section(sections, "appears-on")
-    more_to_see     = find_section(sections, "more-to-see")
-    more_to_hear    = find_section(sections, "more-to-hear")
-    bio             = find_section(sections, "artist-bio")
-    similar         = find_section(sections, "similar-artists")
+    artist_detail = find_section(sections, "artist-detail-header-section")
+    latest_and_top = find_section(sections, "latest-release-and-top-songs")
+    albums = find_section(sections, "full-albums")
+    playlists = find_section(sections, "playlists")
+    videos = find_section(sections, "music-videos")
+    appears_on = find_section(sections, "appears-on")
+    more_to_see = find_section(sections, "more-to-see")
+    more_to_hear = find_section(sections, "more-to-hear")
+    bio = find_section(sections, "artist-bio")
+    similar = find_section(sections, "similar-artists")
 
     # HEADER
     try:
@@ -987,4 +957,4 @@ def test_all_functions():
     print("\n=== ALL TESTS COMPLETED ===")
 
 
-test_all_functions()
+# test_all_functions()

Apple-Music-Scraper/utils.py

@@ -156,3 +156,117 @@ def get_all_singles(url="https://music.apple.com/us/artist/king-princess/1349968
             continue
 
     return result
+
+
+def safe_action_url(item):
+    """
+    Safely extract an Apple Music "actionUrl" from a section item.
+
+    This function attempts to extract a playable or navigational URL from
+    Apple Music's internal JSON structure. It first looks for URLs provided
+    via `segue -> actionMetrics`, which is the most common structure. If that
+    fails, it falls back to the `contentDescriptor` URL when available.
+
+    Parameters
+    ----------
+    item : dict
+        A dictionary representing an Apple Music content item inside a section.
+
+    Returns
+    -------
+    str or None
+        The extracted URL if available, otherwise None.
+
+    Notes
+    -----
+    This helper prevents repetitive try/except blocks throughout all scraper
+    functions and gracefully handles missing keys, unexpected formats, or
+    incomplete items.
+    """
+    try:
+        # segue-based URLs (most items)
+        return item["segue"]["actionMetrics"]["data"][0]["fields"]["actionUrl"]
+    except Exception:
+        pass
+
+    try:
+        # fallback: plain contentDescriptor
+        return item["contentDescriptor"]["url"]
+    except Exception:
+        return None
+
+
+def find_section(sections, key):
+    """
+    Locate a specific Apple Music section by matching a substring in its ID.
+
+    This utility searches through the list of sections extracted from
+    Apple Music's `serialized-server-data` and returns the first section
+    whose "id" field contains the provided key substring.
+
+    Parameters
+    ----------
+    sections : list[dict]
+        List of section dictionaries parsed from Apple Music page data.
+    key : str
+        Substring to search for inside the section ID.
+
+    Returns
+    -------
+    dict or None
+        The matching section dictionary if found, otherwise None.
+
+    Notes
+    -----
+    Apple Music uses structured section IDs such as:
+        - "artist-detail-header-section"
+        - "track-list"
+        - "music-videos"
+        - "similar-artists"
+    This function simplifies section lookup and reduces repeated loops and
+    conditional chains in scraper functions.
+    """
+    for sec in sections:
+        if key in sec.get("id", ""):
+            return sec
+    return None
+
+
+def append_urls_from_section(section, target_list):
+    """
+    Extract URLs from a section and append them to a target list.
+
+    This helper iterates through all items inside a given Apple Music
+    section, uses `safe_action_url()` to safely extract their URLs,
+    and appends each valid URL to the provided list.
+
+    Parameters
+    ----------
+    section : dict or None
+        The section dictionary containing an "items" list. If None, the
+        function does nothing.
+    target_list : list
+        The list to which valid extracted URLs will be appended.
+
+    Returns
+    -------
+    None
+        This function modifies target_list in-place.
+
+    Notes
+    -----
+    Many Apple Music sections such as:
+        - top songs
+        - albums
+        - playlists
+        - videos
+        - similar artists
+    share the same internal structure. This helper removes code duplication
+    and ensures unified URL extraction behavior.
+    """
+    if not section:
+        return
+    for it in section.get("items", []):
+        url = safe_action_url(it)
+        if url:
+            target_list.append(url)