Update v2.1
This commit is contained in:
+13
-8
@@ -37,12 +37,20 @@ class MetadataFetcher(QThread):
|
|||||||
self.service = service
|
self.service = service
|
||||||
self.use_fallback = use_fallback
|
self.use_fallback = use_fallback
|
||||||
self.max_retries = 3
|
self.max_retries = 3
|
||||||
|
self.downloader = TrackDownloader(use_fallback=use_fallback)
|
||||||
|
|
||||||
def extract_track_id(self, url):
|
def extract_track_id(self, url):
|
||||||
if "track/" in url:
|
if "track/" in url:
|
||||||
return url.split("track/")[1].split("?")[0].split("/")[0]
|
return url.split("track/")[1].split("?")[0].split("/")[0]
|
||||||
return None
|
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):
|
def run(self):
|
||||||
try:
|
try:
|
||||||
track_id = self.extract_track_id(self.url)
|
track_id = self.extract_track_id(self.url)
|
||||||
@@ -50,15 +58,12 @@ class MetadataFetcher(QThread):
|
|||||||
self.error.emit("Invalid Spotify URL")
|
self.error.emit("Invalid Spotify URL")
|
||||||
return
|
return
|
||||||
|
|
||||||
fallback = "su" if self.use_fallback else "to"
|
import asyncio
|
||||||
api_url = f"https://apislucida.vercel.app/{fallback}/{track_id}/{self.service}"
|
|
||||||
|
|
||||||
for attempt in range(self.max_retries):
|
for attempt in range(self.max_retries):
|
||||||
try:
|
try:
|
||||||
response = requests.get(api_url)
|
metadata = asyncio.run(self.get_track_info_async(
|
||||||
response.raise_for_status()
|
track_id, self.service, self.use_fallback))
|
||||||
|
|
||||||
metadata = response.json()
|
|
||||||
formatted_metadata = {
|
formatted_metadata = {
|
||||||
'title': metadata['title'],
|
'title': metadata['title'],
|
||||||
'artists': metadata['artists'],
|
'artists': metadata['artists'],
|
||||||
@@ -72,7 +77,7 @@ class MetadataFetcher(QThread):
|
|||||||
self.finished.emit(formatted_metadata)
|
self.finished.emit(formatted_metadata)
|
||||||
return
|
return
|
||||||
|
|
||||||
except requests.exceptions.RequestException as e:
|
except Exception as e:
|
||||||
if attempt < self.max_retries - 1:
|
if attempt < self.max_retries - 1:
|
||||||
time.sleep(2 * (attempt + 1))
|
time.sleep(2 * (attempt + 1))
|
||||||
continue
|
continue
|
||||||
@@ -306,7 +311,7 @@ class UpdateDialog(QDialog):
|
|||||||
class SpotiFlacGUI(QMainWindow):
|
class SpotiFlacGUI(QMainWindow):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.current_version = "2.0"
|
self.current_version = "2.1"
|
||||||
self.settings = QSettings('SpotiFlac', 'Settings')
|
self.settings = QSettings('SpotiFlac', 'Settings')
|
||||||
self.setWindowTitle("SpotiFLAC")
|
self.setWindowTitle("SpotiFLAC")
|
||||||
self.check_for_updates = self.settings.value('check_for_updates', True, type=bool)
|
self.check_for_updates = self.settings.value('check_for_updates', True, type=bool)
|
||||||
|
|||||||
Reference in New Issue
Block a user