diff --git a/TIDALDL-PY/tidal_dl/__init__.py b/TIDALDL-PY/tidal_dl/__init__.py index 3beae31..5f7c742 100644 --- a/TIDALDL-PY/tidal_dl/__init__.py +++ b/TIDALDL-PY/tidal_dl/__init__.py @@ -131,6 +131,7 @@ def test(): SETTINGS.downloadPath = "./download/" SETTINGS.usePlaylistFolder = True SETTINGS.albumFolderFormat = R"{ArtistName}/{Flag} {AlbumTitle} [{AlbumID}] [{AlbumYear}]" + SETTINGS.playlistFolderFormat = R"Playlist/{PlaylistName} [{PlaylistUUID}]" SETTINGS.trackFileFormat = R"{TrackNumber} - {ArtistName} - {TrackTitle}{ExplicitFlag}" SETTINGS.videoFileFormat = R"{VideoNumber} - {ArtistName} - {VideoTitle}{ExplicitFlag}" SETTINGS.multiThread = True diff --git a/TIDALDL-PY/tidal_dl/events.py b/TIDALDL-PY/tidal_dl/events.py index b65ddeb..1f90ef5 100644 --- a/TIDALDL-PY/tidal_dl/events.py +++ b/TIDALDL-PY/tidal_dl/events.py @@ -141,6 +141,10 @@ def changePathSettings(): LANG.select.CHANGE_ALBUM_FOLDER_FORMAT, SETTINGS.albumFolderFormat, SETTINGS.getDefaultPathFormat(Type.Album)) + SETTINGS.playlistFolderFormat = Printf.enterFormat( + LANG.select.CHANGE_PLAYLIST_FOLDER_FORMAT, + SETTINGS.playlistFolderFormat, + SETTINGS.getDefaultPathFormat(Type.Playlist)) SETTINGS.trackFileFormat = Printf.enterFormat( LANG.select.CHANGE_TRACK_FILE_FORMAT, SETTINGS.trackFileFormat, diff --git a/TIDALDL-PY/tidal_dl/lang/arabic.py b/TIDALDL-PY/tidal_dl/lang/arabic.py index a6a7b15..1b5c520 100644 --- a/TIDALDL-PY/tidal_dl/lang/arabic.py +++ b/TIDALDL-PY/tidal_dl/lang/arabic.py @@ -30,6 +30,7 @@ class LangArabic(object): SETTING_USE_PLAYLIST_FOLDER = "Use playlist folder" SETTING_MULITHREAD_DOWNLOAD = "Multi thread download" SETTING_ALBUM_FOLDER_FORMAT = "Album folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Show progress" @@ -38,7 +39,7 @@ class LangArabic(object): SETTING_ADD_LYRICS = "Add lyrics" SETTING_LYRICS_SERVER_PROXY = "Lyrics server proxy" SETTING_PATH = "Settings path" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" + SETTING_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -78,14 +79,15 @@ class LangArabic(object): CHANGE_ALBUMID_BEFORE_FOLDER = "اضف رقم التتبع قبل اسم مجلد الالبوم('0'-No,'1'-Yes):" CHANGE_SAVE_COVERS = "حفظ صورة الالبوم('0'-No,'1'-Yes):" CHANGE_LANGUAGE = "اختر لغة" - CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):" - CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" + CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0'-not modify,'default'-to set default):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" + CHANGE_TRACK_FILE_FORMAT = "Track file format('0'-not modify,'default'-to set default):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Show progress('0'-No,'1'-Yes):" CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/chinese.py b/TIDALDL-PY/tidal_dl/lang/chinese.py index 075b2da..f6e2a37 100644 --- a/TIDALDL-PY/tidal_dl/lang/chinese.py +++ b/TIDALDL-PY/tidal_dl/lang/chinese.py @@ -30,6 +30,7 @@ class LangChinese(object): SETTING_USE_PLAYLIST_FOLDER = "将歌单下载到歌单目录" SETTING_MULITHREAD_DOWNLOAD = "多线程下载" SETTING_ALBUM_FOLDER_FORMAT = "专辑目录格式" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "歌曲文件名格式" SETTING_VIDEO_FILE_FORMAT = "视频文件格式" SETTING_SHOW_PROGRESS = "显示进度条" @@ -37,8 +38,8 @@ class LangChinese(object): SETTING_SAVE_ALBUMINFO = "保存AlbumInfo.txt" SETTING_ADD_LYRICS = "添加歌词" SETTING_LYRICS_SERVER_PROXY = "歌词服务器代理" + SETTING_ADD_LRC_FILE = "保存歌词文件 (.lrc file)" SETTING_PATH = "配置文件目录" - SETTINGS_ADD_LRC_FILE = "保存歌词文件 (.lrc file)" SETTING_APIKEY = "APIKey支持" SETTING_ADD_TYPE_FOLDER = "添加类型文件夹" @@ -79,6 +80,7 @@ class LangChinese(object): CHANGE_SAVE_COVERS = "保存封面('0'-不,'1'-是):" CHANGE_LANGUAGE = "选择语言" CHANGE_ALBUM_FOLDER_FORMAT = "专辑目录格式('0' 不修改):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "歌曲文件名格式('0' 不修改):" CHANGE_VIDEO_FILE_FORMAT = "视频文件名格式('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "显示进度条('0'-不,'1'-是):" diff --git a/TIDALDL-PY/tidal_dl/lang/croatian.py b/TIDALDL-PY/tidal_dl/lang/croatian.py index f0407a5..4cb60d7 100644 --- a/TIDALDL-PY/tidal_dl/lang/croatian.py +++ b/TIDALDL-PY/tidal_dl/lang/croatian.py @@ -30,6 +30,7 @@ class LangCroatian(object): SETTING_USE_PLAYLIST_FOLDER = "Use playlist folder" SETTING_MULITHREAD_DOWNLOAD = "Multi thread download" SETTING_ALBUM_FOLDER_FORMAT = "Album folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Show progress" @@ -37,8 +38,8 @@ class LangCroatian(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" 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" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -78,14 +79,15 @@ class LangCroatian(object): CHANGE_ALBUMID_BEFORE_FOLDER = "Dodaj ID oznaku prije imena albuma u datoteci('0'-Ne,'1'-Da):" CHANGE_SAVE_COVERS = "Spremi ilustracije albuma('0'-Ne,'1'-Da):" CHANGE_LANGUAGE = "Odaberi jezik" - CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):" - CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" + CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0'-not modify,'default'-to set default):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" + CHANGE_TRACK_FILE_FORMAT = "Track file format('0'-not modify,'default'-to set default):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Show progress('0'-No,'1'-Yes):" CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/czech.py b/TIDALDL-PY/tidal_dl/lang/czech.py index 8b672e2..057368b 100644 --- a/TIDALDL-PY/tidal_dl/lang/czech.py +++ b/TIDALDL-PY/tidal_dl/lang/czech.py @@ -30,6 +30,7 @@ class LangCzech(object): SETTING_USE_PLAYLIST_FOLDER = "Používat složku playlistu" SETTING_MULITHREAD_DOWNLOAD = "Stahování více vlákny" SETTING_ALBUM_FOLDER_FORMAT = "Formát názvu složky alba" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Formát názvu souboru skladby" SETTING_VIDEO_FILE_FORMAT = "Formát názvu souboru videa" SETTING_SHOW_PROGRESS = "Zobrazit indikátor stavu stahování" @@ -37,7 +38,7 @@ class LangCzech(object): SETTING_SAVE_ALBUMINFO = "Uložit soubor AlbumInfo.txt" SETTING_ADD_LYRICS = "Přidat texty skladeb" SETTING_LYRICS_SERVER_PROXY = "Server proxy pro texty skladeb" - SETTINGS_ADD_LRC_FILE = "Uložit slova skladby s časováním (soubor .lrc)" + SETTING_ADD_LRC_FILE = "Uložit slova skladby s časováním (soubor .lrc)" SETTING_PATH = "Cesta k souboru s nastavením" SETTING_APIKEY = "APIKey podporuje" SETTING_ADD_TYPE_FOLDER = "Složky dle typu obsahu" @@ -79,6 +80,7 @@ class LangCzech(object): CHANGE_SAVE_COVERS = "Uložit obaly alb ('0'-Ne,'1'-Ano):" CHANGE_LANGUAGE = "Zvolit jazyk" CHANGE_ALBUM_FOLDER_FORMAT = "Formát názvu složky alba ('0' beze změny):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/danish.py b/TIDALDL-PY/tidal_dl/lang/danish.py index 15d2835..81715d8 100644 --- a/TIDALDL-PY/tidal_dl/lang/danish.py +++ b/TIDALDL-PY/tidal_dl/lang/danish.py @@ -30,6 +30,7 @@ class LangDanish(object): SETTING_USE_PLAYLIST_FOLDER = "Brug afspilningsmappen" SETTING_MULITHREAD_DOWNLOAD = "Flertråede download" SETTING_ALBUM_FOLDER_FORMAT = "Albummappens format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Spillelistemappens format" SETTING_TRACK_FILE_FORMAT = "Musiknummerets filformat" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Vis fremskridt" @@ -37,8 +38,8 @@ class LangDanish(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" 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" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,13 +80,14 @@ class LangDanish(object): CHANGE_SAVE_COVERS = "Gem omslag('0'-Nej,'1'-Ja):" CHANGE_LANGUAGE = "Vælg sprog" CHANGE_ALBUM_FOLDER_FORMAT = "Albummappeformat('0' Ændrer ikke, 'default' for at indstille som standard):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Spillelistemappeformat('0' Ændrer ikke, 'default' for at indstille som standard):" CHANGE_TRACK_FILE_FORMAT = "Musiknummerets filformat('0' Ændrer ikke, 'default' for at indstille som standard):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Vis fremskridt('0'-Nej,'1'-Ja):" CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/dutch.py b/TIDALDL-PY/tidal_dl/lang/dutch.py index 1c3ebd4..84c7c67 100644 --- a/TIDALDL-PY/tidal_dl/lang/dutch.py +++ b/TIDALDL-PY/tidal_dl/lang/dutch.py @@ -30,6 +30,7 @@ class LangDutch(object): SETTING_USE_PLAYLIST_FOLDER = "Afspeellijst gebruiken" SETTING_MULITHREAD_DOWNLOAD = "Downloaden met meerdere threads" SETTING_ALBUM_FOLDER_FORMAT = "Indeling albummap" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Bestandsindeling bijhouden" SETTING_VIDEO_FILE_FORMAT = "Videobestandsindeling" SETTING_SHOW_PROGRESS = "Toon voortgang" @@ -37,7 +38,7 @@ class LangDutch(object): SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt opslaan" SETTING_ADD_LYRICS = "Songtekst toevoegen" SETTING_LYRICS_SERVER_PROXY = "Tekst server proxy" - SETTINGS_ADD_LRC_FILE = "Getimede songteksten opslaan (.lrc-bestand)" + SETTING_ADD_LRC_FILE = "Getimede songteksten opslaan (.lrc-bestand)" SETTING_PATH = "Instellingen pad" SETTING_APIKEY = "APIKey-ondersteuning" SETTING_ADD_TYPE_FOLDER = "Typemap toevoegen" @@ -78,9 +79,10 @@ class LangDutch(object): CHANGE_ALBUMID_BEFORE_FOLDER = "ID toevoegen voor albummap ('0'-Nee,'1'-Ja):" CHANGE_SAVE_COVERS = "Covers opslaan('0'-Nee,'1'-Ja):" CHANGE_LANGUAGE = "Selecteer taal" - CHANGE_ALBUM_FOLDER_FORMAT = "Albummapindeling ('0'-niet wijzigen,'standaard'-om standaard in te stellen):" - CHANGE_TRACK_FILE_FORMAT = "Bestandsformaat bijhouden ('0'-niet wijzigen,'standaard'-om standaard in te stellen):" - CHANGE_VIDEO_FILE_FORMAT = "Videobestandsindeling('0'-niet wijzigen,'standaard'-om standaard in te stellen):" + CHANGE_ALBUM_FOLDER_FORMAT = "Albummapindeling ('0'-niet wijzigen,'default'-om standaard in te stellen):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Afspeellijstmapindeling format('0'-niet wijzigen,'default'-om standaard in te stellen):" + CHANGE_TRACK_FILE_FORMAT = "Bestandsformaat bijhouden ('0'-niet wijzigen,'default'-om standaard in te stellen):" + CHANGE_VIDEO_FILE_FORMAT = "Videobestandsindeling('0'-niet wijzigen,'default'-om standaard in te stellen):" CHANGE_SHOW_PROGRESS = "Voortgang weergeven('0'-Nee,'1'-Ja):" CHANGE_SHOW_TRACKINFO = "Toon trackinfo('0'-Nee,'1'-Ja):" CHANGE_SAVE_ALBUM_INFO = "Bewaar AlbumInfo.txt('0'-Nee,'1'-Ja):" diff --git a/TIDALDL-PY/tidal_dl/lang/english.py b/TIDALDL-PY/tidal_dl/lang/english.py index e1f934d..522daa2 100644 --- a/TIDALDL-PY/tidal_dl/lang/english.py +++ b/TIDALDL-PY/tidal_dl/lang/english.py @@ -30,6 +30,7 @@ class LangEnglish(object): SETTING_USE_PLAYLIST_FOLDER = "Use playlist folder" SETTING_MULITHREAD_DOWNLOAD = "Multi thread download" SETTING_ALBUM_FOLDER_FORMAT = "Album folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Show progress" @@ -37,7 +38,7 @@ class LangEnglish(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" SETTING_ADD_LYRICS = "Add lyrics" SETTING_LYRICS_SERVER_PROXY = "Lyrics server proxy" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" + SETTING_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_PATH = "Settings path" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,6 +80,7 @@ class LangEnglish(object): CHANGE_SAVE_COVERS = "Save covers('0'-No,'1'-Yes):" CHANGE_LANGUAGE = "Select language" CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0'-not modify,'default'-to set default):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track file format('0'-not modify,'default'-to set default):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Show progress('0'-No,'1'-Yes):" diff --git a/TIDALDL-PY/tidal_dl/lang/filipino.py b/TIDALDL-PY/tidal_dl/lang/filipino.py index d0c97bd..e40a4de 100644 --- a/TIDALDL-PY/tidal_dl/lang/filipino.py +++ b/TIDALDL-PY/tidal_dl/lang/filipino.py @@ -30,6 +30,7 @@ class LangFilipino(object): SETTING_USE_PLAYLIST_FOLDER = "Use playlist folder" SETTING_MULITHREAD_DOWNLOAD = "Multi thread download" SETTING_ALBUM_FOLDER_FORMAT = "Album folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Show progress" @@ -37,8 +38,8 @@ class LangFilipino(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" 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" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -78,14 +79,15 @@ class LangFilipino(object): CHANGE_ALBUMID_BEFORE_FOLDER = "Lagyan ng id bago ang album folder('0'-Hindi,'1'-Oo):" CHANGE_SAVE_COVERS = "I-save ang mga covers('0'-Hindi,'1'-Oo):" CHANGE_LANGUAGE = "Pumili ng lenggwahe" - CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):" - CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" + CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify,'default'-to set default):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" + CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify,'default'-to set default):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Show progress('0'-No,'1'-Yes):" CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/french.py b/TIDALDL-PY/tidal_dl/lang/french.py index 0481d1e..88c1291 100644 --- a/TIDALDL-PY/tidal_dl/lang/french.py +++ b/TIDALDL-PY/tidal_dl/lang/french.py @@ -30,6 +30,7 @@ class LangFrench(object): SETTING_USE_PLAYLIST_FOLDER = "Utiliser dossier de playlist" SETTING_MULITHREAD_DOWNLOAD = "Téléchargement multithread" SETTING_ALBUM_FOLDER_FORMAT = "Format du dossier d'album" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Format du fichier de tracklist" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Afficher la Progression" @@ -37,8 +38,8 @@ class LangFrench(object): SETTING_SAVE_ALBUMINFO = "Enregistrer AlbumInfo.txt" SETTING_ADD_LYRICS = "Inclure les paroles" SETTING_LYRICS_SERVER_PROXY = "Proxy du serveur de paroles" + SETTING_ADD_LRC_FILE = "Enregistrer les paroles synchronisées (fichier .lrc)" SETTING_PATH = "Emplacement des paramètres" - SETTINGS_ADD_LRC_FILE = "Enregistrer les paroles synchronisées (fichier .lrc)" SETTING_APIKEY = "Prise en charge de la clé API" SETTING_ADD_TYPE_FOLDER = "Ajouter un dossier de type" @@ -79,13 +80,14 @@ class LangFrench(object): CHANGE_SAVE_COVERS = "Sauvegarder les couvertures('0'-Non,'1'-Oui):" CHANGE_LANGUAGE = "Sélectionnez une langue" CHANGE_ALBUM_FOLDER_FORMAT = "Format du dossier d'album('0' ne pas modifier):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Format du fichier de tracklist('0' ne pas modifier):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Afficher la progression('0'-Non,'1'-Oui):" CHANGE_SHOW_TRACKINFO = "Afficher les information de la piste ('0'-Non,'1'-Oui):" CHANGE_SAVE_ALBUM_INFO = "Enregistrer AlbumInfo.txt('0'-Non,'1'-Oui):" CHANGE_ADD_LYRICS = "Ajouter les paroles ('0'-Non,'1'-Oui):" - CHANGE_LYRICS_SERVER_PROXY = "Proxy du serveur de paroles('0' not modify):" + CHANGE_LYRICS_SERVER_PROXY = "Proxy du serveur de paroles('0'-not modify):" 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/german.py b/TIDALDL-PY/tidal_dl/lang/german.py index 560925b..b2b1360 100644 --- a/TIDALDL-PY/tidal_dl/lang/german.py +++ b/TIDALDL-PY/tidal_dl/lang/german.py @@ -30,6 +30,7 @@ class LangGerman(object): SETTING_USE_PLAYLIST_FOLDER = "Playlist-Ordner verwenden" SETTING_MULITHREAD_DOWNLOAD = "Multi-Thread-Download" SETTING_ALBUM_FOLDER_FORMAT = "Album-Ordnerformat" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track-Dateiformat" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Fortschritt anzeigen" @@ -37,8 +38,8 @@ class LangGerman(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" 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" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,13 +80,14 @@ class LangGerman(object): 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_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/hungarian.py b/TIDALDL-PY/tidal_dl/lang/hungarian.py index 75e872d..be308cb 100644 --- a/TIDALDL-PY/tidal_dl/lang/hungarian.py +++ b/TIDALDL-PY/tidal_dl/lang/hungarian.py @@ -30,6 +30,7 @@ class LangHungarian(object): SETTING_USE_PLAYLIST_FOLDER = "Lejátszási lista mappa használata" SETTING_MULITHREAD_DOWNLOAD = "Többszálú letöltés" SETTING_ALBUM_FOLDER_FORMAT = "Album mappa formátum" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track fájlformátum" SETTING_VIDEO_FILE_FORMAT = "Videó fájlformátum" SETTING_SHOW_PROGRESS = "Haladás megjelenítése" @@ -37,8 +38,8 @@ class LangHungarian(object): SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt mentése" SETTING_ADD_LYRICS = "Dalszöveg hozzáadása" SETTING_LYRICS_SERVER_PROXY = "Dalszöveg kiszolgáló proxy" + SETTING_ADD_LRC_FILE = "Dalszövegek mentése (.lrc fájl)" SETTING_PATH = "Beállítási útvonal" - SETTINGS_ADD_LRC_FILE = "Dalszövegek mentése (.lrc fájl)" SETTING_APIKEY = "APIKey támogatás" SETTING_ADD_TYPE_FOLDER = "Mappa típus hozzáadása" @@ -79,6 +80,7 @@ class LangHungarian(object): CHANGE_SAVE_COVERS = "Borító mentése('0'-Nem, '1'-Igen):" CHANGE_LANGUAGE = "Nyelv kiválasztása" CHANGE_ALBUM_FOLDER_FORMAT = "Album mappa formátum('0' nincs módosítás,'default' az alapértelmezett beállításhoz):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track fájl neve('0' nincs módosítás,'default' az alapértelmezett beállításhoz):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-nincs módosítás,'default' az alapértelmezett beállításhoz):" CHANGE_SHOW_PROGRESS = "Haladás megjelenítése('0'-Nem, '1'-Igen):" diff --git a/TIDALDL-PY/tidal_dl/lang/italian.py b/TIDALDL-PY/tidal_dl/lang/italian.py index 1df9439..93722bf 100644 --- a/TIDALDL-PY/tidal_dl/lang/italian.py +++ b/TIDALDL-PY/tidal_dl/lang/italian.py @@ -30,6 +30,7 @@ class LangItalian(object): SETTING_USE_PLAYLIST_FOLDER = "Use playlist folder" SETTING_MULITHREAD_DOWNLOAD = "Multi thread download" SETTING_ALBUM_FOLDER_FORMAT = "Album folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Show progress" @@ -37,8 +38,8 @@ class LangItalian(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" 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" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -78,14 +79,15 @@ class LangItalian(object): CHANGE_ALBUMID_BEFORE_FOLDER = "Aggiungere ID prima del nome della cartella per l'album ('0'-No,'1'-Sì):" CHANGE_SAVE_COVERS = "Salve copertine ('0'-No,'1'-Sì):" CHANGE_LANGUAGE = "Selezionare lingua" - CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):" - CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" + CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify,'default'-to set default):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" + CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify,'default'-to set default):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Show progress('0'-No,'1'-Yes):" CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/japanese.py b/TIDALDL-PY/tidal_dl/lang/japanese.py index 8855d6f..8a7fbb5 100644 --- a/TIDALDL-PY/tidal_dl/lang/japanese.py +++ b/TIDALDL-PY/tidal_dl/lang/japanese.py @@ -30,6 +30,7 @@ class LangJapanese(object): SETTING_USE_PLAYLIST_FOLDER = "Use playlist folder" SETTING_MULITHREAD_DOWNLOAD = "Multi thread download" SETTING_ALBUM_FOLDER_FORMAT = "Album folder format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Show progress" @@ -37,7 +38,7 @@ class LangJapanese(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" SETTING_ADD_LYRICS = "歌詞を追加" SETTING_LYRICS_SERVER_PROXY = "Lyrics server proxy" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" + SETTING_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_PATH = "設定パス" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,6 +80,7 @@ class LangJapanese(object): CHANGE_SAVE_COVERS = "カバーを保存('0'-いいえ,'1'-はい):" CHANGE_LANGUAGE = "言語を選択する" CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0'-変更しない,'default'-デフォルトを設定するには):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track file format('0'-変更しない,'default'-デフォルトを設定するには):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Show progress('0'-いいえ,'1'-はい):" diff --git a/TIDALDL-PY/tidal_dl/lang/korean.py b/TIDALDL-PY/tidal_dl/lang/korean.py index 4fca27e..7054e90 100644 --- a/TIDALDL-PY/tidal_dl/lang/korean.py +++ b/TIDALDL-PY/tidal_dl/lang/korean.py @@ -30,6 +30,7 @@ class LangKorean(object): SETTING_USE_PLAYLIST_FOLDER = "재생목록 폴더 사용" SETTING_MULITHREAD_DOWNLOAD = "다중 스레드 다운로드" SETTING_ALBUM_FOLDER_FORMAT = "앨범 폴더 형식" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "트랙 파일 형식" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "진행 상태 표시" @@ -37,7 +38,7 @@ class LangKorean(object): SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt 저장" SETTING_ADD_LYRICS = "가사 추가" SETTING_LYRICS_SERVER_PROXY = "가사 서버 프록시" - SETTINGS_ADD_LRC_FILE = "timed 가사 저장 (.lrc 파일)" + SETTING_ADD_LRC_FILE = "timed 가사 저장 (.lrc 파일)" SETTING_PATH = "설정 경로" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,6 +80,7 @@ class LangKorean(object): CHANGE_SAVE_COVERS = "커버 저장('0'-아니요,'1'-예):" CHANGE_LANGUAGE = "언어 선택" CHANGE_ALBUM_FOLDER_FORMAT = "앨범 폴더 형식('0'-변경 안 함,'default'-기본 설정):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "트랙 파일 형식('0'-변경 안 함,'default'-기본 설정):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "진행 상태 표시('0'-아니요,'1'-예):" diff --git a/TIDALDL-PY/tidal_dl/lang/language.py b/TIDALDL-PY/tidal_dl/lang/language.py index 9fc1efd..aff7e6b 100644 --- a/TIDALDL-PY/tidal_dl/lang/language.py +++ b/TIDALDL-PY/tidal_dl/lang/language.py @@ -21,6 +21,7 @@ from tidal_dl.lang.french import LangFrench from tidal_dl.lang.german import LangGerman from tidal_dl.lang.hungarian import LangHungarian from tidal_dl.lang.italian import LangItalian +from tidal_dl.lang.norwegian import LangNorwegian from tidal_dl.lang.polish import LangPolish from tidal_dl.lang.portuguese import LangPortuguese from tidal_dl.lang.russian import LangRussian @@ -53,6 +54,7 @@ _ALL_LANGUAGE_ = [ ['Japanese', LangJapanese()], ['Dutch', LangDutch()], ['Polish', LangPolish()], + ['Norwegian', LangNorwegian()], ] class Language(object): diff --git a/TIDALDL-PY/tidal_dl/lang/norwegian.py b/TIDALDL-PY/tidal_dl/lang/norwegian.py new file mode 100644 index 0000000..b987ee7 --- /dev/null +++ b/TIDALDL-PY/tidal_dl/lang/norwegian.py @@ -0,0 +1,122 @@ +#!/usr/bin/env python +# -*- encoding: utf-8 -*- +''' +@File : norwegian.py +@Time : 2021/03/25 +@Author : roberts91 +@Version : 1.0 +@Contact : +@Desc : +''' + + +class LangNorwegian(object): + SETTING = "INNSTILLINGER" + VALUE = "Verdi" + SETTING_DOWNLOAD_PATH = "Nedlastingssti" + SETTING_ONLY_M4A = "Konverter MP4 til M4A" + SETTING_ADD_EXPLICIT_TAG = "Legg til eksplisitt tag" + SETTING_ADD_HYPHEN = "Legg til bindestrek" + SETTING_ADD_YEAR = "Legg til år før albummappenavn" + SETTING_USE_TRACK_NUM = "Legg til spornummer" + SETTING_AUDIO_QUALITY = "Lydkvalitet" + SETTING_VIDEO_QUALITY = "Videokvalitet" + SETTING_CHECK_EXIST = "Kontroller eksistens" + SETTING_ARTIST_BEFORE_TITLE = "Artistnavn før spornummer" + SETTING_ALBUMID_BEFORE_FOLDER = "Id før album mappe" + SETTING_INCLUDE_EP = "Inkluder single&EP" + SETTING_SAVE_COVERS = "Lagre cover" + SETTING_LANGUAGE = "Språk" + SETTING_USE_PLAYLIST_FOLDER = "Bruk spillelistemappe" + SETTING_MULITHREAD_DOWNLOAD = "Last ned flere samtidig" + SETTING_ALBUM_FOLDER_FORMAT = "Albummappens format" + SETTING_PLAYLIST_FOLDER_FORMAT = "Spillelistemappens format" + SETTING_TRACK_FILE_FORMAT = "Spor filformat" + SETTING_VIDEO_FILE_FORMAT = "Video filformat" + SETTING_SHOW_PROGRESS = "Vis fremgang" + SETTING_SHOW_TRACKINFO = "Vis sporinformasjon" + SETTING_SAVE_ALBUMINFO = "Lagre AlbumInfo.txt" + SETTING_ADD_LYRICS = "Legg til sangtekst" + SETTING_LYRICS_SERVER_PROXY = "Sangtekst server proxy" + SETTING_ADD_LRC_FILE = "Lagre sangtekster med tidsreferanser (.lrc fil)" + SETTING_PATH = "Innstillinger sti" + SETTING_APIKEY = "API-nøkkel støtte" + SETTING_ADD_TYPE_FOLDER = "Legg til Type-Folder" + + CHOICE = "VALG" + FUNCTION = "FUNKSJON" + CHOICE_ENTER = "Tast inn" + CHOICE_ENTER_URLID = "Tast inn 'Url/ID':" + CHOICE_EXIT = "Avslutt" + CHOICE_LOGIN = "Kontroller AccessToken" + CHOICE_SETTINGS = "Innstillinger" + CHOICE_SET_ACCESS_TOKEN = "Sett AccessToken" + CHOICE_DOWNLOAD_BY_URL = "Last ned via URL eller ID" + CHOICE_LOGOUT = "Logg ut" + CHOICE_APIKEY = "Velg APIKey" + + PRINT_ERR = "[FEIL]" + PRINT_INFO = "[INFO]" + PRINT_SUCCESS = "[SUCCES]" + + PRINT_ENTER_CHOICE = "Tast inn valg:" + PRINT_LATEST_VERSION = "Seneste versjon:" + # PRINT_USERNAME = "username:" + # PRINT_PASSWORD = "password:" + + CHANGE_START_SETTINGS = "Start innstillinger('0'-Tilbake,'1'-Ja):" + CHANGE_DOWNLOAD_PATH = "Nedlastingssti('0'-ikke endre):" + CHANGE_AUDIO_QUALITY = "Lydkvalitet('0'-Normal,'1'-Høy,'2'-HiFi,'3'-Master):" + CHANGE_VIDEO_QUALITY = "Videokvalitet(1080, 720, 480, 360):" + CHANGE_ONLYM4A = "Konverter MP4 til M4A('0'-Nei,'1'-Ja):" + CHANGE_ADD_EXPLICIT_TAG = "Legg til eksplisitt tag i filnavn('0'-Nei,'1'-Ja):" + CHANGE_ADD_HYPHEN = "Bruk bindestreker i stedet for mellomrom i filnavn('0'-Nei,'1'-Ja):" + CHANGE_ADD_YEAR = "Legg til år i albumnavn('0'-Nei,'1'-Ja):" + CHANGE_USE_TRACK_NUM = "Legg til spornummer før filnavn('0'-Nei,'1'-Ja):" + CHANGE_CHECK_EXIST = "Kontrollér filens eksistens før nedlasting('0'-Nei,'1'-Ja):" + CHANGE_ARTIST_BEFORE_TITLE = "Legg til artistnavn før sportittel('0'-Nei,'1'-Ja):" + CHANGE_INCLUDE_EP = "Inkluder singler og EP'er når man laster ned en artists album('0'-Nei,'1'-Ja):" + CHANGE_ALBUMID_BEFORE_FOLDER = "Legg til ID før albummappe('0'-Nei,'1'-Ja):" + CHANGE_SAVE_COVERS = "Lagre cover('0'-Nei,'1'-Ja):" + CHANGE_LANGUAGE = "Velg språk" + CHANGE_ALBUM_FOLDER_FORMAT = "Albummappe format('0'-ikke endre, 'default'-for å sette til standardverdi):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Spillelistemappe format('0'-ikke endre, 'default'-for å sette til standardverdi):" + CHANGE_TRACK_FILE_FORMAT = "Sportittel filformat('0'-ikke endre, 'default'-for å sette til standardverdi):" + CHANGE_VIDEO_FILE_FORMAT = "Videofil format('0'-ikke endre, 'default'-for å sette til standardverdi):" + CHANGE_SHOW_PROGRESS = "Vis fremgang('0'-Nei,'1'-Ja):" + CHANGE_SHOW_TRACKINFO = "Vis sporinformasjon('0'-Nei,'1'-Ja):" + CHANGE_SAVE_ALBUM_INFO = "Lagre AlbumInfo.txt('0'-Nei,'1'-Ja):" + CHANGE_ADD_LYRICS = "Legg til sangtekst('0'-Nei,'1'-Ja):" + CHANGE_LYRICS_SERVER_PROXY = "Sangtekst server proxy('0'-not modify):" + 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):" + + # {} are required in these strings + AUTH_START_LOGIN = "Starter login-prosessen." + AUTH_LOGIN_CODE = "Din login kode er {}" + AUTH_NEXT_STEP = "Gå til {} innen de neste {} for å avslutte setup." + AUTH_WAITING = "Venter på godkjennelse..." + AUTH_TIMEOUT = "Tiden gikk ut." + + MSG_VALID_ACCESSTOKEN = "AccessToken tilgjengelig for {}." + MSG_INVALID_ACCESSTOKEN = "AccessToken utløpt. Forøsker å oppdatere" + MSG_PATH_ERR = "Sti feil!" + MSG_INPUT_ERR = "Inntastningsfeol!" + + MODEL_ALBUM_PROPERTY = "ALBUM-PROPERTY" + MODEL_TRACK_PROPERTY = "TRACK-PROPERTY" + MODEL_VIDEO_PROPERTY = "VIDEO-PROPERTY" + MODEL_ARTIST_PROPERTY = "ARTIST-PROPERTY" + MODEL_PLAYLIST_PROPERTY = "PLAYLIST-PROPERTY" + + MODEL_TITLE = 'Tittel' + MODEL_TRACK_NUMBER = 'Spornummer' + MODEL_VIDEO_NUMBER = 'Videonummer' + MODEL_RELEASE_DATE = 'Utgivelsesdato' + MODEL_VERSION = 'Versjon' + MODEL_EXPLICIT = 'Eksplisitt' + MODEL_ALBUM = 'Album' + MODEL_ID = 'ID' + MODEL_NAME = 'Navn' + MODEL_TYPE = 'Type' diff --git a/TIDALDL-PY/tidal_dl/lang/polish.py b/TIDALDL-PY/tidal_dl/lang/polish.py index d2c6d2c..5117645 100644 --- a/TIDALDL-PY/tidal_dl/lang/polish.py +++ b/TIDALDL-PY/tidal_dl/lang/polish.py @@ -30,6 +30,7 @@ class LangPolish(object): SETTING_USE_PLAYLIST_FOLDER = "Użyj folder playlisty" SETTING_MULITHREAD_DOWNLOAD = "Pobieranie wielowątkowe" SETTING_ALBUM_FOLDER_FORMAT = "Format folderu albumu" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Format pliku utworu" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Pokaż postęp" @@ -37,7 +38,7 @@ class LangPolish(object): SETTING_SAVE_ALBUMINFO = "Zapisz AlbumInfo.txt" SETTING_ADD_LYRICS = "Dodaj teksty utworów" SETTING_LYRICS_SERVER_PROXY = "Serwer proxy dla tekstów" - SETTINGS_ADD_LRC_FILE = "Zapisz czasowe teksty utworów (plik .lrc)" + SETTING_ADD_LRC_FILE = "Zapisz czasowe teksty utworów (plik .lrc)" SETTING_PATH = "Ścieżka ustawień" SETTING_APIKEY = "Obsługa APIKey" SETTING_ADD_TYPE_FOLDER = "Dodaj folder typu" @@ -79,6 +80,7 @@ class LangPolish(object): CHANGE_SAVE_COVERS = "Zapisz okładki('0'-Nie,'1'-Tak):" CHANGE_LANGUAGE = "Wybierz język" CHANGE_ALBUM_FOLDER_FORMAT = "Format folderu albumu('0'-nie modyfikuj,'default'-by ustawić domyślny):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Format pliku utworu('0'-nie modyfikuj,'default'-by ustawić domyślny):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Pokaż postęp('0'-Nie,'1'-Tak):" diff --git a/TIDALDL-PY/tidal_dl/lang/portuguese.py b/TIDALDL-PY/tidal_dl/lang/portuguese.py index 95570b5..41b2758 100644 --- a/TIDALDL-PY/tidal_dl/lang/portuguese.py +++ b/TIDALDL-PY/tidal_dl/lang/portuguese.py @@ -30,6 +30,7 @@ class LangPortuguese(object): SETTING_USE_PLAYLIST_FOLDER = "Usar pasta de lista de reprodução" SETTING_MULITHREAD_DOWNLOAD = "Download de vários tópicos" SETTING_ALBUM_FOLDER_FORMAT = "Formato da pasta do álbum" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Track file format" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Mostrar progresso" @@ -37,8 +38,8 @@ class LangPortuguese(object): SETTING_SAVE_ALBUMINFO = "Salvar AlbumInfo.txt" SETTING_ADD_LYRICS = "Adicionar Letra da Música" SETTING_LYRICS_SERVER_PROXY = "Proxy do servidor de letras" + SETTING_ADD_LRC_FILE = "Salvar letras cronometradas (.lrc file)" SETTING_PATH = "Settings path" - SETTINGS_ADD_LRC_FILE = "Salvar letras cronometradas (.lrc file)" SETTING_APIKEY = "Suporte APIKey" SETTING_ADD_TYPE_FOLDER = "Adicionar tipo de pasta" @@ -79,6 +80,7 @@ class LangPortuguese(object): CHANGE_SAVE_COVERS = "Salvar Capas('0'-Não,'1'-Sim):" CHANGE_LANGUAGE = "Selecionar idioma" CHANGE_ALBUM_FOLDER_FORMAT = "Formato da pasta do álbum ('0' não modificar)" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Formato do arquivo de trilha ('0' não modificar):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Mostrar progresso('0'-Não,'1'-Sim):" diff --git a/TIDALDL-PY/tidal_dl/lang/russian.py b/TIDALDL-PY/tidal_dl/lang/russian.py index a273639..2549b3f 100644 --- a/TIDALDL-PY/tidal_dl/lang/russian.py +++ b/TIDALDL-PY/tidal_dl/lang/russian.py @@ -30,6 +30,7 @@ class LangRussian(object): SETTING_USE_PLAYLIST_FOLDER = "Плейлисты в отдельную папку" SETTING_MULITHREAD_DOWNLOAD = "Многопоточная загрузка" SETTING_ALBUM_FOLDER_FORMAT = "Маска имени альбома" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Маска имени трека" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Показывать процесс загрузки" @@ -37,8 +38,8 @@ class LangRussian(object): SETTING_SAVE_ALBUMINFO = "Сохранять AlbumInfo.txt" SETTING_ADD_LYRICS = "Добавлять текст песень" SETTING_LYRICS_SERVER_PROXY = "Прокси сервер для текстов песен" + SETTING_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_PATH = "Путь для настроек" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,6 +80,7 @@ class LangRussian(object): CHANGE_SAVE_COVERS = "Сохранять обложки('0'-Нет,'1'-Да):" CHANGE_LANGUAGE = "Выбрать язык" CHANGE_ALBUM_FOLDER_FORMAT = "Маска имени альбома('0' не менять):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Маска имени трека('0' не менять):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Показывать процесс загрузки('0'-Нет,'1'-Да):" diff --git a/TIDALDL-PY/tidal_dl/lang/spanish.py b/TIDALDL-PY/tidal_dl/lang/spanish.py index 57d27e8..1ef737f 100644 --- a/TIDALDL-PY/tidal_dl/lang/spanish.py +++ b/TIDALDL-PY/tidal_dl/lang/spanish.py @@ -30,6 +30,7 @@ class LangSpanish(object): SETTING_USE_PLAYLIST_FOLDER = "Usar directorio de la lista de reproducción" SETTING_MULITHREAD_DOWNLOAD = "Descarga Multi-hilo" SETTING_ALBUM_FOLDER_FORMAT = "Formato del nombre de carpeta del álbum" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Formato del nombre de archivo de la pista" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Mostrar progreso" @@ -37,8 +38,8 @@ class LangSpanish(object): SETTING_SAVE_ALBUMINFO = "Guardar AlbumInfo.txt" SETTING_ADD_LYRICS = "Añadir letras" SETTING_LYRICS_SERVER_PROXY = "Proxy del servidor de letras" + SETTING_ADD_LRC_FILE = "Añadir letras cronometradas (archivo .lrc)" SETTING_PATH = "Ruta de ajustes" - SETTINGS_ADD_LRC_FILE = "Añadir letras cronometradas (archivo .lrc)" SETTING_APIKEY = "Soporte de la APIKey" SETTING_ADD_TYPE_FOLDER = "Añadir tipo de carpeta" @@ -79,6 +80,7 @@ class LangSpanish(object): CHANGE_SAVE_COVERS = "¿Guardar carátulas?('0'-No,'1'-Sí):" CHANGE_LANGUAGE = "Seleccione el idioma" CHANGE_ALBUM_FOLDER_FORMAT = "Formato del nombre de carpeta del álbum ('0' No modificar):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Formato del nombre de archivo de la pista ('0' No modificar):" CHANGE_VIDEO_FILE_FORMAT = "Formato del archivo de video('0'-No modificar,'default'-por defecto):" CHANGE_SHOW_PROGRESS = "¿Mostrar progreso? ('0'-No,'1'-Sí):" diff --git a/TIDALDL-PY/tidal_dl/lang/turkish.py b/TIDALDL-PY/tidal_dl/lang/turkish.py index 6d9d15d..7d6f285 100644 --- a/TIDALDL-PY/tidal_dl/lang/turkish.py +++ b/TIDALDL-PY/tidal_dl/lang/turkish.py @@ -30,6 +30,7 @@ class LangTurkish(object): SETTING_USE_PLAYLIST_FOLDER = "Albümler klasör halinde indirilsin mi ?" SETTING_MULITHREAD_DOWNLOAD = "Şarkılar tek tek indirilsin mi?" SETTING_ALBUM_FOLDER_FORMAT = "Klasör ismi formatı:" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Dosya ismi formatı:" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "İndirme Çubuğu Görüntüleme:" @@ -37,8 +38,8 @@ class LangTurkish(object): SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt" 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" - SETTINGS_ADD_LRC_FILE = "Save timed lyrics (.lrc file)" SETTING_APIKEY = "APIKey support" SETTING_ADD_TYPE_FOLDER = "Add Type-Folder" @@ -79,13 +80,14 @@ class LangTurkish(object): CHANGE_SAVE_COVERS = ">>> Albüm kapağı indirilsin mi?('0'-Hayır,'1'-Evet): " CHANGE_LANGUAGE = ">>> Lisan Seç " CHANGE_ALBUM_FOLDER_FORMAT = "Albüm Klasör İsmi Formatı('0' aynı kalsın):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Dosya İsmi Formatı('0' aynı kalsın):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "İndirme Çubuğu Görüntülensin mi?('0'-Hayır,'1'-Evet):" CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):" CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):" CHANGE_ADD_LYRICS = "Add lyrics('0'-No,'1'-Yes):" - CHANGE_LYRICS_SERVER_PROXY = "Lyrics server proxy('0' not modify):" + 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/ukrainian.py b/TIDALDL-PY/tidal_dl/lang/ukrainian.py index 70ad23a..403ed06 100644 --- a/TIDALDL-PY/tidal_dl/lang/ukrainian.py +++ b/TIDALDL-PY/tidal_dl/lang/ukrainian.py @@ -30,6 +30,7 @@ class LangUkrainian(object): SETTING_USE_PLAYLIST_FOLDER = "Використовувати папку плейлиста" SETTING_MULITHREAD_DOWNLOAD = "Багатопоточне завантаження" SETTING_ALBUM_FOLDER_FORMAT = "Формат папки альбому" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Формат файлу треку" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Показувати прогрес" @@ -37,8 +38,8 @@ class LangUkrainian(object): SETTING_SAVE_ALBUMINFO = "Зберігати AlbumInfo.txt" SETTING_ADD_LYRICS = "Додавати тексти пісень" SETTING_LYRICS_SERVER_PROXY = "Проксі для сервера з текстами пісень" + SETTING_ADD_LRC_FILE = "Зберігати тексти з відмітками часу (.lrc файл)" SETTING_PATH = "Шлях налаштувань" - SETTINGS_ADD_LRC_FILE = "Зберігати тексти з відмітками часу (.lrc файл)" SETTING_APIKEY = "Підтримка ключа API" SETTING_ADD_TYPE_FOLDER = "Додавати папку-тип" @@ -79,6 +80,7 @@ class LangUkrainian(object): CHANGE_SAVE_COVERS = "Зберігати обкладинки('0'-Ні,'1'-Так):" CHANGE_LANGUAGE = "Обрати мову" CHANGE_ALBUM_FOLDER_FORMAT = "Формат теки альбому('0'-не змінювати):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Формат файлу треку('0'-не змінювати):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Показувати прогрес('0'-Ні,'1'-Так):" diff --git a/TIDALDL-PY/tidal_dl/lang/vietnamese.py b/TIDALDL-PY/tidal_dl/lang/vietnamese.py index 47d8b99..2fe5817 100644 --- a/TIDALDL-PY/tidal_dl/lang/vietnamese.py +++ b/TIDALDL-PY/tidal_dl/lang/vietnamese.py @@ -30,6 +30,7 @@ class LangVietnamese(object): SETTING_USE_PLAYLIST_FOLDER = "Thư mục cho danh sách phát" SETTING_MULITHREAD_DOWNLOAD = "Tải về đa luồng" SETTING_ALBUM_FOLDER_FORMAT = "Định dạng thư mục album" + SETTING_PLAYLIST_FOLDER_FORMAT = "Playlist folder format" SETTING_TRACK_FILE_FORMAT = "Định dạng tên tệp nhạc" SETTING_VIDEO_FILE_FORMAT = "Video file format" SETTING_SHOW_PROGRESS = "Hiện tiến trình" @@ -37,7 +38,7 @@ class LangVietnamese(object): SETTING_SAVE_ALBUMINFO = "Lưu AlbumInfo.txt" SETTING_ADD_LYRICS = "Thêm lời bài hát" SETTING_LYRICS_SERVER_PROXY = "Máy chủ proxy cho lyrics" - SETTINGS_ADD_LRC_FILE = "Lưu timed lyrics (tệp .lrc)" + SETTING_ADD_LRC_FILE = "Lưu timed lyrics (tệp .lrc)" SETTING_PATH = "Đường dẫn cài đặt" SETTING_APIKEY = "Hỗ trợ APIKey" SETTING_ADD_TYPE_FOLDER = "Thêm Loại-Thư mục" @@ -79,6 +80,7 @@ class LangVietnamese(object): CHANGE_SAVE_COVERS = "Tải ảnh bìa('0'-Không,'1'-Có):" CHANGE_LANGUAGE = "Chọn ngôn ngữ" CHANGE_ALBUM_FOLDER_FORMAT = "Định dạng thư mục album('0' không đổi,'default' để đặt về mặc định):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Định dạng tên tệp nhạc('0' không đổi,'default' để đặt về mặc định):" CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):" CHANGE_SHOW_PROGRESS = "Hiện tiến trình('0'-Không,'1'-Có):" diff --git a/TIDALDL-PY/tidal_dl/paths.py b/TIDALDL-PY/tidal_dl/paths.py index 37232d7..c63295e 100644 --- a/TIDALDL-PY/tidal_dl/paths.py +++ b/TIDALDL-PY/tidal_dl/paths.py @@ -80,11 +80,16 @@ def getAlbumPath(album): retpath = retpath.strip() return f"{SETTINGS.downloadPath}/{retpath}" - def getPlaylistPath(playlist): - # name - name = __fixPath__(playlist.title) - return f"{SETTINGS.downloadPath}/Playlist/{name}" + playlistName = __fixPath__(playlist.title) + + # retpath + retpath = SETTINGS.playlistFolderFormat + if retpath is None or len(retpath) <= 0: + retpath = SETTINGS.getDefaultPlaylistFolderFormat() + retpath = retpath.replace(R"{PlaylistUUID}", str(playlist.uuid)) + retpath = retpath.replace(R"{PlaylistName}", playlistName) + return f"{SETTINGS.downloadPath}/{retpath}" def getTrackPath(track, stream, album=None, playlist=None): diff --git a/TIDALDL-PY/tidal_dl/printf.py b/TIDALDL-PY/tidal_dl/printf.py index e1bbd9f..82e9906 100644 --- a/TIDALDL-PY/tidal_dl/printf.py +++ b/TIDALDL-PY/tidal_dl/printf.py @@ -86,6 +86,7 @@ class Printf(object): [LANG.select.SETTING_PATH, getProfilePath()], [LANG.select.SETTING_DOWNLOAD_PATH, data.downloadPath], [LANG.select.SETTING_ALBUM_FOLDER_FORMAT, data.albumFolderFormat], + [LANG.select.SETTING_PLAYLIST_FOLDER_FORMAT, data.playlistFolderFormat], [LANG.select.SETTING_TRACK_FILE_FORMAT, data.trackFileFormat], [LANG.select.SETTING_VIDEO_FILE_FORMAT, data.videoFileFormat], @@ -102,7 +103,7 @@ class Printf(object): [LANG.select.SETTING_SAVE_COVERS, data.saveCovers], [LANG.select.SETTING_INCLUDE_EP, data.includeEP], [LANG.select.SETTING_LANGUAGE, LANG.getLangName(data.language)], - [LANG.select.SETTINGS_ADD_LRC_FILE, data.lyricFile], + [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']] ]) diff --git a/TIDALDL-PY/tidal_dl/settings.py b/TIDALDL-PY/tidal_dl/settings.py index d897c15..d8c1e00 100644 --- a/TIDALDL-PY/tidal_dl/settings.py +++ b/TIDALDL-PY/tidal_dl/settings.py @@ -33,12 +33,15 @@ class Settings(aigpy.model.ModelBase): videoQuality = VideoQuality.P360 usePlaylistFolder = True albumFolderFormat = R"{ArtistName}/{Flag} {AlbumTitle} [{AlbumID}] [{AlbumYear}]" + playlistFolderFormat = R"Playlist/{PlaylistName} [{PlaylistUUID}]" trackFileFormat = R"{TrackNumber} - {ArtistName} - {TrackTitle}{ExplicitFlag}" videoFileFormat = R"{VideoNumber} - {ArtistName} - {VideoTitle}{ExplicitFlag}" def getDefaultPathFormat(self, type: Type): if type == Type.Album: return R"{ArtistName}/{Flag} {AlbumTitle} [{AlbumID}] [{AlbumYear}]" + elif type == Type.Playlist: + return R"Playlist/{PlaylistName} [{PlaylistUUID}]" elif type == Type.Track: return R"{TrackNumber} - {ArtistName} - {TrackTitle}{ExplicitFlag}" elif type == Type.Video: @@ -72,6 +75,8 @@ class Settings(aigpy.model.ModelBase): self.albumFolderFormat = self.getDefaultPathFormat(Type.Album) if self.trackFileFormat is None: self.trackFileFormat = self.getDefaultPathFormat(Type.Track) + if self.playlistFolderFormat is None: + self.playlistFolderFormat = self.getDefaultPathFormat(Type.Playlist) if self.videoFileFormat is None: self.videoFileFormat = self.getDefaultPathFormat(Type.Video) if self.apiKeyIndex is None: