andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move uri to scanner data

Browse Source
This commit is contained in:
Thomas Adamcik 2010-10-26 23:41:12 +02:00
parent 7e02617422
commit 045a5a58c5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mopidy/scanner.py
View File

@ -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):

9
tests/scanner_test.py
View File

@ -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')