Merge branch 'sophist_compilation_TCMP_adjustments' of git://github.com/Sophist-UK/picard into Sophist-UK-sophist_compilation_TCMP_adjustments

Conflicts:
	NEWS.txt

NEWS.txt

@@ -15,6 +15,7 @@
  * Refresh of Albums using Ctrl-R is now more responsive during batch lookups.
  * Main window is now emitting a "selection_updated" signal, plugin api version bumps to 1.3.0
  * Append system information to user-agent string
+ * Compilation tag/variable aligned with iTunes, set only for Various Artists type compilations.
 
 Version 1.2 - 2013-03-30
  * Picard now requires at least Python 2.6

picard/album.py

@@ -194,8 +194,8 @@ class Album(DataObject, Item):
             return
 
         if not self._tracks_loaded:
-            artists = set()
             totalalbumtracks = 0
+            va = self._new_metadata['musicbrainz_albumartistid'] == VARIOUS_ARTISTS_ID
 
             djmix_ars = {}
             if hasattr(self._new_metadata, "_djmix_ars"):
@@ -221,7 +221,8 @@ class Album(DataObject, Item):
                     track._customize_metadata()
 
                     self._new_metadata.length += tm.length
-                    artists.add(tm["musicbrainz_artistid"])
+                    if va:
+                        tm["compilation"] = "1"
 
                     # Run track metadata plugins
                     try:
@@ -233,8 +234,6 @@ class Album(DataObject, Item):
 
             for track in self._new_tracks:
                 track.metadata["~totalalbumtracks"] = totalalbumtracks
-                if len(artists) > 1:
-                    track.metadata["compilation"] = "1"
 
             del self._release_node
             self._tracks_loaded = True

picard/util/tags.py

@@ -66,7 +66,7 @@ TAG_NAMES = {
     'acoustid_fingerprint': N_('AcoustID Fingerprint'),
     'discid': N_('Disc Id'),
     'website': N_('Website'),
-    'compilation': N_('Compilation'),
+    'compilation': N_('Compilation (iTunes)'),
     'comment:': N_('Comment'),
     'genre': N_('Genre'),
     'encodedby': N_('Encoded By'),