Update main.py

main.py

@@ -2,120 +2,107 @@ import os, json, glob, shutil, subprocess, tempfile, time, re, requests
 from pathlib import Path
 import gradio as gr
 from ytmusicapi import YTMusic
-import spotipy
-from spotipy.oauth2 import SpotifyClientCredentials
 from mutagen.id3 import ID3, TIT2, TPE1, TALB, TCON, TYER, TRCK, TPE2, USLT, APIC, COMM
 from mutagen.mp3 import MP3
 
-# ------------- CONFIG -------------
-# Secrets must be set in HF Space → Settings → Secrets
-SPOTIFY_CLIENT_ID = os.getenv("SPOTIFY_CLIENT_ID")
-SPOTIFY_CLIENT_SECRET = os.getenv("SPOTIFY_CLIENT_SECRET")
-# ----------------------------------
+TMP        = Path("/tmp")
+STATIC     = Path(__file__).parent
+ytm        = YTMusic()
 
-TMP = Path("/tmp")              # HF allows full r/w here
-STATIC = Path(__file__).parent  # read-only, keep code / assets only
-
-ytm = YTMusic()
-sp = None
-if SPOTIFY_CLIENT_ID and SPOTIFY_CLIENT_SECRET:
-    sp = spotipy.Spotify(
-        auth_manager=SpotifyClientCredentials(
-            client_id=SPOTIFY_CLIENT_ID,
-            client_secret=SPOTIFY_CLIENT_SECRET,
-        )
-    )
-
-# ------------- HELPERS -------------
 def safe(s: str) -> str:
     return re.sub(r'[\\/:"*?<>|]+', "", s).strip()
 
 def ytdlp_fast(url: str, out: str) -> None:
-    """Download best-audio → 320 k MP3 using aria2c."""
-    subprocess.run(
-        [
-            "yt-dlp",
-            "-f", "bestaudio/best",
-            "--extract-audio",
-            "--audio-format", "mp3",
-            "--audio-quality", "320K",
-            "--concurrent-fragments", "16",
-            "--external-downloader", "aria2c",
-            "--external-downloader-args",
-            "aria2c:-x16 -s16 -j16 -k1M --file-allocation=none",
-            "--fragment-retries", "infinite",
-            "--skip-unavailable-fragments",
-            "--no-part",
-            "--no-cache-dir",
-            "--force-ipv4",
-            "--sponsorblock-remove", "all",
-            "-o", out,
-            url,
-        ],
-        check=True,
-    )
+    subprocess.run([
+        "yt-dlp", "-f", "bestaudio/best", "--extract-audio",
+        "--audio-format", "mp3", "--audio-quality", "320K",
+        "--concurrent-fragments", "16",
+        "--external-downloader", "aria2c",
+        "--external-downloader-args", "aria2c:-x16 -s16 -j16 -k1M",
+        "--fragment-retries", "infinite", "--skip-unavailable-fragments",
+        "--no-part", "--no-cache-dir", "--force-ipv4",
+        "--sponsorblock-remove", "all", "-o", out, url
+    ], check=True)
 
-def write_tags(
-    fn: str,
-    title: str,
-    artist: str,
-    album: str,
-    year: str,
-    cover: str,
-    lyrics: str,
-    genre: str = "",
-    track: str = "",
-    album_artist: str = "",
-    description: str = "",
-):
+def write_tags(fn: str, title: str, artist: str, album: str, year: str, cover: str,
+               lyrics: str, genre: str = "", track: str = "", album_artist: str = "",
+               description: str = ""):
     audio = MP3(fn, ID3=ID3)
-    if audio.tags is None:
-        audio.add_tags()
+    if audio.tags is None: audio.add_tags()
     tags = audio.tags
     tags.add(TIT2(encoding=3, text=title))
     tags.add(TPE1(encoding=3, text=artist))
     tags.add(TALB(encoding=3, text=album))
-    if genre:
-        tags.add(TCON(encoding=3, text=genre))
-    if year:
-        tags.add(TYER(encoding=3, text=year))
-    if track:
-        tags.add(TRCK(encoding=3, text=track))
-    if album_artist:
-        tags.add(TPE2(encoding=3, text=album_artist))
-    if lyrics:
-        tags.add(USLT(encoding=3, lang="eng", desc="", text=lyrics))
-    if description:
-        tags.add(COMM(encoding=3, lang="eng", desc="desc", text=description))
+    for tag, cls, val in [(genre, TCON, genre), (year, TYER, year), (track, TRCK, track),
+                          (album_artist, TPE2, album_artist)]:
+        if val: tags.add(cls(encoding=3, text=val))
+    if lyrics: tags.add(USLT(encoding=3, lang="eng", desc="", text=lyrics))
+    if description: tags.add(COMM(encoding=3, lang="eng", desc="desc", text=description))
     if cover:
         try:
             img = requests.get(cover, timeout=15).content
-            tags.add(
-                APIC(
-                    encoding=3,
-                    mime="image/jpeg",
-                    type=3,
-                    desc="Cover",
-                    data=img,
-                )
-            )
-        except Exception:
-            pass
+            tags.add(APIC(encoding=3, mime="image/jpeg", type=3, desc="Cover", data=img))
+        except Exception: pass
     audio.save(v2_version=3)
 
-# ------------- CORE -------------
-def download_spotify(url: str) -> Path | None:
-    if not sp:
-        raise RuntimeError("Spotipy credentials not set")
-    track = sp.track(url)
-    title = track["name"]
-    artist = ", ".join(a["name"] for a in track["artists"])
-    album = track["album"]["name"]
-    date = track["album"].get("release_date", "")
-    year = date.split("-")[0] if date else ""
-    cover = track["album"]["images"][0]["url"]
-    query = f"{title} {artist}"
+def download_yt(url: str) -> Path:
+    info_json = TMP / "info.json"
+    subprocess.run([
+        "yt-dlp", "--skip-download", "--write-info-json", "--write-thumbnail",
+        "-o", str(TMP / "tmp"), url
+    ], check=True)
+    files = list(TMP.glob("tmp.*"))
+    info_file = next((f for f in files if f.suffix == ".json"), None)
+    if not info_file: raise RuntimeError("info json missing")
+    info = json.loads(info_file.read_text(encoding="utf8"))
+    vid   = info["id"]
+    title = info.get("title") or info.get("fulltitle") or "Unknown"
+    author = info.get("artist") or info.get("uploader") or "Unknown"
+    upload_date = info.get("upload_date", "")
+    extractor = info.get("extractor", "")
+    description = info.get("description", "")
+    album, album_artist, genre, track, year, lyrics = "Single", "", "", "0", "", ""
+    if "music.youtube" in url or extractor.startswith("youtube:music"):
+        album = info.get("album") or "Single"
+        album_artist = info.get("album_artist", "")
+        track = str(info.get("track_number", 0))
+        year = str(info.get("release_date") or upload_date)
+        genre = info.get("genre", "") or info.get("category", "")
+        try:
+            pl = ytm.get_watch_playlist(videoId=vid)
+            if pl.get("lyrics"):
+                lyr = ytm.get_lyrics(pl["lyrics"])
+                if lyr and lyr.get("lyrics"): lyrics = lyr["lyrics"]
+        except Exception: pass
+    else:
+        year = upload_date
+    base_name = safe(f"{title} [{vid}]")
+    out_mp3 = TMP / f"{base_name}.mp3"
+    ytdlp_fast(url, str(TMP / f"{base_name}.%(ext)s"))
+    candidates = [f for f in TMP.glob(f"{base_name}*") if f.suffix.lower() == ".mp3"]
+    if not candidates: raise RuntimeError("mp3 not created")
+    shutil.move(str(candidates[0]), str(out_mp3))
+    cover = None
+    for ext in ("jpg", "jpeg", "webp", "png"):
+        thumb = TMP / f"tmp.{ext}"
+        if thumb.exists(): cover = str(thumb); break
+    write_tags(str(out_mp3), title, author, album, year, cover, lyrics,
+               genre, track, album_artist, description)
+    return out_mp3
+
+def gradio_fn(url):
+    try:
+        path = download_yt(url)
+        return str(path), path.name
+    except Exception as e:
+        return None, f"Error: {e}"
+
+with gr.Blocks(title="YT/YT-Music Downloader") as demo:
+    gr.Markdown("### Paste YouTube / YouTube-Music link → 320 k MP3 with tags")
+    with gr.Row():
+        inp = gr.Textbox(label="URL", placeholder="https://www.youtube.com/watch?v=...")
+        btn = gr.Button("Download", variant="primary")
+    out = gr.File(label="MP3")
+    btn.click(gradio_fn, inputs=inp, outputs=[out, out])
 
-    # search YTM
-    res = ytm.search(query, filter="songs", limit
-    
+demo.launch(server_name="0.0.0.0", server_port=7860)