Update v2.0

README.md

@@ -3,10 +3,10 @@
 ![spotiflac](https://github.com/user-attachments/assets/a233a276-14a4-4f4c-b267-f182dd3912a0)
 
 <div align="center">
-<b>SpotiFLAC</b> allows you to download Spotify tracks in true FLAC format through services like Tidal, Amazon Music and Qobuz with the help of Lucida.
+<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.8/SpotiFLAC.exe)
+### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v1.9/SpotiFLAC.exe)
 
 #
 
@@ -15,9 +15,9 @@ Sometimes, the **download speed** from Lucida can be fast or slow; it varies unp
 
 ## Screenshots
 
-> When **Fallback Server** is enabled, it will use the backup server Lucida.su
+> When **Fallback** is enabled, it will use the backup server `Lucida.su`
 
-![image](https://github.com/user-attachments/assets/d28c2803-d9b4-4150-bd20-dd98df348e64)
+![image](https://github.com/user-attachments/assets/3db51367-45dc-470f-8d6e-8f783ebd6340)
 
 ![image](https://github.com/user-attachments/assets/a9020973-f79c-40ba-ab76-e4a3955a1ba4)
 
@@ -29,4 +29,4 @@ Sometimes, the **download speed** from Lucida can be fast or slow; it varies unp
 
 ![image](https://github.com/user-attachments/assets/7649e6e1-d5d1-49b3-b83f-965d44651d05)
 
-### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v0/FLAC-Checker.zip) FLAC Checker
+#### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v0/FLAC-Checker.zip) FLAC Checker

SpotiFLAC.py

@@ -1,16 +1,17 @@
 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, 
                             QHBoxLayout, QLabel, QLineEdit, QPushButton, 
                             QProgressBar, QFileDialog, QCheckBox, QRadioButton, 
-                            QGroupBox, QComboBox, QDialog, QDialogButtonBox)
+                            QGroupBox, QComboBox, QDialog, QDialogButtonBox,
+                            QStyledItemDelegate, QStyle)
 from PyQt6.QtCore import QThread, pyqtSignal, Qt, QSettings, QSize, QTimer, QUrl
-from PyQt6.QtGui import QIcon, QPixmap, QCursor,QDesktopServices
+from PyQt6.QtGui import QIcon, QPixmap, QCursor, QDesktopServices, QBrush, QPalette
 from getTracks import TrackDownloader
 
 class ImageDownloader(QThread):
@@ -129,6 +130,9 @@ class DownloaderWorker(QThread):
             time_diff = current_time - self.last_update_time
             if time_diff > 0:
                 speed = (downloaded_size - self.last_downloaded_size) / time_diff
+                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)
             
@@ -147,37 +151,123 @@ class DownloaderWorker(QThread):
         except Exception as e:
             self.error.emit(f"Error: {str(e)}")
 
+class ServiceStatusChecker(QThread):
+    status_updated = pyqtSignal(dict)
+    error = pyqtSignal(str)
+    
+    def run(self):
+        try:
+            response = requests.get("https://lucida.to/api/stats", timeout=5)
+            if response.status_code == 200:
+                data = response.json()
+                services_status = {}
+                
+                current_services = data.get('all', {}).get('downloads', {}).get('current', {}).get('services', {})
+                
+                services_status['amazon'] = current_services.get('amazon', 0) > 0
+                services_status['tidal'] = current_services.get('tidal', 0) > 0
+                services_status['deezer'] = current_services.get('deezer', 0) > 0
+                
+                self.status_updated.emit(services_status)
+            else:
+                self.error.emit(f"Server returned status code: {response.status_code}")
+        except Exception as e:
+            self.error.emit(f"Error checking service status: {str(e)}")
+
+
+class StatusIndicatorDelegate(QStyledItemDelegate):
+    def paint(self, painter, option, index):
+        item_data = index.data(Qt.ItemDataRole.UserRole)
+        is_online = item_data.get('online', False) if item_data else False
+        
+        super().paint(painter, option, index)
+        
+        if option.state & QStyle.StateFlag.State_Selected:
+            text_color = option.palette.color(QPalette.ColorGroup.Active, QPalette.ColorRole.HighlightedText)
+        else:
+            text_color = option.palette.color(QPalette.ColorGroup.Active, QPalette.ColorRole.Text)
+        
+        indicator_color = Qt.GlobalColor.green if is_online else Qt.GlobalColor.red
+        
+        circle_size = 6
+        circle_y = option.rect.center().y() - circle_size // 2
+        circle_x = option.rect.right() - circle_size - 10
+        
+        painter.save()
+        painter.setPen(Qt.PenStyle.NoPen)
+        painter.setBrush(QBrush(indicator_color))
+        painter.drawEllipse(circle_x, circle_y, circle_size, circle_size)
+        painter.restore()
+
+
 class ServiceComboBox(QComboBox):
     def __init__(self, parent=None):
         super().__init__(parent)
         self.setIconSize(QSize(16, 16))
+        self.services_status = {}
+        
+        self.setItemDelegate(StatusIndicatorDelegate())
+        
         self.setup_items()
         
+        self.status_checker = ServiceStatusChecker()
+        self.status_checker.status_updated.connect(self.update_service_status)
+        self.status_checker.error.connect(lambda e: print(f"Status check error: {e}"))
+        self.status_checker.start()
+        
+        self.status_timer = QTimer(self)
+        self.status_timer.timeout.connect(self.refresh_status)
+        self.status_timer.start(5000)
+        
     def setup_items(self):
         current_dir = os.path.dirname(os.path.abspath(__file__))
-        icons_dir = os.path.join(current_dir, 'icons')
         
-        if not os.path.exists(icons_dir):
-            os.makedirs(icons_dir)
-            
-        services = [
-            {'id': 'amazon', 'name': 'Amazon Music', 'icon': 'amazon.png'},
-            {'id': 'tidal', 'name': 'Tidal', 'icon': 'tidal.png'}
+        self.services = [
+            {'id': 'amazon', 'name': 'Amazon Music', 'icon': 'amazon.png', 'online': False},
+            {'id': 'tidal', 'name': 'Tidal', 'icon': 'tidal.png', 'online': False},
+            {'id': 'deezer', 'name': 'Deezer', 'icon': 'deezer.png', 'online': False}
         ]
         
-        for service in services:
-            icon_path = os.path.join(icons_dir, service['icon'])
+        for service in self.services:
+            icon_path = os.path.join(current_dir, service['icon'])
             if not os.path.exists(icon_path):
                 self.create_placeholder_icon(icon_path)
             
             icon = QIcon(icon_path)
-            self.addItem(icon, service['name'], service['id'])
+            
+            self.addItem(icon, service['name'])
+            item_index = self.count() - 1
+            self.setItemData(item_index, service['id'], Qt.ItemDataRole.UserRole + 1)
+            self.setItemData(item_index, service, Qt.ItemDataRole.UserRole)
     
     def create_placeholder_icon(self, path):
         pixmap = QPixmap(16, 16)
         pixmap.fill(Qt.GlobalColor.transparent)
         pixmap.save(path)
     
+    def update_service_status(self, status_dict):
+        self.services_status = status_dict
+        
+        for i in range(self.count()):
+            service_id = self.itemData(i, Qt.ItemDataRole.UserRole + 1)
+            
+            if service_id in self.services_status:
+                service_data = self.itemData(i, Qt.ItemDataRole.UserRole)
+                if isinstance(service_data, dict):
+                    service_data['online'] = self.services_status[service_id]
+                    self.setItemData(i, service_data, Qt.ItemDataRole.UserRole)
+        
+        self.update()
+    
+    def refresh_status(self):
+        self.status_checker = ServiceStatusChecker()
+        self.status_checker.status_updated.connect(self.update_service_status)
+        self.status_checker.error.connect(lambda e: print(f"Status check error: {e}"))
+        self.status_checker.start()
+        
+    def currentData(self, role=Qt.ItemDataRole.UserRole + 1):
+        return super().currentData(role)
+
 class UpdateDialog(QDialog):
     def __init__(self, current_version, new_version, parent=None):
         super().__init__(parent)
@@ -216,7 +306,7 @@ class UpdateDialog(QDialog):
 class SpotiFlacGUI(QMainWindow):
     def __init__(self):
         super().__init__()
-        self.current_version = "1.8"
+        self.current_version = "2.0"
         self.settings = QSettings('SpotiFlac', 'Settings')
         self.setWindowTitle("SpotiFLAC")
         self.check_for_updates = self.settings.value('check_for_updates', True, type=bool)
@@ -275,7 +365,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
                 
@@ -287,7 +377,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(
@@ -342,7 +432,7 @@ class SpotiFlacGUI(QMainWindow):
         settings_container_layout.setContentsMargins(0, 0, 0, 0)
         settings_container_layout.setSpacing(10)
         
-        self.fallback_checkbox = QCheckBox("Fallback Server")
+        self.fallback_checkbox = QCheckBox("Fallback")
         self.fallback_checkbox.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
         self.fallback_checkbox.setChecked(False)
         settings_container_layout.addWidget(self.fallback_checkbox)
@@ -366,9 +456,9 @@ class SpotiFlacGUI(QMainWindow):
         format_layout.setContentsMargins(0, 0, 0, 0)
         format_layout.setSpacing(10)
         
-        format_label = QLabel("Filename Format:")
-        self.format_title_artist = QRadioButton("Title")
-        self.format_artist_title = QRadioButton("Artist")
+        format_label = QLabel("Filename:")
+        self.format_title_artist = QRadioButton("Title - Artist")
+        self.format_artist_title = QRadioButton("Artist - Title")
         self.format_title_artist.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
         self.format_artist_title.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
         self.format_title_artist.setChecked(True)

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,10 +182,20 @@ 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)}")
 

version.json

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