From 830e445bfed4edbb8b4d15c10e79619ae475434a Mon Sep 17 00:00:00 2001 From: Michael Wiencek Date: Tue, 14 Jun 2011 02:50:55 -0500 Subject: [PATCH] "format" tag mistakenly renamed to "media" --- picard/album.py | 4 ++-- picard/ui/itemviews.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/picard/album.py b/picard/album.py index eab496d5f..0e6559b91 100644 --- a/picard/album.py +++ b/picard/album.py @@ -131,7 +131,7 @@ class Album(DataObject, Item): tm['discnumber'] = discnumber tm['discsubtitle'] = discsubtitle tm['totaltracks'] = totaltracks - if format: tm['media'] = format + if format: tm['format'] = format track_to_metadata(node, config=self.config, track=t) t._customize_metadata(node, release_node, script, parser, ignore_tags) @@ -169,7 +169,7 @@ class Album(DataObject, Item): if f in formats: formats[f] += 1 else: formats[f] = 1 if formats: - version["media"] = " + ".join(["%s%s" % (str(j)+u"×" if j>1 else "", RELEASE_FORMATS[i]) + version["format"] = " + ".join(["%s%s" % (str(j)+u"×" if j>1 else "", RELEASE_FORMATS[i]) for i, j in formats.items()]) self.other_versions.append(version) self.other_versions.sort(key=lambda x: x["date"]) diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py index 553693601..9880eb31d 100644 --- a/picard/ui/itemviews.py +++ b/picard/ui/itemviews.py @@ -379,8 +379,8 @@ class BaseTreeView(QtGui.QTreeWidget): if "country" in version: try: name.append(RELEASE_COUNTRIES[version["country"]]) except KeyError: name.append(version["country"]) - if "media" in version: - name.append(version["media"]) + if "format" in version: + name.append(version["format"]) version_name = " / ".join(name).replace('&', '&&') action = releases_menu.addAction(version_name or _('[no release info]')) action.setData(QtCore.QVariant(i))