Update app.py

app.py

@@ -11,7 +11,7 @@ client_ids = os.getenv("SPOTIFY_CLIENT_IDS", "").split(',')
 client_secrets = os.getenv("SPOTIFY_CLIENT_SECRETS", "").split(',')
 
 if not client_ids or not client_secrets:
-    raise ValueError("Faltan variables de entorno SPOTIFY_CLIENT_IDS o SPOTIFY_CLIENT_SECRETS")
+    raise ValueError("❌ Faltan variables de entorno SPOTIFY_CLIENT_IDS o SPOTIFY_CLIENT_SECRETS")
 
 # Gestión de Rotación de Clientes
 current_client_index = 0
@@ -22,7 +22,7 @@ def rotate_client():
     global current_client_index, request_counter
     current_client_index = (current_client_index + 1) % len(client_ids)
     request_counter = 0
-    print(f"🔁 Rotando a cliente Spotify #{current_client_index + 1}")
+    print(f"🔄 Rotando a cliente Spotify #{current_client_index + 1}")
 
 def get_spotify_token():
     global current_client_index
@@ -36,6 +36,7 @@ def get_spotify_token():
             data={'grant_type': 'client_credentials'},
             auth=(client_id, client_secret)
         )
+        
         if response.status_code == 200:
             return response.json().get('access_token')
         
@@ -44,13 +45,12 @@ def get_spotify_token():
     
     raise Exception("🚨 Todos los clientes fallaron al obtener token")
 
-# Funciones Principales
 def make_spotify_request(url, params=None):
     global request_counter
     token = get_spotify_token()
     headers = {'Authorization': f'Bearer {token}'}
     
-    for _ in range(3):  # Reintentos máximos
+    for _ in range(3):  # 3 intentos por cliente
         response = requests.get(url, headers=headers, params=params)
         request_counter += 1
         
@@ -70,30 +70,39 @@ def make_spotify_request(url, params=None):
     
     return None
 
-def extract_spotify_id(url, type_keyword):
+def extract_spotify_id(url, resource_type):
     """Extrae ID de diferentes formatos de URLs de Spotify"""
-    if type_keyword in url:
-        parts = url.split(f"/{type_keyword}/")
-        if len(parts) > 1:
-            return parts[1].split("?")[0].split("/")[0]
+    clean_url = url.strip().split('?')[0].replace("https://open.spotify.com/", "")
+    
+    # Manejar URLs con /intl-xx/
+    if "/intl-" in clean_url:
+        parts = clean_url.split("/")
+        return parts[-1]
     
-    # Manejo de URLs complejas
-    parts = [p for p in url.split("/") if p]
-    for i, part in enumerate(parts):
-        if part == type_keyword and i < len(parts)-1:
-            return parts[i+1].split("?")[0]
+    parts = clean_url.split("/")
     
-    return url.split("/")[-1].split("?")[0]
+    try:
+        index = parts.index(resource_type)
+        return parts[index + 1] if index + 1 < len(parts) else None
+    except ValueError:
+        for part in parts:
+            if len(part) == 22 and resource_type in url:
+                return part
+        return None
 
 def get_playlist_tracks(playlist_url):
     playlist_id = extract_spotify_id(playlist_url, "playlist")
-    print(f"🎧 Obteniendo playlist: {playlist_id}")
+    if not playlist_id or len(playlist_id) != 22:
+        print(f"❌ ID de playlist inválido: {playlist_id}")
+        return []
     
+    print(f"🎧 Obteniendo playlist: {playlist_id}")
     all_tracks = []
     url = f'https://api.spotify.com/v1/playlists/{playlist_id}/tracks'
+    params = {'market': 'US', 'limit': 100}
     
     while url:
-        data = make_spotify_request(url)
+        data = make_spotify_request(url, params)
         if not data:
             break
             
@@ -105,30 +114,23 @@ def get_playlist_tracks(playlist_url):
 
 def get_album_tracks(album_url):
     album_id = extract_spotify_id(album_url, "album")
-    print(f"💿 Obteniendo álbum: {album_id}")
-    
-    # Obtener información básica del álbum
-    album_data = make_spotify_request(f'https://api.spotify.com/v1/albums/{album_id}')
-    if not album_data:
+    if not album_id or len(album_id) != 22:
+        print(f"❌ ID de álbum inválido: {album_id}")
         return []
     
+    print(f"💿 Obteniendo álbum: {album_id}")
     all_tracks = []
     url = f'https://api.spotify.com/v1/albums/{album_id}/tracks'
+    params = {'market': 'US', 'limit': 50}
     
     while url:
-        data = make_spotify_request(url)
+        data = make_spotify_request(url, params)
         if not data:
             break
             
-        # Obtener detalles completos de cada track
         for item in data.get('items', []):
             track_data = make_spotify_request(f"https://api.spotify.com/v1/tracks/{item['id']}")
             if track_data:
-                track_data['album'] = {  # Añadir info del álbum
-                    'name': album_data.get('name'),
-                    'release_date': album_data.get('release_date'),
-                    'id': album_id
-                }
                 all_tracks.append(track_data)
         
         url = data.get('next')
@@ -155,7 +157,6 @@ def process_tracks(urls):
     
     return all_tracks
 
-# Procesamiento de Datos
 def create_final_dataframe(tracks, include_all_info=True):
     artist_cache = {}
     
@@ -213,38 +214,38 @@ def create_final_dataframe(tracks, include_all_info=True):
     
     return df
 
-# Interfaz Gradio
 def main_interface(project_name, spotify_urls, include_all_info=True):
-    urls = [url.strip() for url in spotify_urls.strip().split('\n') if url.strip()]
+    # Convertir URLs separadas por comas o saltos de línea
+    urls = [url.strip() for url in spotify_urls.replace('\n', ',').split(',') if url.strip()]
     
     if not urls:
-        return pd.DataFrame({"Error": ["Ingresa al menos una URL válida"]}), None
+        return pd.DataFrame({"Error": ["❌ Ingresa al menos una URL válida"]}), None
     
     print("⏳ Procesando URLs...")
     tracks = process_tracks(urls)
     
     if not tracks:
-        return pd.DataFrame({"Error": ["No se encontraron tracks"]}), None
+        return pd.DataFrame({"Error": ["❌ No se encontraron tracks"]}), None
     
     print("📊 Creando dataframe...")
     df = create_final_dataframe(tracks, include_all_info)
     
     with NamedTemporaryFile(delete=False, suffix='.xlsx') as tmp:
         df.to_excel(tmp.name, index=False)
-        final_filename = f"{project_name}.xlsx" if project_name else "spotify_tracks.xlsx"
+        final_filename = f"{project_name or 'spotify_tracks'}.xlsx"
         shutil.move(tmp.name, final_filename)
     
     print("✅ Proceso completado")
     return df, final_filename
 
-# Configuración de la UI
+# Configuración de la Interfaz
 iface = gr.Interface(
     fn=main_interface,
     inputs=[
         gr.Textbox(label="Nombre del Proyecto", placeholder="Mi Colección Musical"),
         gr.Textbox(
-            label="URLs de Spotify (1 por línea)",
-            placeholder="Pega aquí URLs de playlists, álbumes o canciones...",
+            label="URLs de Spotify",
+            placeholder="Pega URLs separadas por comas o saltos de línea (playlists, álbumes, canciones)...",
             lines=5
         ),
         gr.Checkbox(label="Incluir toda la información", value=True)
@@ -253,11 +254,11 @@ iface = gr.Interface(
         gr.Dataframe(label="Resultados"),
         gr.File(label="Descargar Excel")
     ],
-    title="🟢 Spotify Track Collector PRO",
-    description="Extrae información detallada de múltiples URLs de Spotify (playlists, álbumes, canciones) y genera un Excel unificado.",
+    title="🎵 Spotify Track Collector PRO",
+    description="Extrae información detallada de múltiples URLs de Spotify y genera un Excel unificado",
     examples=[
-        ["Mi Playlist", "https://open.spotify.com/playlist/37i9dQZF1DXcBWIGoYBM5M", True],
-        ["Álbum Clásico", "https://open.spotify.com/album/1R5BORZZxNUg8QMgbqt0nd", False]
+        ["Rock Clásico", "https://open.spotify.com/playlist/37i9dQZF1DXcBWIGoYBM5M, https://open.spotify.com/album/1R5BORZZxNUg8QMgbqt0nd", True],
+        ["Éxitos Actuales", "https://open.spotify.com/playlist/37i9dQZEtDXc8QFRQ4qegR", False]
     ],
     allow_flagging="never",
     theme=gr.themes.Soft()