Update scripts/download_magic.py

scripts/download_magic.py

@@ -2,14 +2,18 @@
 """
 Mágica %download para IPython / Jupyter / Colab.
 Lee el token de CivitAI desde ~/.civitai_token.pkl (pickle)
+Incluye barra de progreso interactiva.
+
 Uso:
     import download_magic
     %download https://civitai.com/api/download/models/..., https://huggingface.co/...
+    %download https://drive.google.com/file/d/123.../view -o MiModelo.safetensors
 """
 
 from IPython import get_ipython
 from IPython.core.magic import register_line_magic
-from IPython.display import HTML, display
+from IPython.display import HTML, display, clear_output
+import ipywidgets as widgets
 import os
 import subprocess
 import re
@@ -27,56 +31,148 @@ if TOKEN_FILE.exists():
         pass
 # ---------------------------------------------
 
+def ejecutar_con_progreso(cmd, is_gdown=False):
+    """Ejecuta el comando leyendo la salida para animar la barra de progreso."""
+    progress_bar = widgets.IntProgress(
+        value=0, min=0, max=100, 
+        description='Progreso:', 
+        bar_style='info', 
+        orientation='horizontal', 
+        layout=widgets.Layout(width='80%')
+    )
+    status_label = widgets.Label(value="Iniciando descarga...")
+    display(widgets.VBox([progress_bar, status_label]))
+    
+    process = subprocess.Popen(
+        cmd, 
+        stdout=subprocess.PIPE, 
+        stderr=subprocess.STDOUT, 
+        text=True, 
+        bufsize=1, 
+        universal_newlines=True
+    )
+    
+    for line in process.stdout:
+        if not is_gdown:
+            # Capturar progreso de aria2c: ej. (27%) y DL:1.2MiB
+            match_pct = re.search(r'\((\d+)%\)', line)
+            if match_pct:
+                progress_bar.value = int(match_pct.group(1))
+            
+            match_speed = re.search(r'DL:([^\s]+)', line)
+            if match_speed:
+                status_label.value = f"Descargando... Velocidad: {match_speed.group(1)}"
+        else:
+            # Capturar progreso de gdown
+            match_pct = re.search(r'(\d{1,3})%', line)
+            if match_pct:
+                progress_bar.value = int(match_pct.group(1))
+                status_label.value = "Descargando con gdown..."
+
+    process.wait()
+    progress_bar.value = 100
+    progress_bar.bar_style = 'success'
+    status_label.value = "¡Descarga de este archivo completada! ✅"
+
 @register_line_magic
 def download(line):
     """
-    %download url1, url2, ...
+    %download url1 [-o nombre1.ext], url2, ...
     Muestra solo el nombre real y respeta la carpeta actual (%cd).
+    Auto-detecta enlaces de Drive para usar gdown y permite renombrado.
     """
     dest = os.getcwd()
-    urls = [u.strip() for u in line.split(",") if u.strip()]
-
-    for url in urls:
-        # ---------- CivitAI ----------
-        if "civitai.com" in url:
-            if not token:
-                display(HTML("<h4 style='color:red;'>⚠️ Token de CivitAI no encontrado.</h4>"))
-                continue
-            url_token = f"{url}{'&' if '?' in url else '?'}token={token}"
-
-            try:
-                with requests.get(url_token, stream=True, timeout=5) as r:
-                    cd = r.headers.get('Content-Disposition', '')
-                    match = re.findall(r'filename[*]?=(?:UTF-8\'\')?["\']?([^"\';]+)["\']?', cd)
-                    pretty = match[0] if match else url.split('/')[-1].split('?')[0]
-            except Exception:
-                pretty = url.split('/')[-1].split('?')[0]
-
-            display(HTML(f"<h3 style='color:yellow;'>📥 Descargando: <code>{pretty}</code></h3>"
+    # Separar por comas para soportar múltiples descargas en la misma línea
+    items = [item.strip() for item in line.split(",") if item.strip()]
+
+    for item in items:
+        # Extraer URL y el posible nombre personalizado usando regex para atrapar " -o "
+        parts = re.split(r'\s+-o\s+', item, maxsplit=1)
+        url = parts[0].strip()
+        custom_name = parts[1].strip() if len(parts) > 1 else None
+
+        # ---------- Google Drive (gdown) ----------
+        if "drive.google.com" in url:
+            pretty = custom_name if custom_name else "Archivo de Google Drive (Gdown gestiona el nombre)"
+            display(HTML(f"<hr><h3 style='color:yellow;'>🛸 Descargando (gdown): <code>{pretty}</code></h3>"
                          f"<h4 style='color:cyan;'>📁 Destino: <code>{dest}</code></h4>"))
+            
+            cmd = ["gdown", "--fuzzy", url]
+            # Si hay nombre custom, le damos la ruta exacta, si no, el directorio
+            if custom_name:
+                cmd.extend(["-O", os.path.join(dest, custom_name)])
+            else:
+                cmd.extend(["-O", f"{dest}/"]) 
+            
+            ejecutar_con_progreso(cmd, is_gdown=True)
 
-            subprocess.run([
-                "aria2c", "--console-log-level=error", "--content-disposition",
-                "-c", "-x", "6", "-s", "6", "-k", "1M",
-                "-d", dest, url_token
-            ])
+        # ---------- CivitAI y CivitaiArchive (aria2) ----------
+        elif "civitai.com" in url or "civitaiarchive.com" in url:
+            if not token and "civitai.com" in url:
+                display(HTML("<h4 style='color:red;'>⚠️ Token de CivitAI no encontrado (algunos modelos pueden fallar).</h4>"))
+            
+            url_token = url
+            if token and ("civitai.com" in url or "civitaiarchive.com" in url):
+                url_token = f"{url}{'&' if '?' in url else '?'}token={token}"
 
-        # ---------- HuggingFace ----------
+            # Si el usuario mandó nombre manual, lo usamos. Si no, consultamos la API para saberlo.
+            if custom_name:
+                pretty = custom_name
+            else:
+                try:
+                    with requests.get(url_token, stream=True, timeout=5) as r:
+                        cd = r.headers.get('Content-Disposition', '')
+                        match = re.findall(r'filename[*]?=(?:UTF-8\'\')?["\']?([^"\';]+)["\']?', cd)
+                        pretty = match[0] if match else url.split('/')[-1].split('?')[0]
+                except Exception:
+                    pretty = url.split('/')[-1].split('?')[0]
+
+            display(HTML(f"<hr><h3 style='color:yellow;'>📥 Descargando (aria2): <code>{pretty}</code></h3>"
+                         f"<h4 style='color:cyan;'>📁 Destino: <code>{dest}</code></h4>"))
+
+            cmd = [
+                "aria2c", "--summary-interval=1",
+                "-c", "-x", "16", "-s", "16", "-k", "1M",
+                "-d", dest
+            ]
+            
+            # Si hay nombre personalizado, usamos -o. Si no, usamos content-disposition
+            if custom_name:
+                cmd.extend(["-o", custom_name])
+            else:
+                cmd.append("--content-disposition")
+                
+            cmd.append(url_token)
+            ejecutar_con_progreso(cmd, is_gdown=False)
+
+        # ---------- HuggingFace / Otros (aria2) ----------
         else:
-            pretty = url.split('/')[-1].split('?')[0]
-            display(HTML(f"<h3 style='color:yellow;'>📥 Descargando: <code>{pretty}</code></h3>"
+            pretty = custom_name if custom_name else url.split('/')[-1].split('?')[0]
+            display(HTML(f"<hr><h3 style='color:yellow;'>📥 Descargando (aria2): <code>{pretty}</code></h3>"
                          f"<h4 style='color:cyan;'>📁 Destino: <code>{dest}</code></h4>"))
-            subprocess.run([
-                "aria2c", "--console-log-level=error", "--content-disposition",
-                "-c", "-x", "8", "-s", "8", "-k", "1M",
-                "-d", dest, "-o", pretty, url
-            ])
-            for f in os.listdir(dest):
-                if re.fullmatch(r'[0-9a-f]{64}', f):
-                    os.rename(os.path.join(dest, f), os.path.join(dest, pretty))
-                    break
-
-    display(HTML("<h3 style='color:lightgreen;'>✅ Descarga finalizada</h3>"))
+            
+            cmd = [
+                "aria2c", "--summary-interval=1",
+                "-c", "-x", "16", "-s", "16", "-k", "1M",
+                "-d", dest
+            ]
+            
+            if custom_name:
+                cmd.extend(["-o", custom_name])
+            else:
+                cmd.extend(["-o", pretty])
+                
+            cmd.append(url)
+            ejecutar_con_progreso(cmd, is_gdown=False)
+
+            # Limpiar hashes de 64 caracteres típicos de HuggingFace si quedó suelto y no hay nombre custom
+            if not custom_name and ("huggingface.co" in url):
+                for f in os.listdir(dest):
+                    if re.fullmatch(r'[0-9a-f]{64}', f):
+                        os.rename(os.path.join(dest, f), os.path.join(dest, pretty))
+                        break
+
+    display(HTML("<br><h3 style='color:lightgreen;'>✅ ¡Todas las descargas solicitadas han finalizado!</h3>"))
 
 # Registramos la línea mágica al importar el módulo
 get_ipython().register_magic_function(download, magic_kind='line')