From 90fbf69b85ae10fa4495294456e68c4c53d810dc Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Tue, 2 Nov 2010 01:00:00 +0100
Subject: [PATCH] Add albumartistid to scanner

---
 mopidy/scanner.py     | 9 ++++++---
 tests/scanner_test.py | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mopidy/scanner.py b/mopidy/scanner.py
index e1899c4b..a7d2e664 100644
--- a/mopidy/scanner.py
+++ b/mopidy/scanner.py
@@ -43,9 +43,6 @@ def translator(data):
     if 'album-artist' in data:
         albumartist_kwargs['name'] = data['album-artist']
 
-    if albumartist_kwargs:
-        album_kwargs['artists'] = [Artist(**albumartist_kwargs)]
-
     if 'musicbrainz-trackid' in data:
         track_kwargs['musicbrainz_id'] = data['musicbrainz-trackid']
 
@@ -55,6 +52,12 @@ def translator(data):
     if 'musicbrainz-albumid' in data:
         album_kwargs['musicbrainz_id'] = data['musicbrainz-albumid']
 
+    if 'musicbrainz-albumartistid' in data:
+        albumartist_kwargs['musicbrainz_id'] = data['musicbrainz-albumartistid']
+
+    if albumartist_kwargs:
+        album_kwargs['artists'] = [Artist(**albumartist_kwargs)]
+
     track_kwargs['uri'] = data['uri']
     track_kwargs['length'] = data['duration']
     track_kwargs['album'] = Album(**album_kwargs)
diff --git a/tests/scanner_test.py b/tests/scanner_test.py
index a18b64a1..a1b53bcf 100644
--- a/tests/scanner_test.py
+++ b/tests/scanner_test.py
@@ -28,6 +28,7 @@ class TranslatorTest(unittest.TestCase):
             'musicbrainz-trackid': 'mbtrackid',
             'musicbrainz-albumid': 'mbalbumid',
             'musicbrainz-artistid': 'mbartistid',
+            'musicbrainz-albumartistid': 'mbalbumartistid',
         }
 
         self.album = {
@@ -43,6 +44,7 @@ class TranslatorTest(unittest.TestCase):
 
         self.albumartist = {
             'name': 'albumartistname',
+            'musicbrainz_id': 'mbalbumartistid',
         }
 
         self.track = {
@@ -114,6 +116,11 @@ class TranslatorTest(unittest.TestCase):
         del self.albumartist['name']
         self.check()
 
+    def test_missing_album_artist_musicbrainz_id(self):
+        del self.data['musicbrainz-albumartistid']
+        del self.albumartist['musicbrainz_id']
+        self.check()
+
     def test_missing_date(self):
         del self.data['date']
         del self.track['date']