Make it possible to stop scanner more cleanly

bin/mopidy-scan

@@ -20,7 +20,10 @@ if __name__ == '__main__':
     print >> sys.stderr, 'Scanning %s' % settings.LOCAL_MUSIC_PATH
 
     scanner = Scanner(settings.LOCAL_MUSIC_PATH, store, debug)
-    scanner.start()
+    try:
+        scanner.start()
+    except KeyboardInterrupt:
+        scanner.stop()
 
     print >> sys.stderr, 'Done'
 

mopidy/scanner.py

@@ -82,8 +82,11 @@ class Scanner(object):
         data = dict([(k, data[k]) for k in data.keys()])
         data['uri'] = unicode(self.uribin.get_property('uri'))
         data['duration'] = self.get_duration()
-        self.data_callback(data)
-        self.next_uri()
+        try:
+            self.data_callback(data)
+            self.next_uri()
+        except KeyboardInterrupt:
+            self.stop()
 
     def process_error(self, bus, message):
         if self.error_callback: