From a95645b3fca7095be0e5bd3de83bb997850cdbc4 Mon Sep 17 00:00:00 2001 From: lynxstarshine <80224113+lynxstarshine@users.noreply.github.com> Date: Sat, 15 Mar 2025 00:53:12 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20track=20version=20to=20titl?= =?UTF-8?q?e=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tiddl/metadata.py | 4 ++-- tiddl/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tiddl/metadata.py b/tiddl/metadata.py index 6935e20..a4e233d 100644 --- a/tiddl/metadata.py +++ b/tiddl/metadata.py @@ -38,8 +38,8 @@ def addMetadata( picture.mime = "image/jpeg" metadata.add_picture(picture) - metadata["TITLE"] = track.title - metadata["WORK"] = track.title + metadata["TITLE"] = track.title + (" ({})".format(track.version) if track.version else "") + metadata["WORK"] = track.title + (" ({})".format(track.version) if track.version else "") metadata["TRACKNUMBER"] = str(track.trackNumber) metadata["DISCNUMBER"] = str(track.volumeNumber) diff --git a/tiddl/utils.py b/tiddl/utils.py index 34b04e5..e6503af 100644 --- a/tiddl/utils.py +++ b/tiddl/utils.py @@ -90,7 +90,7 @@ def formatTrack( "playlist_number": playlist_index or 0, } - formatted_track = template.format(**track_dict) + formatted_track = template.format(**track_dict).strip() disallowed_chars = r'[\\:"*?<>|]+' invalid_chars = re.findall(disallowed_chars, formatted_track) @@ -152,7 +152,7 @@ def formatResource( elif isinstance(resource, Video): resource_dict.update({"quality": resource.quality}) - formatted_template = template.format(**resource_dict) + formatted_template = template.format(**resource_dict).strip() disallowed_chars = r'[\\:"*?<>|]+' invalid_chars = re.findall(disallowed_chars, formatted_template)