From 39da17abd875b2c8ced1e5227c690d8f2a82d1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Mon, 19 Mar 2007 07:47:26 -0700 Subject: [PATCH] %musicbrainz_albumid% not working in file renaming. (#2543) --- NEWS.txt | 1 + picard/script.py | 4 +++- picard/ui/options/naming.py | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS.txt b/NEWS.txt index b5c61489c..609aff94e 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -2,6 +2,7 @@ Version 0.9.0alpha6 - 2007-03-XX * Bug Fixes: * Artist names from ARs should be translated, too. * Freeze after answering no to "download the new version" prompt. (#2542) + * %musicbrainz_albumid% not working in file renaming. (#2543) * Internals: * The browser integration HTTP server rewritten using QTcpServer. diff --git a/picard/script.py b/picard/script.py index 33f5b45b9..1b5a5e676 100644 --- a/picard/script.py +++ b/picard/script.py @@ -41,7 +41,9 @@ class ScriptVariable(object): return '' % self.name def eval(self, state): - name = self.name.replace("_", "~") + name = self.name + if name.startswith(u"_"): + name = u"~" + name[1:] return state.context.get(name, u"") diff --git a/picard/ui/options/naming.py b/picard/ui/options/naming.py index 1fcebe256..00668fcf5 100644 --- a/picard/ui/options/naming.py +++ b/picard/ui/options/naming.py @@ -144,6 +144,10 @@ class NamingOptionsPage(OptionsPage): file.metadata['releasetype'] = 'Album' file.metadata['releasestatus'] = 'Official' file.metadata['~extension'] = 'mp3' + file.metadata['musicbrainz_albumid'] = '2c053984-4645-4699-9474-d2c35c227028' + file.metadata['musicbrainz_albumartistid'] = 'b10bbbfc-cf9e-42e0-be17-e2c3e1d2600d' + file.metadata['musicbrainz_artistid'] = 'b10bbbfc-cf9e-42e0-be17-e2c3e1d2600d' + file.metadata['musicbrainz_trackid'] = '898a2916-f64d-48d3-ab1a-3446fb450448' filename = file.make_filename(settings=settings) self.ui.example_filename.setText(filename) @@ -161,6 +165,10 @@ class NamingOptionsPage(OptionsPage): file.metadata['releasestatus'] = 'Official' file.metadata['compilation'] = '1' file.metadata['~extension'] = 'mp3' + file.metadata['musicbrainz_albumid'] = 'bcc97e8a-2055-400b-a6ed-83288285c6fc' + file.metadata['musicbrainz_albumartistid'] = '89ad4ac3-39f7-470e-963a-56509c546377' + file.metadata['musicbrainz_artistid'] = '06704773-aafe-4aca-8833-b449e0a6467f' + file.metadata['musicbrainz_trackid'] = 'd92837ee-b1e4-4649-935f-e433c3e5e429' filename = file.make_filename(settings=settings) self.ui.example_va_filename.setText(filename)