From ad00099c9df8a89d277923375491a9be3bea892d Mon Sep 17 00:00:00 2001
From: 392309221 <392309221@qq.com>
Date: Tue, 8 Mar 2022 09:23:25 +0800
Subject: [PATCH] Add video-path-format

---
 README.md                              | 12 +++++++++++
 TIDALDL-PY/tidal_dl/__init__.py        |  2 ++
 TIDALDL-PY/tidal_dl/lang/arabic.py     |  2 ++
 TIDALDL-PY/tidal_dl/lang/chinese.py    |  2 ++
 TIDALDL-PY/tidal_dl/lang/croatian.py   |  2 ++
 TIDALDL-PY/tidal_dl/lang/czech.py      |  2 ++
 TIDALDL-PY/tidal_dl/lang/danish.py     |  2 ++
 TIDALDL-PY/tidal_dl/lang/dutch.py      |  2 ++
 TIDALDL-PY/tidal_dl/lang/english.py    |  2 ++
 TIDALDL-PY/tidal_dl/lang/filipino.py   |  2 ++
 TIDALDL-PY/tidal_dl/lang/french.py     |  2 ++
 TIDALDL-PY/tidal_dl/lang/german.py     |  2 ++
 TIDALDL-PY/tidal_dl/lang/hungarian.py  |  2 ++
 TIDALDL-PY/tidal_dl/lang/italian.py    |  2 ++
 TIDALDL-PY/tidal_dl/lang/japanese.py   |  2 ++
 TIDALDL-PY/tidal_dl/lang/korean.py     |  2 ++
 TIDALDL-PY/tidal_dl/lang/polish.py     |  2 ++
 TIDALDL-PY/tidal_dl/lang/portuguese.py |  2 ++
 TIDALDL-PY/tidal_dl/lang/russian.py    |  2 ++
 TIDALDL-PY/tidal_dl/lang/spanish.py    |  2 ++
 TIDALDL-PY/tidal_dl/lang/turkish.py    |  2 ++
 TIDALDL-PY/tidal_dl/lang/ukrainian.py  |  2 ++
 TIDALDL-PY/tidal_dl/lang/vietnamese.py |  2 ++
 TIDALDL-PY/tidal_dl/printf.py          |  1 +
 TIDALDL-PY/tidal_dl/settings.py        |  5 +++++
 TIDALDL-PY/tidal_dl/util.py            | 30 ++++++++++++++++++--------
 26 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c5e0dbc..5206386 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,18 @@
 | {Duration}        | 02:53                                      |
 | {TrackID}         | 55163244                                   |
 
+### Video
+
+| Tag               | Example Value                              |
+| ----------------- | ------------------------------------------ |
+| {VideoNumber}     | 00                                         |
+| {ArtistName}      | DMX                                        |
+| {ArtistsName}     | DMX, Westside Gunn                         |
+| {VideoTitle}      | Hood Blues                                 |
+| {ExplicitFlag}    | (*Explicit*)                               |
+| {VideoYear}       | 2021                                       |
+| {TrackID}         | 188932980                                  |
+
 ## ☕ Support
 
 If you really like my projects and want to support me, you can buy me a coffee and star this project. 
diff --git a/TIDALDL-PY/tidal_dl/__init__.py b/TIDALDL-PY/tidal_dl/__init__.py
index c75fe48..e8e461a 100644
--- a/TIDALDL-PY/tidal_dl/__init__.py
+++ b/TIDALDL-PY/tidal_dl/__init__.py
@@ -124,6 +124,8 @@ def changeSettings():
         LANG.CHANGE_ALBUM_FOLDER_FORMAT, CONF.albumFolderFormat, Settings.getDefaultAlbumFolderFormat())
     CONF.trackFileFormat = Printf.enterFormat(LANG.CHANGE_TRACK_FILE_FORMAT,
                                               CONF.trackFileFormat, Settings.getDefaultTrackFileFormat())
+    CONF.videoFileFormat = Printf.enterFormat(LANG.CHANGE_VIDEO_FILE_FORMAT,
+                                              CONF.videoFileFormat, Settings.getDefaultVideoFileFormat())                                          
     CONF.addLyrics = Printf.enter(LANG.CHANGE_ADD_LYRICS) == '1'
     CONF.lyricsServerProxy = Printf.enterFormat(
         LANG.CHANGE_LYRICS_SERVER_PROXY, CONF.lyricsServerProxy, CONF.lyricsServerProxy)
diff --git a/TIDALDL-PY/tidal_dl/lang/arabic.py b/TIDALDL-PY/tidal_dl/lang/arabic.py
index 5621fc2..323532b 100644
--- a/TIDALDL-PY/tidal_dl/lang/arabic.py
+++ b/TIDALDL-PY/tidal_dl/lang/arabic.py
@@ -31,6 +31,7 @@ class LangArabic(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangArabic(object):
     CHANGE_LANGUAGE = "اختر لغة"
     CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):"
     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):"
     CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):"
     CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):"
diff --git a/TIDALDL-PY/tidal_dl/lang/chinese.py b/TIDALDL-PY/tidal_dl/lang/chinese.py
index 6d40d21..976e07b 100644
--- a/TIDALDL-PY/tidal_dl/lang/chinese.py
+++ b/TIDALDL-PY/tidal_dl/lang/chinese.py
@@ -31,6 +31,7 @@ class LangChinese(object):
     SETTING_MULITHREAD_DOWNLOAD = "多线程下载"
     SETTING_ALBUM_FOLDER_FORMAT = "专辑目录格式"
     SETTING_TRACK_FILE_FORMAT = "歌曲文件名格式"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "显示进度条"
     SETTING_SHOW_TRACKINFO = "显示歌曲信息"
     SETTING_SAVE_ALBUMINFO = "保存AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangChinese(object):
     CHANGE_LANGUAGE = "选择语言"
     CHANGE_ALBUM_FOLDER_FORMAT = "专辑目录格式('0' 不修改):"
     CHANGE_TRACK_FILE_FORMAT = "歌曲文件名格式('0' 不修改):"
+    CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):"
     CHANGE_SHOW_PROGRESS = "显示进度条('0'-不,'1'-是):"
     CHANGE_SHOW_TRACKINFO = "显示歌曲信息('0'-否,'1'-是):"
     CHANGE_SAVE_ALBUM_INFO = "保存AlbumInfo.txt('0'-否,'1'-是):"
diff --git a/TIDALDL-PY/tidal_dl/lang/croatian.py b/TIDALDL-PY/tidal_dl/lang/croatian.py
index d9bdf79..3245e49 100644
--- a/TIDALDL-PY/tidal_dl/lang/croatian.py
+++ b/TIDALDL-PY/tidal_dl/lang/croatian.py
@@ -31,6 +31,7 @@ class LangCroatian(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangCroatian(object):
     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_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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/czech.py b/TIDALDL-PY/tidal_dl/lang/czech.py
index 035eed7..c174f89 100644
--- a/TIDALDL-PY/tidal_dl/lang/czech.py
+++ b/TIDALDL-PY/tidal_dl/lang/czech.py
@@ -31,6 +31,7 @@ class LangCzech(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangCzech(object):
     CHANGE_LANGUAGE = "Zvolit jazyk"
     CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0' not modify):"
     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):"
     CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):"
     CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):"
diff --git a/TIDALDL-PY/tidal_dl/lang/danish.py b/TIDALDL-PY/tidal_dl/lang/danish.py
index 66ea580..a907891 100644
--- a/TIDALDL-PY/tidal_dl/lang/danish.py
+++ b/TIDALDL-PY/tidal_dl/lang/danish.py
@@ -31,6 +31,7 @@ class LangDanish(object):
     SETTING_MULITHREAD_DOWNLOAD = "Flertråede download"
     SETTING_ALBUM_FOLDER_FORMAT = "Albummappens format"
     SETTING_TRACK_FILE_FORMAT = "Musiknummerets filformat"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Vis fremskridt"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangDanish(object):
     CHANGE_LANGUAGE = "Vælg sprog"
     CHANGE_ALBUM_FOLDER_FORMAT = "Albummappeformat('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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/dutch.py b/TIDALDL-PY/tidal_dl/lang/dutch.py
index 754d91f..7ba2818 100644
--- a/TIDALDL-PY/tidal_dl/lang/dutch.py
+++ b/TIDALDL-PY/tidal_dl/lang/dutch.py
@@ -31,6 +31,7 @@ class LangDutch(object):
     SETTING_MULITHREAD_DOWNLOAD = "Downloaden met meerdere threads"
     SETTING_ALBUM_FOLDER_FORMAT = "Indeling albummap"
     SETTING_TRACK_FILE_FORMAT = "Bestandsindeling bijhouden"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Toon voortgang"
     SETTING_SHOW_TRACKINFO = "Toon trackinfo"
     SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt opslaan"
@@ -79,6 +80,7 @@ class LangDutch(object):
     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 = "Video file format('0'-not modify,'default'-to set default):"
     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 f9ec862..b113025 100644
--- a/TIDALDL-PY/tidal_dl/lang/english.py
+++ b/TIDALDL-PY/tidal_dl/lang/english.py
@@ -31,6 +31,7 @@ class LangEnglish(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangEnglish(object):
     CHANGE_LANGUAGE = "Select language"
     CHANGE_ALBUM_FOLDER_FORMAT = "Album 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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/filipino.py b/TIDALDL-PY/tidal_dl/lang/filipino.py
index 9cd2f58..8ea1a34 100644
--- a/TIDALDL-PY/tidal_dl/lang/filipino.py
+++ b/TIDALDL-PY/tidal_dl/lang/filipino.py
@@ -31,6 +31,7 @@ class LangFilipino(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangFilipino(object):
     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_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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/french.py b/TIDALDL-PY/tidal_dl/lang/french.py
index d6f607f..5bdfe63 100644
--- a/TIDALDL-PY/tidal_dl/lang/french.py
+++ b/TIDALDL-PY/tidal_dl/lang/french.py
@@ -31,6 +31,7 @@ class LangFrench(object):
     SETTING_MULITHREAD_DOWNLOAD = "Téléchargement multithread"
     SETTING_ALBUM_FOLDER_FORMAT = "Format du dossier d'album"
     SETTING_TRACK_FILE_FORMAT = "Format du fichier de tracklist"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Afficher la Progression"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangFrench(object):
     CHANGE_LANGUAGE = "Sélectionnez une langue"
     CHANGE_ALBUM_FOLDER_FORMAT = "Format du dossier d'album('0' ne pas modifier):"
     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 = "Show track info('0'-No,'1'-Yes):"
     CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-No,'1'-Yes):"
diff --git a/TIDALDL-PY/tidal_dl/lang/german.py b/TIDALDL-PY/tidal_dl/lang/german.py
index 607e251..01ab55b 100644
--- a/TIDALDL-PY/tidal_dl/lang/german.py
+++ b/TIDALDL-PY/tidal_dl/lang/german.py
@@ -31,6 +31,7 @@ class LangGerman(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi-Thread-Download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album-Ordnerformat"
     SETTING_TRACK_FILE_FORMAT = "Track-Dateiformat"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Fortschritt anzeigen"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangGerman(object):
     CHANGE_LANGUAGE = "Sprache auswählen"
     CHANGE_ALBUM_FOLDER_FORMAT = "Album-Ordnerformat('0' überspringen):"
     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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/hungarian.py b/TIDALDL-PY/tidal_dl/lang/hungarian.py
index 0a8e516..c2a76aa 100644
--- a/TIDALDL-PY/tidal_dl/lang/hungarian.py
+++ b/TIDALDL-PY/tidal_dl/lang/hungarian.py
@@ -31,6 +31,7 @@ class LangHungarian(object):
     SETTING_MULITHREAD_DOWNLOAD = "Többszálú letöltés"
     SETTING_ALBUM_FOLDER_FORMAT = "Album mappa formátum"
     SETTING_TRACK_FILE_FORMAT = "Track fájlformátum"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Haladás megjelenítése"
     SETTING_SHOW_TRACKINFO = "Track infók megjelenítése"
     SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt mentése"
@@ -79,6 +80,7 @@ class LangHungarian(object):
     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_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'-not modify,'default'-to set default):"
     CHANGE_SHOW_PROGRESS = "Haladás megjelenítése('0'-nem, '1'-igen):"
     CHANGE_SHOW_TRACKINFO = "Track infók megjelenítése('0'-No,'1'-Yes):"
     CHANGE_SAVE_ALBUM_INFO = "AlbumInfo.txt mentése('0'-nem, '1'-igen):"
diff --git a/TIDALDL-PY/tidal_dl/lang/italian.py b/TIDALDL-PY/tidal_dl/lang/italian.py
index 6562c22..e25ef7b 100644
--- a/TIDALDL-PY/tidal_dl/lang/italian.py
+++ b/TIDALDL-PY/tidal_dl/lang/italian.py
@@ -31,6 +31,7 @@ class LangItalian(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangItalian(object):
     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_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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/japanese.py b/TIDALDL-PY/tidal_dl/lang/japanese.py
index 29a57ab..ec7478e 100644
--- a/TIDALDL-PY/tidal_dl/lang/japanese.py
+++ b/TIDALDL-PY/tidal_dl/lang/japanese.py
@@ -31,6 +31,7 @@ class LangJapanese(object):
     SETTING_MULITHREAD_DOWNLOAD = "Multi thread download"
     SETTING_ALBUM_FOLDER_FORMAT = "Album folder format"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Show progress"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangJapanese(object):
     CHANGE_LANGUAGE = "言語を選択する"
     CHANGE_ALBUM_FOLDER_FORMAT = "Album folder format('0'-変更しない,'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'-はい):"
     CHANGE_SHOW_TRACKINFO = "Show track info('0'-いいえ,'1'-はい):"
     CHANGE_SAVE_ALBUM_INFO = "Save AlbumInfo.txt('0'-いいえ,'1'-はい):"
diff --git a/TIDALDL-PY/tidal_dl/lang/korean.py b/TIDALDL-PY/tidal_dl/lang/korean.py
index ef94a04..e64ab29 100644
--- a/TIDALDL-PY/tidal_dl/lang/korean.py
+++ b/TIDALDL-PY/tidal_dl/lang/korean.py
@@ -31,6 +31,7 @@ class LangKorean(object):
     SETTING_MULITHREAD_DOWNLOAD = "다중 스레드 다운로드"
     SETTING_ALBUM_FOLDER_FORMAT = "앨범 폴더 형식"
     SETTING_TRACK_FILE_FORMAT = "트랙 파일 형식"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "진행 상태 표시"
     SETTING_SHOW_TRACKINFO = "트랙 정보 표시"
     SETTING_SAVE_ALBUMINFO = "AlbumInfo.txt 저장"
@@ -79,6 +80,7 @@ class LangKorean(object):
     CHANGE_LANGUAGE = "언어 선택"
     CHANGE_ALBUM_FOLDER_FORMAT = "앨범 폴더 형식('0'-변경 안 함,'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'-예):"
     CHANGE_SHOW_TRACKINFO = "트랙 정보 표시('0'-아니요,'1'-예):"
     CHANGE_SAVE_ALBUM_INFO = "AlbumInfo.txt 저장('0'-아니요,'1'-예):"
diff --git a/TIDALDL-PY/tidal_dl/lang/polish.py b/TIDALDL-PY/tidal_dl/lang/polish.py
index 4f72057..a6909f4 100644
--- a/TIDALDL-PY/tidal_dl/lang/polish.py
+++ b/TIDALDL-PY/tidal_dl/lang/polish.py
@@ -31,6 +31,7 @@ class LangPolish(object):
     SETTING_MULITHREAD_DOWNLOAD = "Pobieranie wielowątkowe"
     SETTING_ALBUM_FOLDER_FORMAT = "Format folderu albumu"
     SETTING_TRACK_FILE_FORMAT = "Format pliku utworu"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Pokaż postęp"
     SETTING_SHOW_TRACKINFO = "Pokaż informacje o utworze"
     SETTING_SAVE_ALBUMINFO = "Zapisz AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangPolish(object):
     CHANGE_LANGUAGE = "Wybierz język"
     CHANGE_ALBUM_FOLDER_FORMAT = "Format folderu albumu('0'-nie modyfikuj,'default'-by ustawić domyślny):"
     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):"
     CHANGE_SHOW_TRACKINFO = "Pokaż informacje o utworze('0'-Nie,'1'-Tak):"
     CHANGE_SAVE_ALBUM_INFO = "Zapisz AlbumInfo.txt('0'-Nie,'1'-Tak):"
diff --git a/TIDALDL-PY/tidal_dl/lang/portuguese.py b/TIDALDL-PY/tidal_dl/lang/portuguese.py
index cc7f4ef..1227305 100644
--- a/TIDALDL-PY/tidal_dl/lang/portuguese.py
+++ b/TIDALDL-PY/tidal_dl/lang/portuguese.py
@@ -31,6 +31,7 @@ class LangPortuguese(object):
     SETTING_MULITHREAD_DOWNLOAD = "Download de vários tópicos"
     SETTING_ALBUM_FOLDER_FORMAT = "Formato da pasta do álbum"
     SETTING_TRACK_FILE_FORMAT = "Track file format"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Mostrar progresso"
     SETTING_SHOW_TRACKINFO = "Mostrar informações da faixa"
     SETTING_SAVE_ALBUMINFO = "Salvar AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangPortuguese(object):
     CHANGE_LANGUAGE = "Selecionar idioma"
     CHANGE_ALBUM_FOLDER_FORMAT = "Formato da pasta do álbum ('0' não modificar)"
     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):"
     CHANGE_SHOW_TRACKINFO = "Mostrar informações da faixa('0'-Não,'1'-Sim):"
     CHANGE_SAVE_ALBUM_INFO = "Salvar AlbumInfo.txt('0'-Não,'1'-Sim):"
diff --git a/TIDALDL-PY/tidal_dl/lang/russian.py b/TIDALDL-PY/tidal_dl/lang/russian.py
index 44dcc88..db26dd5 100644
--- a/TIDALDL-PY/tidal_dl/lang/russian.py
+++ b/TIDALDL-PY/tidal_dl/lang/russian.py
@@ -31,6 +31,7 @@ class LangRussian(object):
     SETTING_MULITHREAD_DOWNLOAD = "Многопоточная загрузка"
     SETTING_ALBUM_FOLDER_FORMAT = "Маска имени альбома"
     SETTING_TRACK_FILE_FORMAT = "Маска имени трека"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Показывать процесс загрузки"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Сохранять AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangRussian(object):
     CHANGE_LANGUAGE = "Выбрать язык"
     CHANGE_ALBUM_FOLDER_FORMAT = "Маска имени альбома('0' не менять):"
     CHANGE_TRACK_FILE_FORMAT = "Маска имени трека('0' не менять):"
+    CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):"
     CHANGE_SHOW_PROGRESS = "Показывать процесс загрузки('0'-Нет,'1'-Да):"
     CHANGE_SHOW_TRACKINFO = "Show track info('0'-No,'1'-Yes):"
     CHANGE_SAVE_ALBUM_INFO = "Сохранять AlbumInfo.txt('0'-Нет,'1'-Да):"
diff --git a/TIDALDL-PY/tidal_dl/lang/spanish.py b/TIDALDL-PY/tidal_dl/lang/spanish.py
index 9244690..aef6616 100644
--- a/TIDALDL-PY/tidal_dl/lang/spanish.py
+++ b/TIDALDL-PY/tidal_dl/lang/spanish.py
@@ -31,6 +31,7 @@ class LangSpanish(object):
     SETTING_MULITHREAD_DOWNLOAD = "Descarga Multi-hilo"
     SETTING_ALBUM_FOLDER_FORMAT = "Formato del nombre de carpeta del álbum"
     SETTING_TRACK_FILE_FORMAT = "Formato del nombre de archivo de la pista"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Mostrar progreso"
     SETTING_SHOW_TRACKINFO = "Mostrar información de pista"
     SETTING_SAVE_ALBUMINFO = "Guardar AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangSpanish(object):
     CHANGE_LANGUAGE = "Seleccione el idioma"
     CHANGE_ALBUM_FOLDER_FORMAT = "Formato del nombre de carpeta del álbum ('0' No modificar):"
     CHANGE_TRACK_FILE_FORMAT = "Formato del nombre de archivo de la pista ('0' No modificar):"
+    CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):"
     CHANGE_SHOW_PROGRESS = "¿Mostrar progreso? ('0'-No,'1'-Sí):"
     CHANGE_SHOW_TRACKINFO = "¿Mostrar información de pista?('0'-No,'1'-Sí):"
     CHANGE_SAVE_ALBUM_INFO = "¿Guardar AlbumInfo.txt?('0'-No,'1'-Sí):"
diff --git a/TIDALDL-PY/tidal_dl/lang/turkish.py b/TIDALDL-PY/tidal_dl/lang/turkish.py
index baee321..08ffac5 100644
--- a/TIDALDL-PY/tidal_dl/lang/turkish.py
+++ b/TIDALDL-PY/tidal_dl/lang/turkish.py
@@ -31,6 +31,7 @@ class LangTurkish(object):
     SETTING_MULITHREAD_DOWNLOAD = "Şarkılar tek tek indirilsin mi?"
     SETTING_ALBUM_FOLDER_FORMAT = "Klasör ismi 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:"
     SETTING_SHOW_TRACKINFO = "Show Track Info"
     SETTING_SAVE_ALBUMINFO = "Save AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangTurkish(object):
     CHANGE_LANGUAGE = ">>> Lisan Seç "
     CHANGE_ALBUM_FOLDER_FORMAT = "Albüm Klasör İsmi Formatı('0' aynı kalsın):"
     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):"
diff --git a/TIDALDL-PY/tidal_dl/lang/ukrainian.py b/TIDALDL-PY/tidal_dl/lang/ukrainian.py
index 47332b4..0ca5656 100644
--- a/TIDALDL-PY/tidal_dl/lang/ukrainian.py
+++ b/TIDALDL-PY/tidal_dl/lang/ukrainian.py
@@ -31,6 +31,7 @@ class LangUkrainian(object):
     SETTING_MULITHREAD_DOWNLOAD = "Багатопоточне завантаження"
     SETTING_ALBUM_FOLDER_FORMAT = "Формат папки альбому"
     SETTING_TRACK_FILE_FORMAT = "Формат файлу треку"
+    SETTING_VIDEO_FILE_FORMAT = "Video file format"
     SETTING_SHOW_PROGRESS = "Показувати прогрес"
     SETTING_SHOW_TRACKINFO = "Показувати інформацію про трек"
     SETTING_SAVE_ALBUMINFO = "Зберігати AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangUkrainian(object):
     CHANGE_LANGUAGE = "Обрати мову"
     CHANGE_ALBUM_FOLDER_FORMAT = "Формат теки альбому('0'-не змінювати):"
     CHANGE_TRACK_FILE_FORMAT = "Формат файлу треку('0'-не змінювати):"
+    CHANGE_VIDEO_FILE_FORMAT = "Video file format('0'-not modify,'default'-to set default):"
     CHANGE_SHOW_PROGRESS = "Показувати прогрес('0'-Ні,'1'-Так):"
     CHANGE_SHOW_TRACKINFO = "Показувати інформацію про трек('0'-Ні,'1'-Так):"
     CHANGE_SAVE_ALBUM_INFO = "Зберігати AlbumInfo.txt('0'-Ні,'1'-Так):"
diff --git a/TIDALDL-PY/tidal_dl/lang/vietnamese.py b/TIDALDL-PY/tidal_dl/lang/vietnamese.py
index 0c13fd9..f004bdd 100644
--- a/TIDALDL-PY/tidal_dl/lang/vietnamese.py
+++ b/TIDALDL-PY/tidal_dl/lang/vietnamese.py
@@ -31,6 +31,7 @@ class LangVietnamese(object):
     SETTING_MULITHREAD_DOWNLOAD = "Tải về đa luồng"
     SETTING_ALBUM_FOLDER_FORMAT = "Định dạng thư mục album"
     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"
     SETTING_SHOW_TRACKINFO = "Hiện thông tin bài"
     SETTING_SAVE_ALBUMINFO = "Lưu AlbumInfo.txt"
@@ -79,6 +80,7 @@ class LangVietnamese(object):
     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_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ó):"
     CHANGE_SHOW_TRACKINFO = "Hiện thông tin bài('0'-Không,'1'-Có):"
     CHANGE_SAVE_ALBUM_INFO = "Lưu AlbumInfo.txt('0'-Không,'1'-Có):"
diff --git a/TIDALDL-PY/tidal_dl/printf.py b/TIDALDL-PY/tidal_dl/printf.py
index 993c8fc..9f970f6 100644
--- a/TIDALDL-PY/tidal_dl/printf.py
+++ b/TIDALDL-PY/tidal_dl/printf.py
@@ -87,6 +87,7 @@ class Printf(object):
         tb.add_row([LANG.SETTING_MULITHREAD_DOWNLOAD, data.multiThreadDownload])
         tb.add_row([LANG.SETTING_ALBUM_FOLDER_FORMAT, data.albumFolderFormat])
         tb.add_row([LANG.SETTING_TRACK_FILE_FORMAT, data.trackFileFormat])
+        tb.add_row([LANG.SETTING_VIDEO_FILE_FORMAT, data.videoFileFormat])
         tb.add_row([LANG.SETTING_ADD_LYRICS, data.addLyrics])
         tb.add_row([LANG.SETTING_LYRICS_SERVER_PROXY, data.lyricsServerProxy])
         tb.add_row([LANG.SETTINGS_ADD_LRC_FILE, data.lyricFile])
diff --git a/TIDALDL-PY/tidal_dl/settings.py b/TIDALDL-PY/tidal_dl/settings.py
index 56c5d0a..3c38bdc 100644
--- a/TIDALDL-PY/tidal_dl/settings.py
+++ b/TIDALDL-PY/tidal_dl/settings.py
@@ -101,6 +101,7 @@ class Settings(ModelBase):
     multiThreadDownload = True
     albumFolderFormat = R"{ArtistName}/{Flag} {AlbumTitle} [{AlbumID}] [{AlbumYear}]"
     trackFileFormat = R"{TrackNumber} - {ArtistName} - {TrackTitle}{ExplicitFlag}"
+    videoFileFormat = R"{VideoNumber} - {ArtistName} - {VideoTitle}{ExplicitFlag}"
     showProgress = True
     showTrackInfo = True
     saveAlbumInfo = False
@@ -115,6 +116,10 @@ class Settings(ModelBase):
     @staticmethod
     def getDefaultTrackFileFormat():
         return R"{TrackNumber} - {ArtistName} - {TrackTitle}{ExplicitFlag}"
+    
+    @staticmethod
+    def getDefaultVideoFileFormat():
+        return R"{VideoNumber} - {ArtistName} - {VideoTitle}{ExplicitFlag}"
 
     @staticmethod
     def read():
diff --git a/TIDALDL-PY/tidal_dl/util.py b/TIDALDL-PY/tidal_dl/util.py
index e74e1b5..875f2c0 100644
--- a/TIDALDL-PY/tidal_dl/util.py
+++ b/TIDALDL-PY/tidal_dl/util.py
@@ -225,23 +225,35 @@ def getVideoPath(conf, video, album=None, playlist=None):
         if conf.addTypeFolder:
             base = base + 'Video/'
 
-    # hyphen
-    hyphen = ' - ' if conf.addHyphen else ' '
     # get number
-    number = ''
-    if conf.useTrackNumber:
-        number = __getIndexStr__(video.trackNumber) + hyphen
+    number = __getIndexStr__(video.trackNumber)
     # get artist
-    artist = ''
-    if conf.artistBeforeTitle:
-        artist = aigpy.path.replaceLimitChar(getArtistsName(video.artists), '-') + hyphen
+    artists = aigpy.path.replaceLimitChar(getArtistsName(video.artists), '-')
+    artist = aigpy.path.replaceLimitChar(video.artist.name, '-') if video.artist is not None else ""
     # get explicit
     explicit = "(Explicit)" if conf.addExplicitTag and video.explicit else ''
     # title
     title = aigpy.path.replaceLimitChar(video.title, '-')
+    # year
+    year = ""
+    if video.releaseDate is not None:
+        year = aigpy.string.getSubOnlyEnd(video.releaseDate, '-')
     # extension
     extension = ".mp4"
-    return base + number + artist.strip() + title + explicit + extension
+
+    retpath = conf.videoFileFormat # R"{VideoNumber} - {ArtistName} - [{ArtistsName}] - {VideoYear} - {VideoID} - {VideoTitle}{ExplicitFlag}"
+    if retpath is None or len(retpath) <= 0:
+        retpath = Settings.getDefaultVideoFileFormat()
+    retpath = retpath.replace(R"{VideoNumber}", number)
+    retpath = retpath.replace(R"{ArtistName}", artist.strip())
+    retpath = retpath.replace(R"{ArtistsName}", artists.strip())
+    retpath = retpath.replace(R"{VideoTitle}", title)
+    retpath = retpath.replace(R"{ExplicitFlag}", explicit)
+    retpath = retpath.replace(R"{VideoYear}", year)
+    retpath = retpath.replace(R"{VideoID}", str(video.id))
+    retpath = retpath.strip()
+
+    return base + retpath + extension
 
 
 def convertToM4a(filepath, codec):