From 044a847e78aec158c26d8a42853cfe5cb3260b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20S=C3=A6ther?= Date: Mon, 10 Oct 2022 01:22:47 +0200 Subject: [PATCH] Added option to control playlist folder format --- TIDALDL-PY/tidal_dl/__init__.py | 1 + TIDALDL-PY/tidal_dl/events.py | 4 ++++ TIDALDL-PY/tidal_dl/lang/arabic.py | 2 ++ TIDALDL-PY/tidal_dl/lang/chinese.py | 1 + TIDALDL-PY/tidal_dl/lang/croatian.py | 2 ++ TIDALDL-PY/tidal_dl/lang/czech.py | 1 + TIDALDL-PY/tidal_dl/lang/danish.py | 1 + TIDALDL-PY/tidal_dl/lang/dutch.py | 1 + TIDALDL-PY/tidal_dl/lang/english.py | 3 +++ TIDALDL-PY/tidal_dl/lang/filipino.py | 2 ++ TIDALDL-PY/tidal_dl/lang/french.py | 1 + TIDALDL-PY/tidal_dl/lang/german.py | 1 + TIDALDL-PY/tidal_dl/lang/hungarian.py | 1 + TIDALDL-PY/tidal_dl/lang/italian.py | 2 ++ TIDALDL-PY/tidal_dl/lang/japanese.py | 2 ++ TIDALDL-PY/tidal_dl/lang/korean.py | 1 + TIDALDL-PY/tidal_dl/lang/polish.py | 1 + TIDALDL-PY/tidal_dl/lang/portuguese.py | 1 + TIDALDL-PY/tidal_dl/lang/russian.py | 1 + TIDALDL-PY/tidal_dl/lang/spanish.py | 1 + TIDALDL-PY/tidal_dl/lang/turkish.py | 1 + TIDALDL-PY/tidal_dl/lang/ukrainian.py | 1 + TIDALDL-PY/tidal_dl/lang/vietnamese.py | 1 + TIDALDL-PY/tidal_dl/paths.py | 13 +++++++++---- TIDALDL-PY/tidal_dl/printf.py | 1 + TIDALDL-PY/tidal_dl/settings.py | 5 +++++ 26 files changed, 48 insertions(+), 4 deletions(-) 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..0741b57 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" @@ -79,6 +80,7 @@ class LangArabic(object): CHANGE_SAVE_COVERS = "حفظ صورة الالبوم('0'-No,'1'-Yes):" CHANGE_LANGUAGE = "اختر لغة" CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" 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/chinese.py b/TIDALDL-PY/tidal_dl/lang/chinese.py index 075b2da..334c8e3 100644 --- a/TIDALDL-PY/tidal_dl/lang/chinese.py +++ b/TIDALDL-PY/tidal_dl/lang/chinese.py @@ -79,6 +79,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..7074aa3 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" @@ -79,6 +80,7 @@ class LangCroatian(object): 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_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" 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/czech.py b/TIDALDL-PY/tidal_dl/lang/czech.py index 8b672e2..09f43ae 100644 --- a/TIDALDL-PY/tidal_dl/lang/czech.py +++ b/TIDALDL-PY/tidal_dl/lang/czech.py @@ -79,6 +79,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..1a93b11 100644 --- a/TIDALDL-PY/tidal_dl/lang/danish.py +++ b/TIDALDL-PY/tidal_dl/lang/danish.py @@ -79,6 +79,7 @@ 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 = "Playlist folder format('0'-not modify,'default'-to set default):" 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/dutch.py b/TIDALDL-PY/tidal_dl/lang/dutch.py index 1c3ebd4..3d623f4 100644 --- a/TIDALDL-PY/tidal_dl/lang/dutch.py +++ b/TIDALDL-PY/tidal_dl/lang/dutch.py @@ -79,6 +79,7 @@ class LangDutch(object): 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_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" 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_SHOW_PROGRESS = "Voortgang weergeven('0'-Nee,'1'-Ja):" diff --git a/TIDALDL-PY/tidal_dl/lang/english.py b/TIDALDL-PY/tidal_dl/lang/english.py index e1f934d..8e315d5 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" @@ -79,6 +80,8 @@ 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_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..6665a77 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" @@ -79,6 +80,7 @@ class LangFilipino(object): 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_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" 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/french.py b/TIDALDL-PY/tidal_dl/lang/french.py index 0481d1e..1e7b3b0 100644 --- a/TIDALDL-PY/tidal_dl/lang/french.py +++ b/TIDALDL-PY/tidal_dl/lang/french.py @@ -79,6 +79,7 @@ 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/german.py b/TIDALDL-PY/tidal_dl/lang/german.py index 560925b..22cac86 100644 --- a/TIDALDL-PY/tidal_dl/lang/german.py +++ b/TIDALDL-PY/tidal_dl/lang/german.py @@ -79,6 +79,7 @@ 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/hungarian.py b/TIDALDL-PY/tidal_dl/lang/hungarian.py index 75e872d..dee6b5d 100644 --- a/TIDALDL-PY/tidal_dl/lang/hungarian.py +++ b/TIDALDL-PY/tidal_dl/lang/hungarian.py @@ -79,6 +79,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..620a3e7 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" @@ -79,6 +80,7 @@ class LangItalian(object): CHANGE_SAVE_COVERS = "Salve copertine ('0'-No,'1'-Sì):" CHANGE_LANGUAGE = "Selezionare lingua" CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):" + CHANGE_PLAYLIST_FOLDER_FORMAT = "Playlist folder format('0'-not modify,'default'-to set default):" CHANGE_TRACK_FILE_FORMAT = "Track file format('0' not modify):" 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/japanese.py b/TIDALDL-PY/tidal_dl/lang/japanese.py index 8855d6f..372ff24 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" @@ -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..a5ea09d 100644 --- a/TIDALDL-PY/tidal_dl/lang/korean.py +++ b/TIDALDL-PY/tidal_dl/lang/korean.py @@ -79,6 +79,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/polish.py b/TIDALDL-PY/tidal_dl/lang/polish.py index d2c6d2c..5fe69d5 100644 --- a/TIDALDL-PY/tidal_dl/lang/polish.py +++ b/TIDALDL-PY/tidal_dl/lang/polish.py @@ -79,6 +79,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..fdf166a 100644 --- a/TIDALDL-PY/tidal_dl/lang/portuguese.py +++ b/TIDALDL-PY/tidal_dl/lang/portuguese.py @@ -79,6 +79,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..58ae1a5 100644 --- a/TIDALDL-PY/tidal_dl/lang/russian.py +++ b/TIDALDL-PY/tidal_dl/lang/russian.py @@ -79,6 +79,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..b84e00f 100644 --- a/TIDALDL-PY/tidal_dl/lang/spanish.py +++ b/TIDALDL-PY/tidal_dl/lang/spanish.py @@ -79,6 +79,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..87935eb 100644 --- a/TIDALDL-PY/tidal_dl/lang/turkish.py +++ b/TIDALDL-PY/tidal_dl/lang/turkish.py @@ -79,6 +79,7 @@ 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):" diff --git a/TIDALDL-PY/tidal_dl/lang/ukrainian.py b/TIDALDL-PY/tidal_dl/lang/ukrainian.py index 70ad23a..f753a36 100644 --- a/TIDALDL-PY/tidal_dl/lang/ukrainian.py +++ b/TIDALDL-PY/tidal_dl/lang/ukrainian.py @@ -79,6 +79,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..6ebefa6 100644 --- a/TIDALDL-PY/tidal_dl/lang/vietnamese.py +++ b/TIDALDL-PY/tidal_dl/lang/vietnamese.py @@ -79,6 +79,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..f364c1c 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], 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: