From 045a5a58c54803541fe77f4f02af42b506fe1a98 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 26 Oct 2010 23:41:12 +0200 Subject: [PATCH] Move uri to scanner data --- mopidy/scanner.py | 5 +++-- tests/scanner_test.py | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mopidy/scanner.py b/mopidy/scanner.py index 288c8fd1..f3792d5a 100644 --- a/mopidy/scanner.py +++ b/mopidy/scanner.py @@ -57,8 +57,9 @@ class Scanner(object): def process_tags(self, bus, message): data = message.parse_tag() - uri = self.uribin.get_property('uri') - self.data_callback(uri, dict([(k, data[k]) for k in data.keys()])) + data = dict([(k, data[k]) for k in data.keys()]) + data['uri'] = self.uribin.get_property('uri') + self.data_callback(data) self.next_uri() def process_error(self, bus, message): diff --git a/tests/scanner_test.py b/tests/scanner_test.py index 7ba6d56c..b3f214a9 100644 --- a/tests/scanner_test.py +++ b/tests/scanner_test.py @@ -52,8 +52,8 @@ class ScannerTest(unittest.TestCase): name = data_folder(name) self.assertEqual(self.data[name][key], value) - def data_callback(self, uri, data): - uri = uri[len('file://'):] + def data_callback(self, data): + uri = data['uri'][len('file://'):] self.data[uri] = data def error_callback(self, uri, errors): @@ -68,6 +68,11 @@ class ScannerTest(unittest.TestCase): self.scan('scanner/simple') self.assert_(not self.errors) + def test_uri_is_set(self): + self.scan('scanner/simple') + self.check('scanner/simple/song1.mp3', 'uri', 'file://' + + data_folder('scanner/simple/song1.mp3')) + def test_artist_is_set(self): self.scan('scanner/simple') self.check('scanner/simple/song1.mp3', 'artist', 'name')