From 98f2f67663c7147a205e8a3462fcbebe67c51291 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Thu, 6 May 2010 00:50:22 +0200
Subject: [PATCH] Library needs to set id

---
 mopidy/utils.py        |  1 +
 tests/backends/base.py |  6 +++---
 tests/utils_test.py    | 29 ++++++++++++++++-------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/mopidy/utils.py b/mopidy/utils.py
index c0caf2fe..758fe2e3 100644
--- a/mopidy/utils.py
+++ b/mopidy/utils.py
@@ -219,6 +219,7 @@ def _convert_mpd_data(data, tracks, music_dir):
 
     track_kwargs['uri'] = path_to_uri(music_dir, path)
     track_kwargs['length'] = int(data.get('time', 0)) * 1000
+    track_kwargs['id'] = len(tracks)
 
     track = Track(**track_kwargs)
     tracks.add(track)
diff --git a/tests/backends/base.py b/tests/backends/base.py
index dfc8a4a4..129ac4ff 100644
--- a/tests/backends/base.py
+++ b/tests/backends/base.py
@@ -1084,10 +1084,10 @@ class BaseLibraryControllerTest(object):
         Album(name='album2', artists=artists[1:2]),
         Album()]
     tracks = [Track(name='track1', length=4000, artists=artists[:1],
-            album=albums[0], uri='file://' + data_folder('uri1')),
+            album=albums[0], uri='file://' + data_folder('uri1'), id=0),
         Track(name='track2', length=4000, artists=artists[1:2],
-            album=albums[1], uri='file://' + data_folder('uri2')),
-        Track()]
+            album=albums[1], uri='file://' + data_folder('uri2'), id=1),
+        Track(id=3)]
 
     def setUp(self):
         self.backend = self.backend_class(mixer=DummyMixer())
diff --git a/tests/utils_test.py b/tests/utils_test.py
index 5ee8797b..59f77ec7 100644
--- a/tests/utils_test.py
+++ b/tests/utils_test.py
@@ -144,21 +144,21 @@ expected_albums = [Album(name='albumname', artists=expected_artists,
     num_tracks=2)]
 expected_tracks = []
 
-def generate_track(path):
+def generate_track(path, ident):
     uri = path_to_uri(data_folder(path))
     track = Track(name='trackname', artists=expected_artists, track_no=1,
-        album=expected_albums[0], length=4000, uri=uri)
+        album=expected_albums[0], length=4000, uri=uri, id=ident)
     expected_tracks.append(track)
 
-generate_track('song1.mp3')
-generate_track('song2.mp3')
-generate_track('song3.mp3')
-generate_track('subdir1/song4.mp3')
-generate_track('subdir1/song5.mp3')
-generate_track('subdir2/song6.mp3')
-generate_track('subdir2/song7.mp3')
-generate_track('subdir1/subsubdir/song8.mp3')
-generate_track('subdir1/subsubdir/song9.mp3')
+generate_track('song1.mp3', 6)
+generate_track('song2.mp3', 7)
+generate_track('song3.mp3', 8)
+generate_track('subdir1/song4.mp3', 2)
+generate_track('subdir1/song5.mp3', 3)
+generate_track('subdir2/song6.mp3', 4)
+generate_track('subdir2/song7.mp3', 5)
+generate_track('subdir1/subsubdir/song8.mp3', 0)
+generate_track('subdir1/subsubdir/song9.mp3', 1)
 
 class MPDTagCacheToTracksTest(unittest.TestCase):
     def test_emtpy_cache(self):
@@ -169,7 +169,10 @@ class MPDTagCacheToTracksTest(unittest.TestCase):
     def test_simple_cache(self):
         tracks = parse_mpd_tag_cache(data_folder('simple_tag_cache'),
             data_folder(''))
-        self.assertEqual(expected_tracks[0], list(tracks)[0])
+        uri = path_to_uri(data_folder('song1.mp3'))
+        track = Track(name='trackname', artists=expected_artists, track_no=1,
+            album=expected_albums[0], length=4000, uri=uri, id=0)
+        self.assertEqual(set([track]), tracks)
 
     def test_advanced_cache(self):
         tracks = parse_mpd_tag_cache(data_folder('advanced_tag_cache'),
@@ -187,4 +190,4 @@ class MPDTagCacheToTracksTest(unittest.TestCase):
         tracks = parse_mpd_tag_cache(data_folder('blank_tag_cache'),
             data_folder(''))
         uri = path_to_uri(data_folder('song1.mp3'))
-        self.assertEqual(set([Track(uri=uri, length=4000)]), tracks)
+        self.assertEqual(set([Track(uri=uri, length=4000, id=0)]), tracks)