q/yandex-music-downloader
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Добавление флага --strict-path

Browse source
This commit is contained in:
Lev 2022-12-11 18:34:11 +07:00
parent 422b0891f6
commit 88fc6be1a7
No known key found for this signature in database
GPG key ID: 21C6C2C9C0A4460D
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
main.py
View file

@ -30,6 +30,8 @@ ALBUM_RE = re.compile(r'album/(\d+)$')
ARTIST_RE = re.compile(r'artist/(\d+)$') ARTIST_RE = re.compile(r'artist/(\d+)$')
PLAYLIST_RE = re.compile(r'([\w\-]+)/playlists/(\d+)$') PLAYLIST_RE = re.compile(r'([\w\-]+)/playlists/(\d+)$')
CLEAR_PATH_RE = re.compile(r'[^\w\-_\./ ]+')
@dataclass @dataclass
class PlaylistId: class PlaylistId:
@ -203,6 +205,11 @@ def set_id3_tags(path: Path, track: BasicTrackInfo, lyrics: Optional[str]) -> No
tag.save() tag.save()
def clear_path(path: Path) -> Path:
cleared_path = CLEAR_PATH_RE.sub('_', str(path))
return Path(cleared_path)
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Загрузчик музыки с сервиса Яндекс.Музыка') parser = argparse.ArgumentParser(description='Загрузчик музыки с сервиса Яндекс.Музыка')
@ -244,6 +251,8 @@ if __name__ == '__main__':
id_group.add_argument('-u', '--url', help='URL исполнителя/альбома/трека/плейлиста') id_group.add_argument('-u', '--url', help='URL исполнителя/альбома/трека/плейлиста')
path_group = parser.add_argument_group('Указание пути') path_group = parser.add_argument_group('Указание пути')
path_group.add_argument('--strict-path', action='store_true',
help=help_str('Очищать путь от недопустимых символов'))
path_group.add_argument('--dir', default='.', metavar='<Папка>', path_group.add_argument('--dir', default='.', metavar='<Папка>',
help=help_str('Папка для загрузки музыки'), type=Path) help=help_str('Папка для загрузки музыки'), type=Path)
path_group.add_argument('--path-pattern', default=DEFAULT_PATH_PATTERN, path_group.add_argument('--path-pattern', default=DEFAULT_PATH_PATTERN,
@ -321,6 +330,8 @@ if __name__ == '__main__':
album.title = f'{album.title} ({track.album.version})' album.title = f'{album.title} ({track.album.version})'
save_path = prepare_track_path(args.dir, args.path_pattern, track) save_path = prepare_track_path(args.dir, args.path_pattern, track)
if args.strict_path:
save_path = clear_path(save_path)
if args.skip_existing and save_path.is_file(): if args.skip_existing and save_path.is_file():
continue continue