Update app.py

app.py

@@ -1,4 +1,51 @@
-import gradio as gr
+def get_album_tracks(token, album_url):
+    """Get all tracks from an album URL."""
+    album_id = extract_id_from_url(album_url, "album")
+    print(f"Extracted album ID: {album_id}")
+    
+    headers = {'Authorization': f'Bearer {token}'}
+    tracks_url = f'https://api.spotify.com/v1/albums/{album_id}/tracks'
+    
+    all_tracks = []
+    next_url = tracks_url
+    
+    while next_url:
+        print(f"Fetching tracks from: {next_url}")
+        response = make_request_with_retry(next_url, headers)
+        if not response:
+            break
+            
+        data = response.json()
+        items = data.get('items', [])
+        
+        # Get album details for additional info
+        album_info = None
+        if len(all_tracks) == 0:  # Only need to get album info once
+            album_response = make_request_with_retry(f'https://api.spotify.com/v1/albums/{album_id}', headers)
+            if album_response:
+                album_info = album_response.json()
+        
+        for item in items:
+            if item:
+                # For album tracks, we need to add some missing information that's in the album
+                if album_info:
+                    item['album'] = {
+                        'name': album_info.get('name', 'Unknown'),
+                        'release_date': album_info.get('release_date', 'Not available'),
+                        'id': album_id
+                    }
+                
+                all_tracks.append(item)
+        
+        next_url = data.get('next')
+    
+    print(f"Found {len(all_tracks)} tracks in album")
+    
+    # Mark the source
+    for track in all_tracks:
+        track['playlist_source'] = album_url
+        
+    return all_tracksimport gradio as gr
 import requests
 import pandas as pd
 import time
@@ -57,15 +104,23 @@ def make_request_with_retry(url, headers, params=None, max_retries=5):
     return None
 
 def extract_id_from_url(url, type_keyword):
-    """Extract Spotify ID from URL for either track or playlist."""
-    parts = url.split("/")
-    for i, part in enumerate(parts):
-        if type_keyword in part and i + 1 < len(parts):
-            potential_id = parts[i + 1].split("?")[0]
-            if potential_id:
-                return potential_id
+    """Extract Spotify ID from URL for track, playlist or album."""
+    if type_keyword in url:
+        parts = url.split("/")
+        for i, part in enumerate(parts):
+            if type_keyword in part and i + 1 < len(parts):
+                potential_id = parts[i + 1].split("?")[0]
+                if potential_id:
+                    return potential_id
     
+    # Special handling for spotify.com/intl-xx/album type URLs
+    if "intl-" in url and "/album/" in url:
+        parts = url.split("/album/")
+        if len(parts) > 1:
+            return parts[1].split("?")[0].split("/")[0]
+            
     # If above fails, try to find ID in the last part of the URL
+    parts = url.split("/")
     last_part = parts[-1]
     if "?" in last_part:
         return last_part.split("?")[0]
@@ -200,7 +255,7 @@ def interface(project_name, spotify_urls, include_all_info=True):
     # Validate URLs
     valid_urls = []
     for url in urls_list:
-        if "spotify.com" in url and ("track" in url or "playlist" in url):
+        if "spotify.com" in url and ("track" in url or "playlist" in url or "album" in url):
             valid_urls.append(url)
         else:
             print(f"Invalid URL format, skipping: {url}")
@@ -234,6 +289,9 @@ def interface(project_name, spotify_urls, include_all_info=True):
                 if track:
                     track[0]['playlist_source'] = url
                     all_tracks.extend(track)
+            elif "album" in url:
+                album_tracks = get_album_tracks(token_spotify, url)
+                all_tracks.extend(album_tracks)
         except Exception as e:
             print(f"Error processing URL {url}: {str(e)}")
             continue
@@ -281,8 +339,8 @@ iface = gr.Interface(
     inputs=[
         gr.Textbox(label="Project Name", placeholder="Enter a name for your export"),
         gr.Textbox(
-            label="Spotify URLs (Tracks or Playlists)", 
-            placeholder="Enter one Spotify URL per line (tracks or playlists)",
+            label="Spotify URLs (Tracks, Albums or Playlists)", 
+            placeholder="Enter one Spotify URL per line (tracks, albums or playlists)",
             lines=5
         ),
         gr.Checkbox(label="Include All Track Information", value=True)
@@ -292,10 +350,11 @@ iface = gr.Interface(
         gr.File(label="Download Excel")
     ],
     title="Spotify Track Collector",
-    description="Extract tracks from multiple Spotify playlists and tracks into a single Excel file.",
+    description="Extract tracks from multiple Spotify playlists, albums, and tracks into a single Excel file.",
     examples=[
         ["Pop Collection", "https://open.spotify.com/playlist/37i9dQZF1DXcBWIGoYBM5M\nhttps://open.spotify.com/track/4cOdK2wGLETKBW3PvgPWqT", True],
-        ["Rock Collection", "https://open.spotify.com/playlist/37i9dQZF1DWXRqgorJj26U", False]
+        ["Rock Collection", "https://open.spotify.com/playlist/37i9dQZF1DWXRqgorJj26U", False],
+        ["Album Tracks", "https://open.spotify.com/album/1R5BORZZxNUg8QMgbqt0nd", True]
     ],
     allow_flagging="never"
 )