Update v2.1

README.md

@@ -6,7 +6,7 @@
 <b>SpotiFLAC</b> allows you to download Spotify tracks in true FLAC format through services like Tidal, Amazon Music and Deezer with the help of Lucida.
 </div>
 
-### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v1.9/SpotiFLAC.exe)
+### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v2.0/SpotiFLAC.exe)
 
 #
 

SpotiFLAC.py

@@ -1,8 +1,8 @@
 import sys
 import os
+import requests
 import time
 from datetime import datetime
-import requests
 from pathlib import Path
 from packaging import version
 from PyQt6.QtWidgets import (QApplication, QMainWindow, QWidget, QVBoxLayout, 
@@ -37,12 +37,20 @@ class MetadataFetcher(QThread):
         self.service = service
         self.use_fallback = use_fallback
         self.max_retries = 3
+        self.downloader = TrackDownloader(use_fallback=use_fallback)
 
     def extract_track_id(self, url):
         if "track/" in url:
             return url.split("track/")[1].split("?")[0].split("/")[0]
         return None
 
+    async def get_track_info_async(self, track_id, service, use_fallback):
+        try:
+            metadata = await self.downloader.get_track_info(track_id, service, use_fallback)
+            return metadata
+        except Exception as e:
+            raise e
+
     def run(self):
         try:
             track_id = self.extract_track_id(self.url)
@@ -50,15 +58,12 @@ class MetadataFetcher(QThread):
                 self.error.emit("Invalid Spotify URL")
                 return
 
-            fallback = "su" if self.use_fallback else "to"
-            api_url = f"https://apislucida.vercel.app/{fallback}/{track_id}/{self.service}"
-            
+            import asyncio
             for attempt in range(self.max_retries):
                 try:
-                    response = requests.get(api_url)
-                    response.raise_for_status()
+                    metadata = asyncio.run(self.get_track_info_async(
+                        track_id, self.service, self.use_fallback))
                     
-                    metadata = response.json()
                     formatted_metadata = {
                         'title': metadata['title'],
                         'artists': metadata['artists'],
@@ -72,7 +77,7 @@ class MetadataFetcher(QThread):
                     self.finished.emit(formatted_metadata)
                     return
                     
-                except requests.exceptions.RequestException as e:
+                except Exception as e:
                     if attempt < self.max_retries - 1:
                         time.sleep(2 * (attempt + 1))
                         continue
@@ -130,7 +135,10 @@ class DownloaderWorker(QThread):
             time_diff = current_time - self.last_update_time
             if time_diff > 0:
                 speed = (downloaded_size - self.last_downloaded_size) / time_diff
-                status = f"Downloading... {self.format_size(downloaded_size)}/{self.format_size(total_size)} | {self.format_speed(speed)}"
+                if downloaded_size == 0 and total_size == 0:
+                    status = "Preparing metadata..."
+                else:
+                    status = f"Downloading... {self.format_size(downloaded_size)}/{self.format_size(total_size)} | {self.format_speed(speed)}"
                 self.status.emit(status)
             
             self.last_update_time = current_time
@@ -303,7 +311,7 @@ class UpdateDialog(QDialog):
 class SpotiFlacGUI(QMainWindow):
     def __init__(self):
         super().__init__()
-        self.current_version = "1.9"
+        self.current_version = "2.1"
         self.settings = QSettings('SpotiFlac', 'Settings')
         self.setWindowTitle("SpotiFLAC")
         self.check_for_updates = self.settings.value('check_for_updates', True, type=bool)
@@ -362,7 +370,7 @@ class SpotiFlacGUI(QMainWindow):
         self.fallback_checkbox.setChecked(fallback)
         
         for i in range(self.service_combo.count()):
-            if self.service_combo.itemData(i) == service:
+            if self.service_combo.itemData(i, Qt.ItemDataRole.UserRole + 1) == service:
                 self.service_combo.setCurrentIndex(i)
                 break
                 
@@ -374,7 +382,7 @@ class SpotiFlacGUI(QMainWindow):
         self.fallback_checkbox.stateChanged.connect(
             lambda x: self.settings.setValue('fallback', bool(x)))
         self.service_combo.currentIndexChanged.connect(
-            lambda i: self.settings.setValue('service', self.service_combo.itemData(i)))
+            lambda i: self.settings.setValue('service', self.service_combo.itemData(i, Qt.ItemDataRole.UserRole + 1)))
         self.format_title_artist.toggled.connect(
             lambda x: self.settings.setValue('format', 'title_artist' if x else 'artist_title'))
         self.dir_input.textChanged.connect(

getTracks.py

@@ -101,10 +101,31 @@ class TrackDownloader:
         print("Waiting for track processing to complete")
         while True:
             completion_response = self.client.get(completion_url, headers=self.headers).json()
-            if completion_response["status"] == "completed":
+            
+            status = completion_response["status"]
+            if status == "completed":
+                print("Processing completed: 100%")
                 break
-            elif completion_response["status"] == "error":
+            elif status == "error":
                 raise Exception(f"API request failed: {completion_response.get('message', 'Unknown error')}")
+            else:
+                progress = completion_response.get("progress", {})
+                if progress:
+                    current = progress.get("current", 0)
+                    total = progress.get("total", 100)
+                    percent = int((current / total) * 100) if total > 0 else 0
+                    action = progress.get("action", "Processing")
+                    print(f"Progress: {percent}% - {action} ({current}/{total})")
+                    
+                    if action.lower() == "metadata":
+                        if self.progress_callback:
+                            self.progress_callback(0, 0)
+                else:
+                    print(f"Status: {status} - Waiting for progress information...")
+                    if status.lower() == "metadata":
+                        if self.progress_callback:
+                            self.progress_callback(0, 0)
+            
             time.sleep(1)
 
         download_url = f"https://{server}.{self.base_domain}/api/fetch/request/{handoff}/download"
@@ -118,16 +139,33 @@ class TrackDownloader:
 
         try:
             with open(file_path, 'wb') as file:
+                start_time = time.time()
+                last_update_time = start_time
+                
                 for chunk in response.iter_content(chunk_size=8192):
                     if chunk:
                         file.write(chunk)
                         downloaded_size += len(chunk)
+                        
+                        current_time = time.time()
+                        if current_time - last_update_time >= 1:
+                            if total_size > 0:
+                                progress_percent = (downloaded_size / total_size) * 100
+                                elapsed_time = current_time - start_time
+                                speed = downloaded_size / (1024 * 1024 * elapsed_time) if elapsed_time > 0 else 0
+                                print(f"Download progress: {progress_percent:.2f}% ({downloaded_size}/{total_size}) - {speed:.2f} MB/s")
+                            else:
+                                print(f"Downloaded {downloaded_size / (1024 * 1024):.2f} MB")
+                            
+                            last_update_time = current_time
+                            
                         if self.progress_callback:
                             self.progress_callback(downloaded_size, total_size)
                 
                 if downloaded_size == 0:
                     raise Exception("No data received from server")
                 
+            print(f"Download completed: {file_path}")
             return file_path
             
         except Exception as e:
@@ -144,12 +182,22 @@ async def main():
     track_id = "2plbrEY59IikOBgBGLjaoe"
     service = "amazon"
     
+    def progress_update(current, total):
+        if total > 0:
+            percent = (current / total) * 100
+            print(f"\rDownload progress: {percent:.2f}% ({current}/{total})", end="")
+    
+    downloader.set_progress_callback(progress_update)
+    
     try:
+        print(f"Getting track info for ID: {track_id} from {service}")
         metadata = await downloader.get_track_info(track_id, service)
+        print(f"Track info received: {metadata['title']} by {metadata['artists']}")
+        
         downloaded_file = downloader.download(metadata, output_dir)
-        print(f"File downloaded successfully: {downloaded_file}")
+        print(f"\nFile downloaded successfully: {downloaded_file}")
     except Exception as e:
         print(f"An error occurred: {str(e)}")
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main())

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.8"
+  "version": "2.0"
 }