From d9d393ac218ffa176d17ab1e6d0e957331b8ecb4 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 28 Oct 2010 00:47:18 +0200 Subject: [PATCH] Ensure that scanner does not die on non-existant folders --- mopidy/scanner.py | 5 +++-- tests/scanner_test.py | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mopidy/scanner.py b/mopidy/scanner.py index 491fc00b..3d5507dc 100644 --- a/mopidy/scanner.py +++ b/mopidy/scanner.py @@ -99,8 +99,9 @@ class Scanner(object): self.pipe.set_state(gst.STATE_PAUSED) def start(self): - self.next_uri() - self.loop.run() + if self.uris: + self.next_uri() + self.loop.run() def stop(self): self.pipe.set_state(gst.STATE_NULL) diff --git a/tests/scanner_test.py b/tests/scanner_test.py index d6639ce1..895c73a0 100644 --- a/tests/scanner_test.py +++ b/tests/scanner_test.py @@ -90,6 +90,10 @@ class ScannerTest(unittest.TestCase): self.scan('scanner/simple') self.check('scanner/simple/song1.mp3', 'title', 'trackname') + def test_nonexistant_folder_does_not_fail(self): + self.scan('scanner/does-not-exist') + self.assert_(not self.errors) + def test_other_media_is_ignored(self): self.scan('scanner/image') self.assert_(self.errors)