Diamond75/zotify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issue #4: Added increasing delay on consecutive rate limit hits

Browse source
This commit is contained in:
DraftKinner 2025-02-10 16:42:02 -05:00
parent 645be0def3
commit 3b2dfe8c2f
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
zotify/__init__.py
View file

@ -37,8 +37,6 @@ API_URL = "https://api.sp" + "otify.com/v1/"
AUTH_URL = "https://accounts.sp" + "otify.com/" AUTH_URL = "https://accounts.sp" + "otify.com/"
REDIRECT_URI = "http://127.0.0.1:4381/login" REDIRECT_URI = "http://127.0.0.1:4381/login"
CLIENT_ID = "65b70807" + "3fc0480e" + "a92a0772" + "33ca87bd" CLIENT_ID = "65b70807" + "3fc0480e" + "a92a0772" + "33ca87bd"
RATE_LIMIT_INTERVAL_SECS = 30
RATE_LIMIT_CALLS_PER_INTERVAL = 9
SCOPES = [ SCOPES = [
"app-remote-control", "app-remote-control",
"playlist-modify", "playlist-modify",
@ -68,6 +66,9 @@ SCOPES = [
"user-top-read", "user-top-read",
] ]
RATE_LIMIT_INTERVAL_SECS = 30
RATE_LIMIT_CALLS_PER_INTERVAL = 9
class Session(LibrespotSession): class Session(LibrespotSession):
def __init__( def __init__(

31
zotify/app.py
View file

@ -1,8 +1,9 @@
from argparse import Namespace from argparse import Namespace
from pathlib import Path from pathlib import Path
from typing import Any from typing import Any
from time import sleep
from zotify import OAuth, Session from zotify import OAuth, Session, RATE_LIMIT_INTERVAL_SECS
from zotify.collections import Album, Artist, Collection, Episode, Playlist, Show, Track from zotify.collections import Album, Artist, Collection, Episode, Playlist, Show, Track
from zotify.config import Config from zotify.config import Config
from zotify.file import TranscodingError from zotify.file import TranscodingError
@ -262,6 +263,7 @@ class App:
def download_all(self, collections: list[Collection]) -> None: def download_all(self, collections: list[Collection]) -> None:
count = 0 count = 0
total = sum(len(c.playables) for c in collections) total = sum(len(c.playables) for c in collections)
rate_limit_hits = 0
for collection in collections: for collection in collections:
for playable in collection.playables: for playable in collection.playables:
count += 1 count += 1
@ -282,17 +284,21 @@ class App:
# Get track data # Get track data
if playable.type == PlayableType.TRACK: if playable.type == PlayableType.TRACK:
with Loader("Fetching track..."): try:
try: with Loader("Fetching track..."):
track = self.__session.get_track( track = self.__session.get_track(
playable.id, self.__config.download_quality playable.id, self.__config.download_quality
) )
except RuntimeError as err: except RuntimeError as err:
Logger.log( Logger.log(LogChannel.SKIPS, f"Skipping track #{count}: {err}")
LogChannel.SKIPS, if "audio key" in str(err).lower():
f"Skipping track id = {playable.id}: {err}", rate_limit_hits += 1
) sleep_time = RATE_LIMIT_INTERVAL_SECS * rate_limit_hits
continue with Loader(
f"Rate limit hit! Sleeping for {sleep_time}s..."
):
sleep(sleep_time)
continue
elif playable.type == PlayableType.EPISODE: elif playable.type == PlayableType.EPISODE:
with Loader("Fetching episode..."): with Loader("Fetching episode..."):
track = self.__session.get_episode(playable.id) track = self.__session.get_episode(playable.id)
@ -341,7 +347,9 @@ class App:
track.lyrics().save(output) track.lyrics().save(output)
except FileNotFoundError as e: except FileNotFoundError as e:
Logger.log(LogChannel.SKIPS, str(e)) Logger.log(LogChannel.SKIPS, str(e))
Logger.log(LogChannel.DOWNLOADS, f"\nDownloaded {track.name}") Logger.log(
LogChannel.DOWNLOADS, f"\nDownloaded {track.name} ({count}/{total})"
)
# Transcode audio # Transcode audio
if ( if (
@ -367,3 +375,6 @@ class App:
file.write_cover_art( file.write_cover_art(
track.get_cover_art(self.__config.artwork_size) track.get_cover_art(self.__config.artwork_size)
) )
# Reset rate limit counter for every successful download
rate_limit_hits = 0