diff --git a/.github/tmpFlows/stale.yml b/.github/tmpFlows/stale.yml index 627a4d5..fd522b7 100644 --- a/.github/tmpFlows/stale.yml +++ b/.github/tmpFlows/stale.yml @@ -18,7 +18,7 @@ # pull-requests: write # steps: -# - uses: actions/stale@v5 +# - uses: actions/stale@v6 # with: # repo-token: ${{ secrets.GITHUB_TOKEN }} # stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity.' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e42f0de..fadc18f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -67,7 +67,7 @@ jobs: # working-directory: TIDALDL-PY/dist - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: tidal-dl-${{ runner.os }} path: | diff --git a/TIDALDL-PY/exe/tidal-dl.exe b/TIDALDL-PY/exe/tidal-dl.exe index 27f0622..bd46476 100644 Binary files a/TIDALDL-PY/exe/tidal-dl.exe and b/TIDALDL-PY/exe/tidal-dl.exe differ diff --git a/TIDALDL-PY/tidal_dl/events.py b/TIDALDL-PY/tidal_dl/events.py index c632ebc..d0d4051 100644 --- a/TIDALDL-PY/tidal_dl/events.py +++ b/TIDALDL-PY/tidal_dl/events.py @@ -183,6 +183,7 @@ def changeSettings(): SETTINGS.lyricFile = Printf.enterBool(LANG.select.CHANGE_ADD_LRC_FILE) SETTINGS.multiThread = Printf.enterBool(LANG.select.CHANGE_MULITHREAD_DOWNLOAD) SETTINGS.usePlaylistFolder = Printf.enterBool(LANG.select.SETTING_USE_PLAYLIST_FOLDER + "('0'-No,'1'-Yes):") + SETTINGS.downloadDelay = Printf.enterBool(LANG.select.CHANGE_USE_DOWNLOAD_DELAY) SETTINGS.language = Printf.enter(LANG.select.CHANGE_LANGUAGE + "(" + LANG.getLangChoicePrint() + "):") LANG.setLang(SETTINGS.language) SETTINGS.save() diff --git a/TIDALDL-PY/tidal_dl/lang/arabic.py b/TIDALDL-PY/tidal_dl/lang/arabic.py index 504a7a9..47332dd 100644 --- a/TIDALDL-PY/tidal_dl/lang/arabic.py +++ b/TIDALDL-PY/tidal_dl/lang/arabic.py @@ -43,6 +43,7 @@ class LangArabic(object): SETTING_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "خيار" FUNCTION = "وظيفة" @@ -93,6 +94,7 @@ class LangArabic(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starting login process..." diff --git a/TIDALDL-PY/tidal_dl/lang/chinese.py b/TIDALDL-PY/tidal_dl/lang/chinese.py index bce2812..036f547 100644 --- a/TIDALDL-PY/tidal_dl/lang/chinese.py +++ b/TIDALDL-PY/tidal_dl/lang/chinese.py @@ -43,6 +43,7 @@ class LangChinese(object): SETTING_PATH = "配置文件目录" SETTING_APIKEY = "APIKey支持" SETTING_ADD_TYPE_FOLDER = "添加类型文件夹" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "选项" FUNCTION = "功能" @@ -93,6 +94,7 @@ class LangChinese(object): CHANGE_ADD_LRC_FILE = "保存歌词文件 ('0'-否,'1'-是):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "多线程下载('0'-否,'1'-是):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "开始启动登录..." diff --git a/TIDALDL-PY/tidal_dl/lang/croatian.py b/TIDALDL-PY/tidal_dl/lang/croatian.py index 50a6c22..11544bf 100644 --- a/TIDALDL-PY/tidal_dl/lang/croatian.py +++ b/TIDALDL-PY/tidal_dl/lang/croatian.py @@ -43,6 +43,7 @@ class LangCroatian(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "ODABIR" FUNCTION = "FUNKCIJA" @@ -93,6 +94,7 @@ class LangCroatian(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starting login process..." diff --git a/TIDALDL-PY/tidal_dl/lang/czech.py b/TIDALDL-PY/tidal_dl/lang/czech.py index 8d1a5b7..654b9a4 100644 --- a/TIDALDL-PY/tidal_dl/lang/czech.py +++ b/TIDALDL-PY/tidal_dl/lang/czech.py @@ -2,9 +2,9 @@ # -*- encoding: utf-8 -*- ''' @File : czech.py -@Time : 2022/07/26 +@Time : 2022/11/13 @Author : Tomikk & Sweder -@Version : 1.1 +@Version : 1.2 @Contact : justtomikk@gmail.com & djsweder@gmail.com @Desc : ''' @@ -43,16 +43,17 @@ class LangCzech(object): SETTING_PATH = "Cesta k souboru s nastavením" SETTING_APIKEY = "APIKey podporuje" SETTING_ADD_TYPE_FOLDER = "Složky dle typu obsahu" + SETTING_DOWNLOAD_DELAY = "Stahovat s časovou prodlevou" CHOICE = "Výběr" FUNCTION = "Funkce" - CHOICE_ENTER = "Enter" + CHOICE_ENTER = "Zvolit" CHOICE_ENTER_URLID = "Vložit 'Url/ID':" CHOICE_EXIT = "Ukončit" CHOICE_LOGIN = "Zkontrolovat přístupový token" CHOICE_SETTINGS = "Nastavení" CHOICE_SET_ACCESS_TOKEN = "Nastavit přístupový token" - CHOICE_DOWNLOAD_BY_URL = "Stáhnout buď url nebo id" + CHOICE_DOWNLOAD_BY_URL = "Stáhnout buď dle URL nebo ID" CHOICE_LOGOUT = "Odhlásit" CHOICE_APIKEY = "Vybrat APIKey" @@ -85,14 +86,15 @@ class LangCzech(object): CHANGE_TRACK_FILE_FORMAT = "Formát názvu složky skladny ('0' beze změny):" CHANGE_VIDEO_FILE_FORMAT = "Formát názvu souboru videa ('0'-beze změny,'default'-pro nastavení výchozího názvu):" CHANGE_SHOW_PROGRESS = "Zobrazit indikátor stavu stahování ('0'-Ne,'1'-Ano):" - CHANGE_SHOW_TRACKINFO = "Show info o skladbě ('0'-Ne,'1'-Ano):" + CHANGE_SHOW_TRACKINFO = "Zobrazit info o skladbě ('0'-Ne,'1'-Ano):" CHANGE_SAVE_ALBUM_INFO = "Uložit soubor AlbumInfo.txt ('0'-Ne,'1'-Ano):" CHANGE_DOWNLOAD_VIDEOS = "Download videos (when downloading playlists, albums, mixes)('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Přidat texty skladeb ('0'-Ne,'1'-Ano):" CHANGE_LYRICS_SERVER_PROXY = "Server proxy pro texty skladeb ('0' beze změny):" CHANGE_ADD_LRC_FILE = "Uložit slova skladby s časováním do souboru .lrc) ('0'-Ne,'1'-Ano):" CHANGE_ADD_TYPE_FOLDER = "Ukládat do složek dle typu obsahu, např. Album/Video/Playlist ('0'-Ne,'1'-Ano):" - CHANGE_MULITHREAD_DOWNLOAD = "Více vláken pro stahování ('0'-Ne,'1'-Ano):" + CHANGE_MULITHREAD_DOWNLOAD = "Více vláken pro stahování ('0'-Ne,'1'-Ano):" + CHANGE_USE_DOWNLOAD_DELAY = "Stahovat s časovou prodlevou('0'-Ne,'1'-Ano):" # {} are required in these strings AUTH_START_LOGIN = "Spouštění přihlašovacího procesu..." diff --git a/TIDALDL-PY/tidal_dl/lang/danish.py b/TIDALDL-PY/tidal_dl/lang/danish.py index cf2e115..cf14003 100644 --- a/TIDALDL-PY/tidal_dl/lang/danish.py +++ b/TIDALDL-PY/tidal_dl/lang/danish.py @@ -43,6 +43,7 @@ class LangDanish(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "VALG" FUNCTION = "FUNKTION" @@ -93,6 +94,7 @@ class LangDanish(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starter login-processen." diff --git a/TIDALDL-PY/tidal_dl/lang/dutch.py b/TIDALDL-PY/tidal_dl/lang/dutch.py index b78e985..07f1997 100644 --- a/TIDALDL-PY/tidal_dl/lang/dutch.py +++ b/TIDALDL-PY/tidal_dl/lang/dutch.py @@ -43,6 +43,7 @@ class LangDutch(object): SETTING_PATH = "Instellingen pad" SETTING_APIKEY = "APIKey-ondersteuning" SETTING_ADD_TYPE_FOLDER = "Typemap toevoegen" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "KEUZE" FUNCTION = "FUNCTIE" @@ -93,6 +94,7 @@ class LangDutch(object): CHANGE_ADD_LRC_FILE = "Sla getimede songtekst .lrc-bestand op ('0'-Nee,'1'-Ja):" CHANGE_ADD_TYPE_FOLDER = "Type-map toevoegen, bijv. Album/Video/Playlist('0'-Nee,'1'-Ja):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Inlogproces starten..." diff --git a/TIDALDL-PY/tidal_dl/lang/english.py b/TIDALDL-PY/tidal_dl/lang/english.py index 6c70e6a..4d098c5 100644 --- a/TIDALDL-PY/tidal_dl/lang/english.py +++ b/TIDALDL-PY/tidal_dl/lang/english.py @@ -43,6 +43,7 @@ class LangEnglish(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "CHOICE" FUNCTION = "FUNCTION" @@ -93,6 +94,7 @@ class LangEnglish(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starting login process..." diff --git a/TIDALDL-PY/tidal_dl/lang/filipino.py b/TIDALDL-PY/tidal_dl/lang/filipino.py index 2541cc4..ac78331 100644 --- a/TIDALDL-PY/tidal_dl/lang/filipino.py +++ b/TIDALDL-PY/tidal_dl/lang/filipino.py @@ -43,6 +43,7 @@ class LangFilipino(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "PAGPIPILIAN" FUNCTION = "SILBI" @@ -93,6 +94,7 @@ class LangFilipino(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starting login process..." diff --git a/TIDALDL-PY/tidal_dl/lang/french.py b/TIDALDL-PY/tidal_dl/lang/french.py index 6742b16..f144050 100644 --- a/TIDALDL-PY/tidal_dl/lang/french.py +++ b/TIDALDL-PY/tidal_dl/lang/french.py @@ -43,6 +43,7 @@ class LangFrench(object): SETTING_PATH = "Emplacement des paramètres" SETTING_APIKEY = "Prise en charge de la clé API" SETTING_ADD_TYPE_FOLDER = "Ajouter un dossier de type" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "CHOIX" FUNCTION = "FONCTION" @@ -93,6 +94,7 @@ class LangFrench(object): CHANGE_ADD_LRC_FILE = "Enregistrer les paroles synchronisées (fichier.lrc) ('0'-Non,'1'-Oui):" CHANGE_ADD_TYPE_FOLDER = "Ajouter un dossier de type,Ex: Album/Video/Playlist('0'-Non,'1'-Oui):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-Non,'1'-Oui):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Démarrage du processus de connexion..." diff --git a/TIDALDL-PY/tidal_dl/lang/german.py b/TIDALDL-PY/tidal_dl/lang/german.py index 5bbb7e7..5c94e16 100644 --- a/TIDALDL-PY/tidal_dl/lang/german.py +++ b/TIDALDL-PY/tidal_dl/lang/german.py @@ -2,9 +2,9 @@ # -*- encoding: utf-8 -*- ''' @File : german.py -@Time : 2021/01/04 -@Authors : Sematre, MineClashTV -@Version : 1.0 +@Time : 2022/11/8 +@Authors : Sematre, MineClashTV, Click1701 +@Version : 1.1 @Contact : @Desc : ''' @@ -24,25 +24,26 @@ class LangGerman(object): SETTING_CHECK_EXIST = "Existenz überprüfen" SETTING_ARTIST_BEFORE_TITLE = "Künstlername vor Songtitel" SETTING_ALBUMID_BEFORE_FOLDER = "ID vor Album-Ordner" - SETTING_INCLUDE_EP = "Einschließlich single&ep" + SETTING_INCLUDE_EP = "Singles & EPs einschließen" SETTING_SAVE_COVERS = "Cover speichern" SETTING_LANGUAGE = "Sprache" SETTING_USE_PLAYLIST_FOLDER = "Playlist-Ordner verwenden" - SETTING_MULITHREAD_DOWNLOAD = "Multi-Thread-Download" + SETTING_MULITHREAD_DOWNLOAD = "Multi-Thread Download" SETTING_ALBUM_FOLDER_FORMAT = "Album-Ordnerformat" - SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist-Ordnerformat" SETTING_TRACK_FILE_FORMAT = "Track-Dateiformat" - SETTING_VIDEO_FILE_FORMAT = "Video file format" + SETTING_VIDEO_FILE_FORMAT = "Video-Dateiformat" SETTING_SHOW_PROGRESS = "Fortschritt anzeigen" - SETTING_SHOW_TRACKINFO = "Show Track Info" - SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" + SETTING_SHOW_TRACKINFO = "Titelinformationen anzeigen" + SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt speichern" SETTING_DOWNLOAD_VIDEOS = "Download videos" - SETTING_ADD_LYRICS = "Add lyrics" - SETTING_LYRICS_SERVER_PROXY = "Lyrics server proxy" - SETTING_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" - SETTING_PATH = "Settings path" - SETTING_APIKEY = "APIKey support" - SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_ADD_LYRICS = "Songtexte hinzufügen" + SETTING_LYRICS_SERVER_PROXY = "Songtext Proxy-Server" + SETTING_ADD_LRC_FILE = "Songtext mit Zeitcode speichern (.lrc Datei)" + SETTING_PATH = "Speicherort der Einstellungen" + SETTING_APIKEY = "APIKey Unterstützung" + SETTING_ADD_TYPE_FOLDER = "Unterordner für jede Kategorie erstellen" + SETTING_DOWNLOAD_DELAY = "Downloads zeitverzögert starten" CHOICE = "AUSWAHL" FUNCTION = "FUNKTION" @@ -52,9 +53,9 @@ class LangGerman(object): CHOICE_LOGIN = "AccessToken überprüfen" CHOICE_SETTINGS = "Einstellungen" CHOICE_SET_ACCESS_TOKEN = "AccessToken setzen" - CHOICE_DOWNLOAD_BY_URL = "Herunterladen per URL oder ID" - CHOICE_LOGOUT = "Logout" - CHOICE_APIKEY = "Select APIKey" + CHOICE_DOWNLOAD_BY_URL = "Download per URL oder ID" + CHOICE_LOGOUT = "Ausloggen" + CHOICE_APIKEY = "APIKey Auswahl" PRINT_ERR = "[FEHLER]" PRINT_INFO = "[INFO]" @@ -65,44 +66,45 @@ class LangGerman(object): # PRINT_USERNAME = "Benutzername:" # PRINT_PASSWORD = "Passwort:" - CHANGE_START_SETTINGS = "Einstellungen starten ('0'-Zurück,'1'-Ja):" + CHANGE_START_SETTINGS = "Einstellungen starten ('0'-Zurück, '1'-Ja):" CHANGE_DOWNLOAD_PATH = "Downloadpfad ('0' nicht ändern):" - CHANGE_AUDIO_QUALITY = "Tonqualität ('0'-Normal,'1'-Hoch,'2'-HiFi,'3'-Master):" + CHANGE_AUDIO_QUALITY = "Tonqualität ('0'-Normal, '1'-Hoch, '2'-HiFi, '3'-Master):" CHANGE_VIDEO_QUALITY = "Videoqualität (1080, 720, 480, 360):" - CHANGE_ONLYM4A = "mp4 in m4a konvertieren ('0'-Nein,'1'-Ja):" - CHANGE_ADD_EXPLICIT_TAG = "Explicit Tag zum Dateiname hinzufügen ('0'-Nein,'1'-Ja):" - CHANGE_ADD_HYPHEN = "Verwende Bindestriche statt Leerzeichen im Dateinamen ('0'-Nein,'1'-Ja):" - CHANGE_ADD_YEAR = "Jahr zu Album-Ordnernamen hinzufügen ('0'-Nein,'1'-Ja):" - CHANGE_USE_TRACK_NUM = "Titelnummer vor Dateinamen hinzufügen ('0'-Nein,'1'-Ja):" - CHANGE_CHECK_EXIST = "Vor dem Download überprüfen, ob die Datei existiert ('0'-Nein,'1'-Ja):" - CHANGE_ARTIST_BEFORE_TITLE = "Künstlername vor den Songtitel hinzufügen ('0'-Nein,'1'-Ja):" - CHANGE_INCLUDE_EP = "Singles und EPs beim Download von Alben eines Künstlers einbeziehen ('0'-Nein,'1'-Ja):" - CHANGE_ALBUMID_BEFORE_FOLDER = "ID vor Album-Ordner hinzufügen ('0'-Nein,'1'-Ja):" - CHANGE_SAVE_COVERS = "Cover speichern ('0'-Nein,'1'-Ja):" + CHANGE_ONLYM4A = "mp4 in m4a konvertieren ('0'-Nein, '1'-Ja):" + CHANGE_ADD_EXPLICIT_TAG = "Explicit Tag zum Dateiname hinzufügen ('0'-Nein, '1'-Ja):" + CHANGE_ADD_HYPHEN = "Im Dateinamen Bindestriche statt Leerzeichen verwenden ('0'-Nein, '1'-Ja):" + CHANGE_ADD_YEAR = "Jahr zu Album-Ordnernamen hinzufügen ('0'-Nein, '1'-Ja):" + CHANGE_USE_TRACK_NUM = "Titelnummer vor Dateinamen hinzufügen ('0'-Nein, '1'-Ja):" + CHANGE_CHECK_EXIST = "Vor dem Download überprüfen, ob die Datei existiert ('0'-Nein, '1'-Ja):" + CHANGE_ARTIST_BEFORE_TITLE = "Künstlername vor den Songtitel hinzufügen ('0'-Nein, '1'-Ja):" + CHANGE_INCLUDE_EP = "Singles und EPs beim Download von Alben eines Künstlers einbeziehen ('0'-Nein, '1'-Ja):" + CHANGE_ALBUMID_BEFORE_FOLDER = "ID vor Album-Ordner hinzufügen ('0'-Nein, '1'-Ja):" + CHANGE_SAVE_COVERS = "Cover speichern ('0'-Nein, '1'-Ja):" CHANGE_LANGUAGE = "Sprache auswählen" - CHANGE_ALBUM_FOLDER_FORMAT = "Album-Ordnerformat('0' überspringen):" - CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" - CHANGE_TRACK_FILE_FORMAT = "Track-Dateiformat('0' überspringen):" - CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" - CHANGE_SHOW_PROGRESS = "Fortschritt anzeigen('0'-Nein,'1'-Ja):" - CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" - CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" + CHANGE_ALBUM_FOLDER_FORMAT = "Album-Ordnerformat ('0' überspringen):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist Ordner-Format ('0'-nicht ändern, 'default'-für Standard):" + CHANGE_TRACK_FILE_FORMAT = "Track-Dateiformat ('0' überspringen):" + CHANGE_VIDEO_FILE_FORMAT = "Video-Dateiformat ('0'-nicht ändern, 'default'-für Standard):" + CHANGE_SHOW_PROGRESS = "Fortschritt anzeigen ('0'-Nein, '1'-Ja):" + CHANGE_SHOW_TRACKINFO = "Song-Informationen anzeigen ('0'-Nein, '1'-Ja):" + CHANGE_SAVE_ALBUM_INFO = "AlbumInfo.txt speichern ('0'-Nein, '1'-Ja):" CHANGE_DOWNLOAD_VIDEOS = "Download videos (when downloading playlists, albums, mixes)('0'-No,'1'-Yes):" - CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0'-not modify):" - CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" - CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" - CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_ADD_LYRICS = "Songtexte hinzufügen ('0'-No, '1'-Yes):" + CHANGE_LYRICS_SERVER_PROXY = "Songtext Proxy-Server ('0'-not modify):" + CHANGE_ADD_LRC_FILE = "Songtexte mit Zeitcode speichern (.lrc Datei) ('0'-Nein, '1'-Ja):" + CHANGE_ADD_TYPE_FOLDER = "Unterordner für jede Kategorie erstellen, Z.B. Album/Video/Playlist('0'-Nein, '1'-Ja):" + CHANGE_MULITHREAD_DOWNLOAD = "Multi-Thread Download('0'-Nein, '1'-Ja):" + CHANGE_USE_DOWNLOAD_DELAY = "Downloads zeitverzögert starten ('0'-nein, '1'-ja):" # {} are required in these strings AUTH_START_LOGIN = "Starte Loginprozess..." AUTH_LOGIN_CODE = "Dein Logincode ist {}" AUTH_NEXT_STEP = "Gehe auf {} in den nächsten {} um das Setup abzuschließen." - AUTH_WAITING = "Auf Autorisierung warten..." + AUTH_WAITING = "Warte auf Autorisierung..." AUTH_TIMEOUT = "Zeitüberschreitung der Operation." MSG_VALID_ACCESSTOKEN = "AccessToken gültig für {}." - MSG_INVALID_ACCESSTOKEN = "AccessToken abgelaufen. Versuche zu erneuern." + MSG_INVALID_ACCESSTOKEN = "AccessToken abgelaufen. Er muss erneuert werden." MSG_PATH_ERR = "Ungültiger Pfad!" MSG_INPUT_ERR = "Eingabefehler!" diff --git a/TIDALDL-PY/tidal_dl/lang/hungarian.py b/TIDALDL-PY/tidal_dl/lang/hungarian.py index 0b8b212..78d8d75 100644 --- a/TIDALDL-PY/tidal_dl/lang/hungarian.py +++ b/TIDALDL-PY/tidal_dl/lang/hungarian.py @@ -43,6 +43,7 @@ class LangHungarian(object): SETTING_PATH = "Beállítási útvonal" SETTING_APIKEY = "APIKey támogatás" SETTING_ADD_TYPE_FOLDER = "Mappa típus hozzáadása" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "VÁLASZTÁS" FUNCTION = "FUNKCIÓ" @@ -93,6 +94,7 @@ class LangHungarian(object): CHANGE_ADD_LRC_FILE = "Dalszöveg mentése időbélyeggel .lrc fájl('0'-Nem,'1'-Igen):" CHANGE_ADD_TYPE_FOLDER = "Mappa típus hozzáadása, pl. Album/Video/Playlist('0'-Nem,'1'-Igen):" CHANGE_MULITHREAD_DOWNLOAD = "Többszálas letöltés('0'-Nem,'1'-Igen):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Bejelentkezési folyamat elindítása..." diff --git a/TIDALDL-PY/tidal_dl/lang/italian.py b/TIDALDL-PY/tidal_dl/lang/italian.py index 02f8ae2..84eaf8d 100644 --- a/TIDALDL-PY/tidal_dl/lang/italian.py +++ b/TIDALDL-PY/tidal_dl/lang/italian.py @@ -43,6 +43,7 @@ class LangItalian(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "SCELTA" FUNCTION = "FUNZIONE" @@ -93,6 +94,7 @@ class LangItalian(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starting login process..." diff --git a/TIDALDL-PY/tidal_dl/lang/japanese.py b/TIDALDL-PY/tidal_dl/lang/japanese.py index 79a565d..a468f0e 100644 --- a/TIDALDL-PY/tidal_dl/lang/japanese.py +++ b/TIDALDL-PY/tidal_dl/lang/japanese.py @@ -43,6 +43,7 @@ class LangJapanese(object): SETTING_PATH = "設定パス" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "選択" FUNCTION = "関数" @@ -93,6 +94,7 @@ class LangJapanese(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-いいえ,'1'-はい):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starting login process..." diff --git a/TIDALDL-PY/tidal_dl/lang/korean.py b/TIDALDL-PY/tidal_dl/lang/korean.py index 1930b82..c58a02b 100644 --- a/TIDALDL-PY/tidal_dl/lang/korean.py +++ b/TIDALDL-PY/tidal_dl/lang/korean.py @@ -43,6 +43,7 @@ class LangKorean(object): SETTING_PATH = "설정 경로" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "선택" FUNCTION = "기능" @@ -93,6 +94,7 @@ class LangKorean(object): CHANGE_ADD_LRC_FILE = "timed 가사 .lrc 파일 저장 ('0'-아니요,'1'-예):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "로그인 중..." diff --git a/TIDALDL-PY/tidal_dl/lang/norwegian.py b/TIDALDL-PY/tidal_dl/lang/norwegian.py index 042008e..ff83bf6 100644 --- a/TIDALDL-PY/tidal_dl/lang/norwegian.py +++ b/TIDALDL-PY/tidal_dl/lang/norwegian.py @@ -43,6 +43,7 @@ class LangNorwegian(object): SETTING_PATH = "Innstillinger sti" SETTING_APIKEY = "API-nøkkel støtte" SETTING_ADD_TYPE_FOLDER = "Legg til Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "VALG" FUNCTION = "FUNKSJON" @@ -93,6 +94,7 @@ class LangNorwegian(object): CHANGE_ADD_LRC_FILE = "Lagre sangtekster med tidsreferanser .lrc fil ('0'-Nei,'1'-Ja):" CHANGE_ADD_TYPE_FOLDER = "Legg til Type-mappe, f.eks. Album/Video/Spilleliste('0'-Nei,'1'-Ja):" CHANGE_MULITHREAD_DOWNLOAD = "Last ned flere samtidig('0'-Nei,'1'-Ja):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Starter login-prosessen." diff --git a/TIDALDL-PY/tidal_dl/lang/polish.py b/TIDALDL-PY/tidal_dl/lang/polish.py index 5a12061..3a6736e 100644 --- a/TIDALDL-PY/tidal_dl/lang/polish.py +++ b/TIDALDL-PY/tidal_dl/lang/polish.py @@ -43,6 +43,7 @@ class LangPolish(object): SETTING_PATH = "Ścieżka ustawień" SETTING_APIKEY = "Obsługa APIKey" SETTING_ADD_TYPE_FOLDER = "Dodaj folder typu" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "WYBÓR" FUNCTION = "FUNKCJA" @@ -93,6 +94,7 @@ class LangPolish(object): CHANGE_ADD_LRC_FILE = "Zapisz plik .lrc czasowych tekstów utworów ('0'-Nie,'1'-Tak):" CHANGE_ADD_TYPE_FOLDER = "Dodaj folder typu, np. Album/wideo/lista odtwarzania('0'-Nie,'1'-Tak):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Rozpoczęcie procesu logowania..." diff --git a/TIDALDL-PY/tidal_dl/lang/portuguese.py b/TIDALDL-PY/tidal_dl/lang/portuguese.py index 3cb1923..12078ef 100644 --- a/TIDALDL-PY/tidal_dl/lang/portuguese.py +++ b/TIDALDL-PY/tidal_dl/lang/portuguese.py @@ -43,6 +43,7 @@ class LangPortuguese(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "Suporte APIKey" SETTING_ADD_TYPE_FOLDER = "Adicionar tipo de pasta" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "ESCOLHER" FUNCTION = "FUNÇÃO" @@ -93,6 +94,7 @@ class LangPortuguese(object): CHANGE_ADD_LRC_FILE = "Salvar arquivo .lrc de letras cronometradas ('0'-Não,'1'-Sim):" CHANGE_ADD_TYPE_FOLDER = "Adicionar Tipo de Pasta, por exemplo, Álbum/Vídeo/Lista de Reprodução('0'-Não,'1'-Sim):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Iniciando o processo de login..." diff --git a/TIDALDL-PY/tidal_dl/lang/russian.py b/TIDALDL-PY/tidal_dl/lang/russian.py index 0fdc9ca..9d9f78e 100644 --- a/TIDALDL-PY/tidal_dl/lang/russian.py +++ b/TIDALDL-PY/tidal_dl/lang/russian.py @@ -43,6 +43,7 @@ class LangRussian(object): SETTING_PATH = "Путь для настроек" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "ВЫБРАТЬ" FUNCTION = "ФУНКЦИИ" @@ -93,6 +94,7 @@ class LangRussian(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Входим в сервис..." diff --git a/TIDALDL-PY/tidal_dl/lang/spanish.py b/TIDALDL-PY/tidal_dl/lang/spanish.py index ec2813f..93e3f82 100644 --- a/TIDALDL-PY/tidal_dl/lang/spanish.py +++ b/TIDALDL-PY/tidal_dl/lang/spanish.py @@ -43,6 +43,7 @@ class LangSpanish(object): SETTING_PATH = "Ruta de ajustes" SETTING_APIKEY = "Soporte de la APIKey" SETTING_ADD_TYPE_FOLDER = "Añadir tipo de carpeta" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "SELECCIÓN" FUNCTION = "FUNCIÓN" @@ -93,6 +94,7 @@ class LangSpanish(object): CHANGE_ADD_LRC_FILE = "¿Añadir letras cronometradas en un archivo .lrc? ('0'-No,'1'-Sí):" CHANGE_ADD_TYPE_FOLDER = "Añadir tipo de carpeta, ej: Album/Video/Playlist('0'-No,'1'-Sí):" CHANGE_MULITHREAD_DOWNLOAD = "¿Descarga Multi-hilo?('0'-No,'1'-Sí:" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Iniciando sesión..." diff --git a/TIDALDL-PY/tidal_dl/lang/turkish.py b/TIDALDL-PY/tidal_dl/lang/turkish.py index 97ae27e..955b088 100644 --- a/TIDALDL-PY/tidal_dl/lang/turkish.py +++ b/TIDALDL-PY/tidal_dl/lang/turkish.py @@ -43,6 +43,7 @@ class LangTurkish(object): SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "Seçim" FUNCTION = "İşlemler" @@ -93,6 +94,7 @@ class LangTurkish(object): CHANGE_ADD_LRC_FILE = "Save timed lyrics .lrc file ('0'-No,'1'-Yes):" CHANGE_ADD_TYPE_FOLDER = "Add Type-Folder,eg Album/Video/Playlist('0'-No,'1'-Yes):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Giriş işlemleri başlatıldı..." diff --git a/TIDALDL-PY/tidal_dl/lang/ukrainian.py b/TIDALDL-PY/tidal_dl/lang/ukrainian.py index a164226..668c830 100644 --- a/TIDALDL-PY/tidal_dl/lang/ukrainian.py +++ b/TIDALDL-PY/tidal_dl/lang/ukrainian.py @@ -43,6 +43,7 @@ class LangUkrainian(object): SETTING_PATH = "Шлях налаштувань" SETTING_APIKEY = "Підтримка ключа API" SETTING_ADD_TYPE_FOLDER = "Додавати папку-тип" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "ВИБІР" FUNCTION = "ФУНКЦІЇ" @@ -93,6 +94,7 @@ class LangUkrainian(object): CHANGE_ADD_LRC_FILE = "Зберігати тексти пісень з відмітками часу в .lrc файл('0'-Ні,'1'-Так):" CHANGE_ADD_TYPE_FOLDER = "Додавати теку-тип,наприклад Альбом/Відео/Плейлист('0'-Ні,'1'-Так):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Початок процесу авторизації..." diff --git a/TIDALDL-PY/tidal_dl/lang/vietnamese.py b/TIDALDL-PY/tidal_dl/lang/vietnamese.py index e3ea7c4..39acf6a 100644 --- a/TIDALDL-PY/tidal_dl/lang/vietnamese.py +++ b/TIDALDL-PY/tidal_dl/lang/vietnamese.py @@ -43,6 +43,7 @@ class LangVietnamese(object): SETTING_PATH = "Đường dẫn cài đặt" SETTING_APIKEY = "Hỗ trợ APIKey" SETTING_ADD_TYPE_FOLDER = "Thêm Loại-Thư mục" + SETTING_DOWNLOAD_DELAY = "Use Download Delay" CHOICE = "LỰA CHỌN" FUNCTION = "CHỨC NĂNG" @@ -93,6 +94,7 @@ class LangVietnamese(object): CHANGE_ADD_LRC_FILE = "Lưu timed lyrics tệp .lrc ('0'-Không,'1'-Có):" CHANGE_ADD_TYPE_FOLDER = "Thêm Loại-Thư mục, ví dụ Album/Video/Playlist('0'-Không,'1'-Có):" CHANGE_MULITHREAD_DOWNLOAD = "Multi thread download('0'-No,'1'-Yes):" + CHANGE_USE_DOWNLOAD_DELAY = "Use Download Delay('0'-No,'1'-Yes):" # {} are required in these strings AUTH_START_LOGIN = "Đang bắt đầu đăng nhập..." diff --git a/TIDALDL-PY/tidal_dl/printf.py b/TIDALDL-PY/tidal_dl/printf.py index cccdf39..00f0796 100644 --- a/TIDALDL-PY/tidal_dl/printf.py +++ b/TIDALDL-PY/tidal_dl/printf.py @@ -22,7 +22,7 @@ from tidal_dl.settings import * from tidal_dl.lang.language import * -VERSION = '2022.10.12.1' +VERSION = '2022.10.31.1' __LOGO__ = f''' /$$$$$$$$ /$$ /$$ /$$ /$$ /$$ |__ $$__/|__/ | $$ | $$ | $$| $$ @@ -40,6 +40,7 @@ __LOGO__ = f''' print_mutex = threading.Lock() + class Printf(object): @staticmethod @@ -106,7 +107,8 @@ class Printf(object): [LANG.select.SETTING_LANGUAGE, LANG.getLangName(data.language)], [LANG.select.SETTING_ADD_LRC_FILE, data.lyricFile], [LANG.select.SETTING_MULITHREAD_DOWNLOAD, data.multiThread], - [LANG.select.SETTING_APIKEY, f"[{data.apiKeyIndex}]" + apiKey.getItem(data.apiKeyIndex)['formats']] + [LANG.select.SETTING_APIKEY, f"[{data.apiKeyIndex}]" + apiKey.getItem(data.apiKeyIndex)['formats']], + [LANG.select.SETTING_DOWNLOAD_DELAY, data.downloadDelay], ]) print(tb) diff --git a/TIDALDL-PY/tidal_dl/settings.py b/TIDALDL-PY/tidal_dl/settings.py index 5292348..3582d84 100644 --- a/TIDALDL-PY/tidal_dl/settings.py +++ b/TIDALDL-PY/tidal_dl/settings.py @@ -28,6 +28,7 @@ class Settings(aigpy.model.ModelBase): saveAlbumInfo = False downloadVideos = True multiThread = False + downloadDelay = True downloadPath = "./download/" audioQuality = AudioQuality.Normal @@ -93,7 +94,6 @@ class Settings(aigpy.model.ModelBase): aigpy.file.write(self._path_, txt, 'w+') - class TokenSettings(aigpy.model.ModelBase): userid = None countryCode = None diff --git a/TIDALDL-PY/tidal_dl/tidal.py b/TIDALDL-PY/tidal_dl/tidal.py index 5f38c7d..cf99a75 100644 --- a/TIDALDL-PY/tidal_dl/tidal.py +++ b/TIDALDL-PY/tidal_dl/tidal.py @@ -17,6 +17,7 @@ import requests from tidal_dl.model import * from tidal_dl.enums import * +from tidal_dl.settings import * # SSL Warnings | retry number requests.packages.urllib3.disable_warnings() @@ -37,7 +38,7 @@ class TidalAPI(object): for index in range(0, 3): try: respond = requests.get(urlpre + path, headers=header, params=params) - if respond.url.find("playbackinfopostpaywall") != -1: + if respond.url.find("playbackinfopostpaywall") != -1 and SETTINGS.downloadDelay is not False: # random sleep between 0.5 and 5 seconds and print it sleep_time = random.randint(500, 5000) / 1000 print(f"Sleeping for {sleep_time} seconds, to mimic human behaviour and prevent too many requests error") @@ -334,6 +335,8 @@ class TidalAPI(object): return self.__get__(f'tracks/{str(id)}/contributors') def getCoverUrl(self, sid, width="320", height="320"): + if sid is None: + return "" return f"https://resources.tidal.com/images/{sid.replace('-', '/')}/{width}x{height}.jpg" def getCoverData(self, sid, width="320", height="320"): diff --git a/TIDALDL-PY/updatelog.md b/TIDALDL-PY/updatelog.md index 2e2728e..910907c 100644 --- a/TIDALDL-PY/updatelog.md +++ b/TIDALDL-PY/updatelog.md @@ -1,5 +1,10 @@ TYPE tidal-dl USE pip3 install tidal-dl --upgrade + +#### v2022-10-31 + +- [X] Add delay setting by @grzekru + #### v2022-08-29 - [X] Fix #931