From 422b0891f6656a7d25f2382297b75572cb403821 Mon Sep 17 00:00:00 2001 From: Lev Date: Sun, 11 Dec 2022 18:12:28 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=B1=D0=BE=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index d045843..85db76e 100644 --- a/main.py +++ b/main.py @@ -41,14 +41,15 @@ class PlaylistId: class BasicAlbumInfo: id: str title: str + version: Optional[str] year: int artists: list[str] @staticmethod def from_json(json: dict): artists = [a['name'] for a in json['artists']] - return BasicAlbumInfo(id=json['id'], title=json['title'], year=json['year'], - artists=artists) + return BasicAlbumInfo(id=json['id'], title=json['title'], version=json.get('version', None), + year=json['year'], artists=artists) @dataclass @@ -312,8 +313,12 @@ if __name__ == '__main__': print(f'Треков: {len(result_tracks)}') for track in result_tracks: - if args.add_version and track.version is not None: - track.title = f'{track.title} ({track.version})' + if args.add_version: + if track.version is not None: + track.title = f'{track.title} ({track.version})' + album = track.album + if album.version is not None: + album.title = f'{album.title} ({track.album.version})' save_path = prepare_track_path(args.dir, args.path_pattern, track) if args.skip_existing and save_path.is_file():