v4.8

Add button to auto-delete already downloaded files and retry failed ones

Archived/getMetadata.py

@@ -1,99 +0,0 @@
-import asyncio
-import zendriver as zd
-
-async def get_metadata(page, headless=True):
-    max_attempts = 40
-    attempts = 0
-    
-    await asyncio.sleep(2)
-    
-    await page.evaluate("""
-        window.downloadInfo = null;
-        const originalFetch = window.fetch;
-        window.fetch = async function(...args) {
-            const [url, config] = args;
-            if (url.includes('/api/load?url=%2Fapi%2Ffetch%2Fstream%2Fv2')) {
-                const payload = JSON.parse(config.body);
-                const title = document.querySelector('h1.svelte-6pt9ji').textContent.trim();
-                const artists = Array.from(document.querySelectorAll('h2.svelte-6pt9ji a.normal'))
-                                .map(a => a.textContent.trim())
-                                .join(', ');
-                const cover = document.querySelector('.svelte-6pt9ji .meta.svelte-6pt9ji a').href;
-                                
-                window.downloadInfo = {
-                    url: payload.url,
-                    cover: cover,
-                    title: title,
-                    artists: artists,
-                    token: payload.token.primary,
-                    expiry: payload.token.expiry
-                };
-            }
-            return originalFetch.apply(this, args);
-        };
-    """)
-    
-    await page.evaluate("""
-        function waitForElement(selector) {
-            return new Promise(resolve => {
-                if (document.querySelector(selector)) {
-                    return resolve(document.querySelector(selector));
-                }
-
-                const observer = new MutationObserver(mutations => {
-                    if (document.querySelector(selector)) {
-                        observer.disconnect();
-                        resolve(document.querySelector(selector));
-                    }
-                });
-
-                observer.observe(document.documentElement, {
-                    childList: true,
-                    subtree: true
-                });
-            });
-        }
-
-        (async () => {
-            if (!window.location.hostname.includes('lucida.')) return;
-            
-            await Promise.race([
-                waitForElement('.d1-track button'),
-                waitForElement('button[class*="download-button"]')
-            ]);
-
-            const clickDownloadButton = () => {
-                const button = document.querySelector('.d1-track button') || 
-                              document.querySelector('button[class*="download-button"]');
-                if (button) button.click();
-            };
-
-            clickDownloadButton();
-        })();
-    """)
-    
-    while attempts < max_attempts:
-        download_info = await page.evaluate("window.downloadInfo")
-        if download_info:
-            return download_info
-        
-        await asyncio.sleep(0.5)
-        attempts += 1
-    
-    raise TimeoutError("Timeout")
-
-async def main(headless=True):
-    browser = await zd.start(headless=headless)
-    try:
-        track_id = "2plbrEY59IikOBgBGLjaoe"
-        url = f"https://lucida.to/?url=https%3A%2F%2Fopen.spotify.com%2Ftrack%2F{track_id}&country=auto&to=tidal"
-        
-        page = await browser.get(url)
-        download_info = await get_metadata(page)
-        print(download_info)
-        return download_info
-    finally:
-        await browser.stop()
-
-if __name__ == "__main__":
-    asyncio.run(main())

README.md

@@ -3,31 +3,20 @@
 ![SpotiFLAC](https://github.com/user-attachments/assets/b4c4f403-edbd-4a71-b74b-c7d433d47d06)
 
 <div align="center">
-<b>SpotiFLAC</b> allows you to download Spotify tracks in true FLAC format through services like Tidal, Amazon Music, and Deezer <code>(via Lucida)</code>, as well as Qobuz <code>(via SquidWTF)</code>.
+<b>SpotiFLAC</b> allows you to download Spotify tracks in true FLAC format through services like Tidal & Deezer.
 </div>
 
-### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v2.7/SpotiFLAC.exe)
-
-#
-
-> [!Note] 
-**Download speed** from Lucida is unpredictable—sometimes fast, sometimes slow. Join their [Discord](https://discord.com/invite/dXEGRWqEbS) for updates.
+### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v4.7/SpotiFLAC.exe)
 
 ## Screenshots
 
-![image](https://github.com/user-attachments/assets/70a5dceb-3374-4255-8f6a-4afb5ee534b0)
+![image](https://github.com/user-attachments/assets/180b8322-ce2d-4842-a5dd-ac4d7b7a5efa)
 
-![image](https://github.com/user-attachments/assets/9f0d6aa5-456b-4a90-b48a-7e0c22819ebd)
+![image](https://github.com/user-attachments/assets/3f84d53b-2da1-4488-986c-772b82832f2d)
 
-![image](https://github.com/user-attachments/assets/be9a79b5-260e-4948-9f72-10c735210ab7)
+![image](https://github.com/user-attachments/assets/f604dc04-4ee6-4084-b314-0be7cd5d7ef9)
 
-![image](https://github.com/user-attachments/assets/c4403934-9003-447e-a27b-fc74cab23454)
-
-![image](https://github.com/user-attachments/assets/1feec621-f8bf-4b2a-ae73-afcb1fb1deba)
-
-![image](https://github.com/user-attachments/assets/c64b9a08-c99a-4d3a-ae8b-5f834623915b)
-
-> When **Fallback** is enabled, it will use the backup server `Lucida.su`
+![image](https://github.com/user-attachments/assets/1c3beda2-236b-4452-8afd-a2dfedf389e5)
 
 ## Lossless Audio Check
 

deezerDL.py

@@ -0,0 +1,241 @@
+import requests
+import asyncio
+import os
+import sys
+from mutagen.flac import FLAC
+from random import randrange
+
+def get_random_user_agent():
+    return f"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_{randrange(11, 15)}_{randrange(4, 9)}) AppleWebKit/{randrange(530, 537)}.{randrange(30, 37)} (KHTML, like Gecko) Chrome/{randrange(80, 105)}.0.{randrange(3000, 4500)}.{randrange(60, 125)} Safari/{randrange(530, 537)}.{randrange(30, 36)}"
+
+class DeezerDownloader:
+    def __init__(self):
+        self.session = requests.Session()
+        self.session.headers.update({
+            'User-Agent': get_random_user_agent()
+        })
+        self.progress_callback = None
+    
+    def set_progress_callback(self, callback):
+        self.progress_callback = callback
+    
+    def get_track_by_isrc(self, isrc):
+        try:
+            url = f"https://api.deezer.com/2.0/track/isrc:{isrc}"
+            response = self.session.get(url)
+            response.raise_for_status()
+            
+            data = response.json()
+            
+            if 'error' in data:
+                print(f"Error from Deezer API: {data['error']['message']}")
+                return None
+            
+            return data
+        except requests.exceptions.RequestException as e:
+            print(f"Error fetching track data: {e}")
+            return None
+    
+    def extract_metadata(self, track_data):
+        metadata = {}
+        
+        metadata['title'] = track_data.get('title', '')
+        metadata['title_short'] = track_data.get('title_short', '')
+        metadata['duration'] = track_data.get('duration', 0)
+        metadata['track_position'] = track_data.get('track_position', 1)
+        metadata['disk_number'] = track_data.get('disk_number', 1)
+        metadata['isrc'] = track_data.get('isrc', '')
+        metadata['release_date'] = track_data.get('release_date', '')
+        metadata['explicit_lyrics'] = track_data.get('explicit_lyrics', False)
+        
+        if 'artist' in track_data:
+            metadata['artist'] = track_data['artist'].get('name', '')
+            metadata['artist_id'] = track_data['artist'].get('id', '')
+        
+        if 'contributors' in track_data:
+            artists = []
+            for contributor in track_data['contributors']:
+                if contributor.get('role') == 'Main':
+                    artists.append(contributor.get('name', ''))
+            metadata['artists'] = ', '.join(artists) if artists else metadata.get('artist', '')
+        
+        if 'album' in track_data:
+            album = track_data['album']
+            metadata['album'] = album.get('title', '')
+            metadata['album_id'] = album.get('id', '')
+            metadata['cover_url'] = album.get('cover_xl', album.get('cover_big', ''))
+            metadata['cover_md5'] = album.get('md5_image', '')
+        
+        metadata['deezer_link'] = track_data.get('link', '')
+        metadata['preview_url'] = track_data.get('preview', '')
+        
+        return metadata
+    
+    def download_cover_art(self, cover_url, filename):
+        if not cover_url:
+            return None
+        
+        try:
+            response = self.session.get(cover_url)
+            response.raise_for_status()
+            
+            cover_path = f"{filename}_cover.jpg"
+            with open(cover_path, 'wb') as f:
+                f.write(response.content)
+            
+            return cover_path
+        except Exception as e:
+            print(f"Error downloading cover art: {e}")
+            return None
+    
+    def embed_metadata(self, file_path, metadata, cover_path=None):
+        try:
+            audio = FLAC(file_path)
+            
+            audio.clear()
+            
+            if metadata.get('title'):
+                audio['TITLE'] = metadata['title']
+            if metadata.get('artists'):
+                audio['ARTIST'] = metadata['artists']
+            elif metadata.get('artist'):
+                audio['ARTIST'] = metadata['artist']
+            if metadata.get('album'):
+                audio['ALBUM'] = metadata['album']
+            if metadata.get('release_date'):
+                audio['DATE'] = metadata['release_date']
+            if metadata.get('track_position'):
+                audio['TRACKNUMBER'] = str(metadata['track_position'])
+            if metadata.get('disk_number'):
+                audio['DISCNUMBER'] = str(metadata['disk_number'])
+            if metadata.get('isrc'):
+                audio['ISRC'] = metadata['isrc']
+            
+            if cover_path and os.path.exists(cover_path):
+                with open(cover_path, 'rb') as f:
+                    cover_data = f.read()
+                
+                from mutagen.flac import Picture
+                picture = Picture()
+                picture.type = 3
+                picture.mime = 'image/jpeg'
+                picture.desc = 'Cover'
+                picture.data = cover_data
+                audio.add_picture(picture)
+            
+            audio.save()
+            print(f"Metadata embedded successfully in {file_path}")
+            
+        except Exception as e:
+            print(f"Error embedding metadata: {e}")
+    
+    async def download_by_isrc(self, isrc, output_dir="."):
+        print(f"Fetching track info for ISRC: {isrc}")
+        
+        track_data = self.get_track_by_isrc(isrc)
+        if not track_data:
+            print("Failed to get track data from Deezer API")
+            return False
+        
+        metadata = self.extract_metadata(track_data)
+        print(f"Found track: {metadata.get('artists', 'Unknown')} - {metadata.get('title', 'Unknown')}")
+        
+        track_id = track_data.get('id')
+        if not track_id:
+            print("No track ID found in Deezer API response")
+            return False
+        
+        print(f"Using track ID: {track_id}")
+        
+        api_url = f"https://api.deezmate.com/dl/{track_id}"
+        print(f"Requesting download links from: {api_url}")
+        
+        try:
+            response = self.session.get(api_url)
+            response.raise_for_status()
+            api_data = response.json()
+            
+            if not api_data.get('success'):
+                print("API request failed")
+                return False
+            
+            links = api_data.get('links', {})
+            flac_url = links.get('flac')
+            
+            if not flac_url:
+                print("No FLAC download link found in API response")
+                return False
+            
+            print(f"Successfully obtained FLAC download URL")
+            
+        except Exception as e:
+            print(f"Error getting download URL from API: {e}")
+            return False
+        
+        print("Downloading FLAC file...")
+        try:
+            response = self.session.get(flac_url)
+            response.raise_for_status()
+            
+            safe_title = "".join(c for c in metadata.get('title', 'Unknown') if c.isalnum() or c in (' ', '-', '_')).rstrip()
+            safe_artist = "".join(c for c in metadata.get('artists', 'Unknown') if c.isalnum() or c in (' ', '-', '_')).rstrip()
+            filename = f"{safe_artist} - {safe_title}.flac"
+            file_path = os.path.join(output_dir, filename)
+            
+            with open(file_path, 'wb') as f:
+                f.write(response.content)
+            
+            downloaded = len(response.content)
+            print(f"File size: {downloaded} bytes ({downloaded / (1024*1024):.2f} MB)")
+            
+            if self.progress_callback:
+                self.progress_callback(downloaded, downloaded)
+            
+            print(f"Downloaded: {file_path}")
+            
+            cover_path = None
+            if metadata.get('cover_url'):
+                print("Downloading cover art...")
+                cover_path = self.download_cover_art(metadata['cover_url'], 
+                                                   os.path.join(output_dir, f"{safe_artist} - {safe_title}"))
+            
+            print("Embedding metadata...")
+            self.embed_metadata(file_path, metadata, cover_path)
+            
+            if cover_path and os.path.exists(cover_path):
+                os.remove(cover_path)
+            
+            print(f"Successfully downloaded and tagged: {filename}")
+            return True
+            
+        except Exception as e:
+            print(f"Error downloading file: {e}")
+            return False
+
+async def main():
+    print("=== DeezerDL - Deezer Downloader ===")
+    downloader = DeezerDownloader()
+    
+    isrc = "USAT22409172"
+    output_dir = "."
+    
+    success = await downloader.download_by_isrc(isrc, output_dir)
+    if success:
+        print("Download completed successfully!")
+    else:
+        print("Download failed!")
+
+if __name__ == "__main__":
+    try:
+        import sys
+        if sys.platform == "win32":
+            import os
+            os.system("chcp 65001 > nul")
+            try:
+                sys.stdout.reconfigure(encoding='utf-8')
+            except:
+                pass
+    except:
+        pass
+        
+    asyncio.run(main())

getMetadata.py

@@ -2,42 +2,66 @@ from time import sleep
 from urllib.parse import urlparse, parse_qs
 import requests
 import json
-import hmac
 import time
-import hashlib
-from typing import Tuple, Callable, Dict, Any, List
+import pyotp
+import base64
+from random import randrange
+from typing import Dict, Any, List, Tuple
 
-_TOTP_SECRET = bytearray([53,53,48,55,49,52,53,56,53,51,52,56,55,52,57,57,53,57,50,50,52,56,54,51,48,51,50,57,51,52,55])
+# https://github.com/visagenull/Spotify-Free
+def get_random_user_agent():
+    return f"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_{randrange(11, 15)}_{randrange(4, 9)}) AppleWebKit/{randrange(530, 537)}.{randrange(30, 37)} (KHTML, like Gecko) Chrome/{randrange(80, 105)}.0.{randrange(3000, 4500)}.{randrange(60, 125)} Safari/{randrange(530, 537)}.{randrange(30, 36)}"
 
-def generate_totp(
-    secret: bytes = _TOTP_SECRET,
-    algorithm: Callable[[], object] = hashlib.sha1,
-    digits: int = 6,
-    counter_factory: Callable[[], int] = lambda: int(time.time()) // 30,
-) -> Tuple[str, int]:
-    counter = counter_factory()
-    hmac_result = hmac.new(
-        secret, counter.to_bytes(8, byteorder="big"), algorithm
-    ).digest()
+# https://github.com/xyloflake/spot-secrets-go
+def generate_totp():
+    url = "https://raw.githubusercontent.com/afkarxyz/secretBytes/refs/heads/main/secrets/secretBytes.json"
+    
+    try:
+        resp = requests.get(url, timeout=10)
+        if resp.status_code != 200:
+            raise Exception(f"Failed to fetch TOTP secrets from GitHub. Status: {resp.status_code}")
+        secrets_list = resp.json()
+        
+        latest_entry = max(secrets_list, key=lambda x: x["version"])
+        version = latest_entry["version"]
+        secret_cipher = latest_entry["secret"]
+    except Exception as e:
+        raise Exception(f"Failed to fetch secrets from GitHub: {str(e)}")
 
-    offset = hmac_result[-1] & 15
-    truncated_value = (
-        (hmac_result[offset] & 127) << 24
-        | (hmac_result[offset + 1] & 255) << 16
-        | (hmac_result[offset + 2] & 255) << 8
-        | (hmac_result[offset + 3] & 255)
-    )
-    return (
-        str(truncated_value % (10**digits)).zfill(digits),
-        counter * 30_000,
-    )
+    processed = [byte ^ ((i % 33) + 9) for i, byte in enumerate(secret_cipher)]
+    processed_str = "".join(map(str, processed))
+    utf8_bytes = processed_str.encode('utf-8')
+    hex_str = utf8_bytes.hex()
+    secret_bytes = bytes.fromhex(hex_str)
+    b32_secret = base64.b32encode(secret_bytes).decode('utf-8')
+    totp = pyotp.TOTP(b32_secret)
 
-token_url = 'https://open.spotify.com/get_access_token'
+    headers = {
+        "Host": "open.spotify.com",
+        "User-Agent": get_random_user_agent(),
+        "Accept": "*/*",
+    }
+
+    try:
+        resp = requests.get("https://open.spotify.com/api/server-time", headers=headers, timeout=10)
+        if resp.status_code != 200:
+            raise Exception(f"Failed to get server time. Status code: {resp.status_code}")
+        data = resp.json()
+        server_time = data.get("serverTime")
+        if server_time is None:
+            raise Exception("Failed to fetch server time from Spotify")
+        return totp, server_time, version
+    except Exception as e:
+        raise Exception(f"Error getting server time: {str(e)}")
+
+token_url = 'https://open.spotify.com/api/token'
 playlist_base_url = 'https://api.spotify.com/v1/playlists/{}'
 album_base_url = 'https://api.spotify.com/v1/albums/{}'
 track_base_url = 'https://api.spotify.com/v1/tracks/{}'
+artist_base_url = 'https://api.spotify.com/v1/artists/{}'
+artist_albums_url = 'https://api.spotify.com/v1/artists/{}/albums'
 headers = {
-    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+    'User-Agent': get_random_user_agent(),
     'Accept': 'application/json',
     'Accept-Language': 'en-US,en;q=0.9',
     'Accept-Encoding': 'gzip, deflate, br',
@@ -76,11 +100,22 @@ def parse_uri(uri):
     if parts[1] == "embed":
         parts = parts[1:]
 
+    if len(parts) > 1 and parts[1].startswith("intl-"):
+        parts = parts[1:]
+
     l = len(parts)
-    if l == 3 and parts[1] in ["album", "track", "playlist"]:
+    if l == 3 and parts[1] in ["album", "track", "playlist", "artist"]:
         return {"type": parts[1], "id": parts[2]}
     if l == 5 and parts[3] == "playlist":
         return {"type": parts[3], "id": parts[4]}
+    if l >= 4 and parts[1] == "artist" and len(parts) >= 4:
+        if parts[3] == "discography":
+            discography_type = "all"
+            if len(parts) >= 5 and parts[4] in ["all", "album", "single", "compilation"]:
+                discography_type = parts[4]
+            return {"type": "artist_discography", "id": parts[2], "discography_type": discography_type}
+        else:
+            return {"type": "artist", "id": parts[2]}
 
     raise SpotifyInvalidUrlException("ERROR: unable to determine Spotify URL type or type is unsupported.")
 
@@ -102,14 +137,20 @@ def get_json_from_api(api_url, access_token):
 
 def get_access_token():
     try:
-        totp, timestamp = generate_totp()
+        totp, server_time, totp_version = generate_totp()
+        otp_code = totp.at(int(server_time))
+        timestamp_ms = int(time.time() * 1000)
         
         params = {
-            "reason": "init",
-            "productType": "web-player",
-            "totp": totp,
-            "totpVer": 5,
-            "ts": timestamp,
+            'reason': 'init',
+            'productType': 'web-player',
+            'totp': otp_code,
+            'totpServerTime': server_time,
+            'totpVer': str(totp_version),
+            'sTime': server_time,
+            'cTime': timestamp_ms,
+            'buildVer': 'web-player_2025-07-02_1720000000000_12345678',
+            'buildDate': '2025-07-02'
         }
         
         req = requests.get(token_url, headers=headers, params=params, timeout=10)
@@ -309,6 +350,69 @@ def get_raw_spotify_data(spotify_url, batch: bool = False, delay: float = 1.0):
             raw_data = track_data
         except Exception as e:
             return {"error": f"Failed to get track data: {str(e)}"}
+            
+    elif url_info["type"] == "artist_discography":
+        try:
+            artist_data = get_json_from_api(
+                artist_base_url.format(url_info["id"]),
+                access_token
+            )
+            if not artist_data:
+                return {"error": "Failed to get artist data"}
+            
+            discography_type = url_info.get("discography_type", "all")
+            if discography_type == "all":
+                include_groups = "album,single,compilation"
+            else:
+                include_groups = discography_type
+            
+            albums = []
+            albums_url = f'{artist_albums_url.format(url_info["id"])}?include_groups={include_groups}&limit=50'
+            
+            if batch:
+                albums, num_batches = fetch_tracks_in_batches(albums_url, access_token, 50, delay)
+                raw_data = {
+                    "artist_info": artist_data,
+                    "albums": albums,
+                    "discography_type": discography_type,
+                    "_batch_count": num_batches,
+                    "_batch_enabled": True
+                }
+            else:
+                while albums_url:
+                    album_data = get_json_from_api(albums_url, access_token)
+                    if not album_data:
+                        break
+                        
+                    albums.extend(album_data['items'])
+                    albums_url = album_data.get('next')
+                    if albums_url and "&locale=" in albums_url:
+                        albums_url = albums_url.split("&locale=")[0]
+                
+                raw_data = {
+                    "artist_info": artist_data,
+                    "albums": albums,
+                    "discography_type": discography_type,
+                    "_batch_enabled": False
+                }
+                
+            raw_data['_token'] = access_token
+            
+        except Exception as e:
+            return {"error": f"Failed to get artist discography data: {str(e)}"}
+            
+    elif url_info["type"] == "artist":
+        try:
+            artist_data = get_json_from_api(
+                artist_base_url.format(url_info["id"]),
+                access_token
+            )
+            if not artist_data:
+                return {"error": "Failed to get artist data"}
+                
+            raw_data = artist_data
+        except Exception as e:
+            return {"error": f"Failed to get artist data: {str(e)}"}
 
     return raw_data
 
@@ -439,6 +543,134 @@ def format_playlist_data(playlist_data):
         "track_list": track_list
     }
 
+def format_artist_discography_data(discography_data):
+    artist_info = discography_data.get('artist_info', {})
+    albums = discography_data.get('albums', [])
+    access_token = discography_data.get('_token', '')
+    
+    artist_image = ''
+    if artist_info.get('images'):
+        artist_image = artist_info.get('images', [{}])[0].get('url', '')
+    
+    formatted_artist_info = {
+        "name": artist_info.get('name', ''),
+        "followers": artist_info.get('followers', {}).get('total', 0),
+        "genres": artist_info.get('genres', []),
+        "images": artist_image,
+        "external_urls": artist_info.get('external_urls', {}).get('spotify', ''),
+        "discography_type": discography_data.get('discography_type', 'all'),
+        "total_albums": len(albums)
+    }
+    
+    if discography_data.get('_batch_enabled', False):
+        formatted_artist_info["batch"] = f"{discography_data.get('_batch_count', 1)}"
+    
+    album_list = []
+    all_tracks = []
+    
+    for album in albums:
+        album_image = ''
+        if album.get('images'):
+            album_image = album.get('images', [{}])[0].get('url', '')
+        
+        album_artists = []
+        for artist in album.get('artists', []):
+            album_artists.append(artist['name'])
+        
+        album_info = {
+            "id": album.get('id', ''),
+            "name": album.get('name', ''),
+            "album_type": album.get('album_type', ''),
+            "release_date": album.get('release_date', ''),
+            "total_tracks": album.get('total_tracks', 0),
+            "artists": ", ".join(album_artists),
+            "images": album_image,
+            "external_urls": album.get('external_urls', {}).get('spotify', '')
+        }
+        
+        album_list.append(album_info)
+        
+        if access_token and album.get('id'):
+            try:
+                album_tracks_data = get_json_from_api(
+                    f'{album_base_url.format(album.get("id"))}/tracks?limit=50',
+                    access_token
+                )
+                
+                if album_tracks_data:
+                    tracks = []
+                    tracks_url = f'{album_base_url.format(album.get("id"))}/tracks?limit=50'
+                    
+                    while tracks_url:
+                        track_data = get_json_from_api(tracks_url, access_token)
+                        if not track_data:
+                            break
+                            
+                        tracks.extend(track_data['items'])
+                        tracks_url = track_data.get('next')
+                        if tracks_url and "&locale=" in tracks_url:
+                            tracks_url = tracks_url.split("&locale=")[0]
+                    
+                    for track in tracks:
+                        track_artists = []
+                        for artist in track.get('artists', []):
+                            track_artists.append(artist['name'])
+                        
+                        track_id = track.get('id', '')
+                        track_isrc = ''
+                        
+                        if track_id:
+                            try:
+                                full_track_data = get_json_from_api(
+                                    track_base_url.format(track_id),
+                                    access_token
+                                )
+                                if full_track_data:
+                                    track_isrc = full_track_data.get('external_ids', {}).get('isrc', '')
+                            except:
+                                pass
+                        
+                        formatted_track = {
+                            "artists": ", ".join(track_artists),
+                            "name": track.get('name', ''),
+                            "album_name": album.get('name', ''),
+                            "album_type": album.get('album_type', ''),
+                            "duration_ms": track.get('duration_ms', 0),
+                            "images": album_image,
+                            "release_date": album.get('release_date', ''),
+                            "track_number": track.get('track_number', 0),
+                            "external_urls": track.get('external_urls', {}).get('spotify', ''),
+                            "isrc": track_isrc
+                        }
+                        
+                        all_tracks.append(formatted_track)
+                        
+            except Exception as e:
+                print(f"Error getting tracks for album {album.get('name', '')}: {str(e)}")
+                continue
+    
+    return {
+        "artist_info": formatted_artist_info,
+        "album_list": album_list,
+        "track_list": all_tracks
+    }
+
+def format_artist_data(artist_data):
+    artist_image = ''
+    if artist_data.get('images'):
+        artist_image = artist_data.get('images', [{}])[0].get('url', '')
+    
+    return {
+        "artist": {
+            "name": artist_data.get('name', ''),
+            "followers": artist_data.get('followers', {}).get('total', 0),
+            "genres": artist_data.get('genres', []),
+            "images": artist_image,
+            "external_urls": artist_data.get('external_urls', {}).get('spotify', ''),
+            "popularity": artist_data.get('popularity', 0)
+        }
+    }
+
 def process_spotify_data(raw_data, data_type):
     if not raw_data or "error" in raw_data:
         return {"error": "Invalid data provided"}
@@ -450,6 +682,10 @@ def process_spotify_data(raw_data, data_type):
             return format_album_data(raw_data)
         elif data_type == "playlist":
             return format_playlist_data(raw_data)
+        elif data_type == "artist_discography":
+            return format_artist_discography_data(raw_data)
+        elif data_type == "artist":
+            return format_artist_data(raw_data)
         else:
             return {"error": "Invalid data type"}
     except Exception as e:
@@ -468,11 +704,23 @@ if __name__ == '__main__':
     album = "https://open.spotify.com/album/6J84szYCnMfzEcvIcfWMFL"
     song = "https://open.spotify.com/track/7so0lgd0zP2Sbgs2d7a1SZ"
     
+    artist_discography_all = "https://open.spotify.com/artist/0du5cEVh5yTK9QJze8zA0C/discography/all"
+    artist_discography_albums = "https://open.spotify.com/artist/0du5cEVh5yTK9QJze8zA0C/discography/album"
+    artist_discography_singles = "https://open.spotify.com/artist/0du5cEVh5yTK9QJze8zA0C/discography/single"
+    artist_discography_compilations = "https://open.spotify.com/artist/0du5cEVh5yTK9QJze8zA0C/discography/compilation"
+    
+    print("=== Testing Artist Discography (All) ===")
+    filtered_discography = get_filtered_data(artist_discography_all, batch=True, delay=0.1)
+    print(json.dumps(filtered_discography, indent=2))
+    
+    print("\n=== Testing Playlist ===")
     filtered_playlist = get_filtered_data(playlist, batch=True, delay=0.1)
     print(json.dumps(filtered_playlist, indent=2))
     
+    print("\n=== Testing Album ===")
     filtered_album = get_filtered_data(album)
     print(json.dumps(filtered_album, indent=2))
     
+    print("\n=== Testing Track ===")
     filtered_track = get_filtered_data(song)
     print(json.dumps(filtered_track, indent=2))

icon.svg

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512"
+	 style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FF0000;stroke:#373435;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFF00;stroke:#373435;stroke-width:0.5669;stroke-miterlimit:10;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#2AA125;stroke:#373435;stroke-width:0.5669;stroke-miterlimit:10;}
+</style>
+<g id="SVGRepo_bgCarrier">
+</g>
+<g id="SVGRepo_tracerCarrier">
+</g>
+<g id="Layer_x0020_1">
+	<g id="_1818452274576">
+		<g id="SVGRepo_bgCarrier_00000044893734704698182460000014884511992085247122_">
+		</g>
+		<g id="SVGRepo_tracerCarrier_00000067939915892718314930000001743019108017086612_">
+		</g>
+		<g id="SVGRepo_iconCarrier_00000176000695080737548300000008661679408724292005_">
+			<path d="M407.1,227.2c-54.7-27.6-119.3-43.8-187.6-43.8c-38.9,0-76.5,5.2-112.3,15l3-0.7c-2.1,0.7-4.5,1.1-7,1.1
+				c-13,0-23.5-10.5-23.5-23.5c0-10.5,6.8-19.3,16.3-22.4l0.2-0.1c90.9-26.9,240.6-21.8,335.4,34.6c7.3,4.4,12.1,12.3,12.1,21.3
+				c0,4.4-1.2,8.6-3.2,12.2l0.1-0.1c-5,5.9-12.3,9.6-20.6,9.6c-4.7,0-9-1.2-12.8-3.3L407.1,227.2L407.1,227.2z M404.5,298.9
+				c-3.4,5.7-9.6,9.4-16.6,9.4c-3.8,0-7.4-1.1-10.4-3l0.1,0.1c-46.8-26.8-102.8-42.5-162.5-42.5c-32.9,0-64.6,4.8-94.6,13.7l2.3-0.6
+				c-1.7,0.5-3.7,0.9-5.8,0.9c-10.7,0-19.4-8.7-19.4-19.4c0-8.7,5.7-16,13.5-18.5l0.1,0c30.8-9.1,66.2-14.4,102.8-14.4
+				c68.1,0,132,18.2,187,49.9l-1.8-1c5.1,3.3,8.4,8.9,8.4,15.3C407.7,292.5,406.5,296,404.5,298.9L404.5,298.9L404.5,298.9
+				L404.5,298.9z M373.8,369.3c-2.7,4.6-7.6,7.7-13.3,7.7c-3.2,0-6.1-1-8.6-2.6l0.1,0c-40.9-23-89.7-36.5-141.7-36.5
+				c-29.8,0-58.6,4.5-85.7,12.7l2.1-0.5c-1.1,0.3-2.5,0.5-3.8,0.5c-8.7,0-15.8-7.1-15.8-15.8c0-7.4,5.1-13.6,11.9-15.3l0.1,0
+				c27-8,58-12.6,90.1-12.6c58.1,0,112.6,15.1,159.9,41.7l-1.7-0.9c5.2,2.6,8.6,7.8,8.6,13.8C376,364.3,375.2,367.1,373.8,369.3
+				L373.8,369.3L373.8,369.3L373.8,369.3z M256-0.6L256-0.6C114.6-0.6,0,114,0,255.4s114.6,256,256,256s256-114.6,256-256l0,0
+				C511.6,114.2,397.2-0.2,256-0.6L256-0.6L256-0.6L256-0.6z"/>
+		</g>
+	</g>
+	<path class="st0" d="M406.9,227.2c0,0,0.1,0,0.1,0.1L406.9,227.2z M107.1,198.5c35.8-9.8,73.4-15,112.3-15
+		c68.3,0,132.8,16.1,187.5,43.7c3.8,2.1,8.2,3.3,12.8,3.3c8.2,0,15.6-3.7,20.5-9.6c0,0,0,0,0,0c2-3.6,3.1-7.7,3.1-12
+		c0-9-4.8-16.8-12.1-21.3c-94.7-56.4-244.5-61.5-335.4-34.6l-0.2,0.1c-9.4,3.1-16.3,11.9-16.3,22.4c0,13,10.5,23.5,23.5,23.5
+		c2.5,0,4.9-0.4,7-1.1L107.1,198.5L107.1,198.5z"/>
+	<path class="st1" d="M401.2,274.3c-55-31.8-118.9-49.9-187-49.9c-36.6,0-72,5.3-102.8,14.4l-0.1,0c-7.9,2.5-13.5,9.9-13.5,18.5
+		c0,10.7,8.7,19.4,19.4,19.4c1.3,0,2.5-0.1,3.6-0.3c29.9-8.8,61.5-13.6,94.3-13.6c59.7,0,115.7,15.7,162.4,42.5l0.1,0.1
+		c3,1.9,6.5,3,10.3,3c7,0,13.1-3.7,16.6-9.4l0,0c2-2.9,3.2-6.5,3.2-10.3c0-6.4-3.3-12-8.4-15.3L401.2,274.3L401.2,274.3z"/>
+	<path class="st2" d="M352,374.4C352,374.4,352,374.4,352,374.4L352,374.4z M373.8,369.3C373.8,369.3,373.7,369.4,373.8,369.3
+		L373.8,369.3L373.8,369.3z M367.8,347.8l-0.4-0.2C367.5,347.6,367.6,347.7,367.8,347.8z M369,348.4
+		c-47.3-26.5-101.8-41.7-159.9-41.7c-32.1,0-63.1,4.6-90.1,12.6l-0.1,0c-6.8,1.8-11.9,8-11.9,15.3c0,8.7,7.1,15.8,15.8,15.8
+		c1,0,1.9-0.1,2.8-0.3c26.8-8.1,55.2-12.4,84.6-12.4c52,0,100.8,13.5,141.7,36.5l0,0c2.4,1.6,5.4,2.6,8.5,2.6
+		c5.7,0,10.6-3.1,13.3-7.7h0c1.4-2.3,2.2-5,2.2-7.9c0-5.9-3.3-11-8.2-13.6L369,348.4L369,348.4z"/>
+</g>
+</svg>

requirements.txt

@@ -0,0 +1,8 @@
+PyQt6
+pyqt6-tools
+pyqtdarktheme
+requests
+mutagen
+pyotp
+packaging
+pyinstaller

tidalDL.py

@@ -0,0 +1,401 @@
+import asyncio
+import json
+import os
+import re
+import time
+import requests
+from mutagen.flac import FLAC, Picture
+from mutagen.id3 import PictureType
+
+class ProgressCallback:
+    def __call__(self, current, total):
+        if total > 0:
+            percent = (current / total) * 100
+            print(f"\r{percent:.2f}% ({current}/{total})", end="")
+        else:
+            print(f"\r{current / (1024 * 1024):.2f} MB", end="")
+
+class TidalDownloader:
+    def __init__(self, timeout=30, max_retries=3):
+        self.timeout = timeout
+        self.max_retries = max_retries
+        self.download_chunk_size = 256 * 1024
+        self.progress_callback = ProgressCallback()
+        self.client_id = "zU4XHVVkc2tDPo4t"
+        self.client_secret = "VJKhDFqJPqvsPVNBV6ukXTJmwlvbttP7wlMlrc72se4="
+
+    def set_progress_callback(self, callback):
+        self.progress_callback = callback
+
+
+    
+    def sanitize_filename(self, filename):
+        if not filename: 
+            return "Unknown Track"
+        sanitized = re.sub(r'[\\/*?:"<>|]', "", str(filename))
+        return re.sub(r'\s+', ' ', sanitized).strip() or "Unnamed Track"
+
+    def get_access_token(self):
+        refresh_url = "https://auth.tidal.com/v1/oauth2/token"
+        
+        payload = {
+            "client_id": self.client_id,
+            "grant_type": "client_credentials",
+        }
+        
+        try:
+            response = requests.post(
+                url=refresh_url,
+                data=payload,
+                auth=(self.client_id, self.client_secret),
+                timeout=self.timeout
+            )
+            
+            if response.status_code == 200:
+                token_data = response.json()
+                return token_data.get("access_token")
+            else:
+                return None
+                
+        except:
+            return None
+
+    def search_tracks(self, query):
+        try:
+            tidal_token = self.get_access_token()
+            if not tidal_token:
+                raise Exception("Failed to get access token")
+
+            search_url = f"https://api.tidal.com/v1/search/tracks?query={query}&limit=25&offset=0&countryCode=US"
+            header = {"authorization": f"Bearer {tidal_token}"}
+
+            search_data = requests.get(url=search_url, headers=header, timeout=self.timeout)
+            response_data = search_data.json()
+            
+            filtered_items = [{
+                "id": item.get("id"),
+                "title": item.get("title"),
+                "url": item.get("url"),
+                "isrc": item.get("isrc"),
+                "audioQuality": item.get("audioQuality"),
+                "mediaMetadata": item.get("mediaMetadata"),
+                "album": item.get("album", {}),
+                "artists": item.get("artists", []),
+                "artist": item.get("artist", {}),
+                "trackNumber": item.get("trackNumber"),
+                "volumeNumber": item.get("volumeNumber"),
+                "duration": item.get("duration"),
+                "copyright": item.get("copyright"),
+                "explicit": item.get("explicit")
+            } for item in response_data.get("items", [])]
+            
+            return {
+                "limit": response_data.get("limit"),
+                "offset": response_data.get("offset"),
+                "totalNumberOfItems": response_data.get("totalNumberOfItems"),
+                "items": filtered_items
+            }
+
+        except Exception as e:
+            raise Exception(f"Search error: {str(e)}")
+
+    def get_track_info(self, query, isrc=None):
+        print(f"Fetching: {query}" + (f" (ISRC: {isrc})" if isrc else ""))
+        
+        try:
+            result = self.search_tracks(query)
+            
+            if not result or not result.get("items"):
+                raise Exception(f"No tracks found for query: {query}")
+            
+            selected_track = None
+            if isrc:
+                isrc_items = [item for item in result["items"] if item.get("isrc") == isrc]
+                
+                if len(isrc_items) > 1:
+                    hires_items = []
+                    for item in isrc_items:
+                        media_metadata = item.get("mediaMetadata", {})
+                        tags = media_metadata.get("tags", []) if media_metadata else []
+                        if "HIRES_LOSSLESS" in tags:
+                            hires_items.append(item)
+                    
+                    if hires_items:
+                        selected_track = hires_items[0]
+                    else:
+                        selected_track = isrc_items[0]
+                elif len(isrc_items) == 1:
+                    selected_track = isrc_items[0]
+                else:
+                    selected_track = result["items"][0]
+            else:
+                selected_track = result["items"][0]
+                
+            if not selected_track:
+                raise Exception(f"Track not found: {query}" + (f" (ISRC: {isrc})" if isrc else ""))
+                
+            title = selected_track.get('title', 'Unknown')
+            quality = selected_track.get('audioQuality', 'Unknown')
+            print(f"Found: {title} ({quality})")
+            return selected_track
+            
+        except Exception as e:
+            raise Exception(f"Error getting track info: {str(e)}")
+
+    def get_download_url(self, track_id, quality="LOSSLESS"):
+        print("Fetching URL...")
+        download_api_url = f"https://tidal.401658.xyz/track/?id={track_id}&quality={quality}"
+        
+        try:
+            response = requests.get(download_api_url, timeout=self.timeout)
+            
+            if response.status_code == 200:
+                data = response.json()
+                
+                for item in data:
+                    if "OriginalTrackUrl" in item:
+                        print("URL found")
+                        return {
+                            "download_url": item["OriginalTrackUrl"],
+                            "track_info": data[0] if data else {}
+                        }
+                
+                raise Exception("Download URL not found in response")
+            else:
+                raise Exception(f"API returned status code: {response.status_code}")
+                
+        except Exception as e:
+            raise Exception(f"Error getting download URL: {str(e)}")
+
+    def download_album_art(self, album_id, size="1280x1280"):
+        try:
+            art_url = f"https://resources.tidal.com/images/{album_id.replace('-', '/')}/{size}.jpg"
+            
+            response = requests.get(art_url, timeout=self.timeout)
+            
+            if response.status_code == 200:
+                return response.content
+            else:
+                print(f"Failed to download album art: HTTP {response.status_code}")
+                return None
+                
+        except Exception as e:
+            print(f"Error downloading album art: {str(e)}")
+            return None
+
+    def download_file(self, url, filepath, is_paused_callback=None, is_stopped_callback=None):
+        temp_filepath = filepath + ".part"
+        retry_count = 0
+        
+        while retry_count <= self.max_retries:
+            try:
+                response = requests.get(url, timeout=60.0)
+                if response.status_code != 200:
+                    raise Exception(f"HTTP {response.status_code}")
+                
+                if is_stopped_callback and is_stopped_callback():
+                    raise Exception("Download stopped")
+                    
+                while is_paused_callback and is_paused_callback():
+                    time.sleep(0.1)
+                    if is_stopped_callback and is_stopped_callback():
+                        raise Exception("Download stopped")
+                
+                with open(temp_filepath, 'wb') as f:
+                    f.write(response.content)
+                
+                downloaded_size = len(response.content)
+                
+                if self.progress_callback:
+                    self.progress_callback(downloaded_size, downloaded_size)
+                    
+                os.rename(temp_filepath, filepath)
+                print("Download complete")
+                return {"success": True, "size": downloaded_size}
+                
+            except Exception as e:
+                retry_count += 1
+                if retry_count > self.max_retries:
+                    if os.path.exists(temp_filepath):
+                        try:
+                            os.remove(temp_filepath)
+                        except:
+                            pass
+                    raise Exception(f"Download error after {self.max_retries} retries: {str(e)}")
+                
+                print(f"Download error (attempt {retry_count}/{self.max_retries}): {str(e)}")
+                print(f"Retrying in {retry_count * 2} seconds...")
+                time.sleep(retry_count * 2)
+
+    def embed_metadata(self, filepath, track_info, search_info=None):
+        try:
+            print("Embedding metadata...")
+            audio = FLAC(filepath)
+            audio.clear()
+            audio.clear_pictures()
+            
+            if track_info.get("title"):
+                audio["TITLE"] = track_info["title"]
+            
+            artists_list = []
+            if search_info and search_info.get("artists"):
+                for artist in search_info["artists"]:
+                    if artist.get("name"):
+                        artists_list.append(artist["name"])
+            elif search_info and search_info.get("artist") and search_info["artist"].get("name"):
+                artists_list.append(search_info["artist"]["name"])
+            elif track_info.get("artists"):
+                for artist in track_info["artists"]:
+                    if artist.get("name"):
+                        artists_list.append(artist["name"])
+            elif track_info.get("artist") and track_info["artist"].get("name"):
+                artists_list.append(track_info["artist"]["name"])
+            
+            if artists_list:
+                audio["ARTIST"] = artists_list[0]  
+                if len(artists_list) > 1:
+                    audio["ALBUMARTIST"] = "; ".join(artists_list)
+                else:
+                    audio["ALBUMARTIST"] = artists_list[0]
+            
+            album_info = search_info.get("album", {}) if search_info else track_info.get("album", {})
+            if album_info.get("title"):
+                audio["ALBUM"] = album_info["title"]
+            
+            if search_info and search_info.get("trackNumber"):
+                audio["TRACKNUMBER"] = str(search_info["trackNumber"])
+            elif track_info.get("trackNumber"):
+                audio["TRACKNUMBER"] = str(track_info["trackNumber"])
+            
+            if search_info and search_info.get("volumeNumber"):
+                audio["DISCNUMBER"] = str(search_info["volumeNumber"])
+            elif track_info.get("volumeNumber"):
+                audio["DISCNUMBER"] = str(track_info["volumeNumber"])
+            
+            duration = search_info.get("duration") if search_info else track_info.get("duration")
+            if duration:
+                audio["LENGTH"] = str(duration)
+            
+            isrc = search_info.get("isrc") if search_info else track_info.get("isrc")
+            if isrc:
+                audio["ISRC"] = isrc
+            
+            copyright_info = search_info.get("copyright") if search_info else track_info.get("copyright")
+            if copyright_info:
+                audio["COPYRIGHT"] = copyright_info
+            
+            if album_info.get("releaseDate"):
+                audio["DATE"] = album_info["releaseDate"][:4]
+                try:
+                    audio["YEAR"] = album_info["releaseDate"][:4]
+                except:
+                    pass
+            
+            if track_info.get("genre"):
+                audio["GENRE"] = track_info["genre"]
+            
+            if track_info.get("audioQuality"):
+                audio["COMMENT"] = f"Tidal {track_info['audioQuality']}"
+            
+            if album_info.get("cover"):
+                album_art = self.download_album_art(album_info["cover"])
+                if album_art:
+                    picture = Picture()
+                    picture.data = album_art
+                    picture.type = PictureType.COVER_FRONT
+                    picture.mime = "image/jpeg"
+                    picture.desc = "Cover"
+                    audio.add_picture(picture)
+                    print("Album art embedded")
+            
+            audio.save()
+            print(f"Metadata embedded successfully for: {track_info.get('title', 'Unknown')}")
+            return True
+            
+        except Exception as e:
+            print(f"Error embedding metadata: {str(e)}")
+            return False
+
+    def download(self, query, isrc=None, output_dir=".", quality="LOSSLESS", is_paused_callback=None, is_stopped_callback=None):
+        if output_dir != ".":
+            try:
+                os.makedirs(output_dir, exist_ok=True)
+            except OSError as e:
+                raise Exception(f"Directory error: {e}")
+                
+        track_info = self.get_track_info(query, isrc)
+        track_id = track_info.get("id")
+        
+        if not track_id:
+            raise Exception("No track ID found")
+        
+        artists_list = []
+        if track_info.get("artists"):
+            for artist in track_info["artists"]:
+                if artist.get("name"):
+                    artists_list.append(artist["name"])
+        elif track_info.get("artist") and track_info["artist"].get("name"):
+            artists_list.append(track_info["artist"]["name"])
+        
+        artist_name = ", ".join(artists_list) if artists_list else "Unknown Artist"
+        artist_name = self.sanitize_filename(artist_name)
+        track_title = self.sanitize_filename(track_info.get("title", f"track_{track_id}"))
+        
+        output_filename = os.path.join(output_dir, f"{artist_name} - {track_title}.flac")
+        
+        if os.path.exists(output_filename):
+            file_size = os.path.getsize(output_filename)
+            if file_size > 0:
+                print(f"File already exists: {output_filename} ({file_size / (1024 * 1024):.2f} MB)")
+                return output_filename
+        
+        download_info = self.get_download_url(track_id, quality)
+        download_url = download_info["download_url"]
+        download_track_info = download_info["track_info"]
+        
+        print(f"Downloading to: {output_filename}")
+        self.download_file(
+            download_url, 
+            output_filename, 
+            is_paused_callback=is_paused_callback, 
+            is_stopped_callback=is_stopped_callback
+        )
+        
+        print("Adding metadata...")
+        try:
+            self.embed_metadata(output_filename, download_track_info, track_info)
+            print("Metadata saved")
+        except Exception as e:
+            print(f"Tagging failed: {e}")
+        
+        print("Done")
+        return output_filename
+
+def main():
+    print("=== TidalDL - Tidal Downloader ===")
+    downloader = TidalDownloader(timeout=30, max_retries=3)
+    
+    query = "APT."
+    isrc = "USAT22409172"
+    output_dir = "."
+    
+    try:
+        downloaded_file = downloader.download(query, isrc, output_dir)
+        print(f"Success: File saved as {downloaded_file}")
+    except Exception as e:
+        print(f"Error: {str(e)}")
+
+if __name__ == "__main__":
+    try:
+        import sys
+        if sys.platform == "win32":
+            import os
+            os.system("chcp 65001 > nul")
+            try:
+                sys.stdout.reconfigure(encoding='utf-8')
+            except:
+                pass
+    except:
+        pass
+        
+    main()

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.7"
+  "version": "4.7"
 }