Merge lp:~openshift/picard/commlang into lp:~musicbrainz-developers/picard/trunk

[Carlin Mangar]

[lp:~openshift/picard/commlang]

1006. By Philipp Wolfer on 2009-11-01

Fixed loading of remaster ARs and release events with empty date in original release date plugin.

1007. By Philipp Wolfer on 2009-11-01

Fixed deletion of all COMM frames in ID3, which was introduced in rev. 989

1008. By Philipp Wolfer on 2009-11-01

Release 0.12.1

1009. By Carlin Mangar on 2009-11-02

Preserves language of comments while retaining backward compat.

[Philipp Wolfer (phw)]

This is now mostly backward compatible, although

I like the functionality and I have no better idea to implement this cleanly. I don't believe there are many (any?) plugins out there which read the comments in this way. Lastfmplus writes comments, but that would not break.

The only thing about the patch is that we maybe should set the language to "eng" by default instead of not setting it at all.

Lukáš, what do you think?

review: Abstain

[Carlin Mangar (openshift)]

Personally, this is better, some of my files have different types of comments, some with eng, some without. It's not in the specification to force eng on the comment, so I wouldn't want Picard to be cleaning up stuff unnecessarily. We could have an option for that if users want it, but is it ok to force eng on every comment that has no language set? I think we could work on some way to set the default, but I prefer compatibility over setting everything.

Unmerged revisions

1009. By Carlin Mangar on 2009-11-02

Preserves language of comments while retaining backward compat.

=== modified file 'picard/formats/id3.py'
--- picard/formats/id3.py	2009-11-01 17:49:45 +0000
+++ picard/formats/id3.py	2009-11-02 10:11:15 +0000
@@ -146,6 +146,9 @@
                 elif frameid == 'COMM':
                     for text in frame.text:
                         if text:
+                            if frame.lang:
+                            metadata.add('%s:%s:%s' % (name, frame.desc, frame.lang), unicode(text))
+                            else:
                             metadata.add('%s:%s' % (name, frame.desc), unicode(text))
                 else:
                     metadata.add(name, unicode(frame))
@@ -242,12 +245,14 @@
                 for value in values:
                     tmcl.people.append([role, value])
             elif name.startswith('comment:'):
-                desc = name.split(':', 1)[1]
+                lang = None
+                try: comm, desc, lang = name.split(':')
+                except ValueError: desc = name.split(':',1)[1]
                 if desc.lower()[:4]=="itun":
                     tags.delall('COMM:' + desc)
                     tags.add(id3.COMM(encoding=0, desc=desc, lang='eng', text=[v+u'\x00' for v in values]))
                 else:
-                    tags.add(id3.COMM(encoding=encoding, desc=desc, lang='eng', text=values))
+                    tags.add(id3.COMM(encoding=encoding, desc=desc, lang=lang, text=values))
             elif name.startswith('lyrics:') or name == 'lyrics':
                 if ':' in name:
                     desc = name.split(':', 1)[1]