Use album.release where possible, restrict

musicbrainz2.webservice.ReleaseIncludes to tracks.

diff --git a/fa-rip b/fa-rip
index cfd3967..d13776f 100755 (executable)
--- a/fa-rip
+++ b/fa-rip
@@ -146,24 +146,23 @@ def tags(disc, trackcount, mb=True):
     if not mb:
         return
 
-    include = musicbrainz2.webservice.ReleaseIncludes(artist=True, tracks=True)
+    include = musicbrainz2.webservice.ReleaseIncludes(tracks=True)
     q = musicbrainz2.webservice.Query()
     filter = musicbrainz2.webservice.ReleaseFilter(discId=disc.getId())
 
     i = 0
     for album in q.getReleases(filter):
         i += 1
-        r = q.getReleaseById(album.release.id, include)
-        various = not r.isSingleArtistRelease()
+        various = not album.release.isSingleArtistRelease()
 
         if various and not seen_various:
             seen_various = True
             tags_file('candidate-tags-0v', trackcount, True)
 
         tags_file('candidate-tags-' + str(i), trackcount, various,
-                  r.artist.name, r.title,
+                  album.release.artist.name, album.release.title,
                   album.release.getReleaseEventsAsDict(),
-                  r.tracks)
+                  q.getReleaseById(album.release.id, include).tracks)
 
 def rip(device, trackcount, single_file):
     if device == None: