[SCM] morituri/master: * morituri/common/program.py: Add Musicbrainz command.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 516a01d47aa54477d5cf2531e07980806cd43556
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Thu Sep 15 14:22:37 2011 +0000

    	* morituri/common/program.py:
    	  Add Musicbrainz command.

diff --git a/ChangeLog b/ChangeLog
index 0a65874..84d511d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/program.py:
+	  Add Musicbrainz command.
+
 2011-09-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/program.py:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 3a48987..8ca2a2e 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -133,6 +133,7 @@ def getMetadata(release):
     return metadata
 
 
+# see http://bugs.musicbrainz.org/browser/python-musicbrainz2/trunk/examples/ripper.py
 def musicbrainz(discid):
     """
     @rtype: list of L{DiscMetadata}
@@ -174,7 +175,7 @@ def musicbrainz(discid):
         # tracks.  Query the web service once again to get all data we need.
         try:
             inc = mbws.ReleaseIncludes(artist=True, tracks=True,
-                releaseEvents=True)
+                releaseEvents=True, discs=True)
             # Arid - Under the Cold Street Lights has getId() None
             if release.getId():
                 release = query.getReleaseById(release.getId(), inc)
@@ -300,7 +301,7 @@ class Program(log.Loggable):
         @type  outdir:   unicode
         @param template: the template for writing the file
         @type  template: unicode
-        @param i:        track number (0 for HTOA)
+        @param i:        track number (0 for HTOA, or for disc)
         @type  i:        int
 
         @rtype: unicode

-- 
morituri packaging