diff --git a/mopidy/exceptions.py b/mopidy/exceptions.py index 2c53e3e4..025d8fad 100644 --- a/mopidy/exceptions.py +++ b/mopidy/exceptions.py @@ -18,3 +18,7 @@ class MopidyException(Exception): class ExtensionError(MopidyException): pass + + +class ScannerError(MopidyException): + pass diff --git a/mopidy/scanner.py b/mopidy/scanner.py index 5a3772af..908958f8 100644 --- a/mopidy/scanner.py +++ b/mopidy/scanner.py @@ -27,15 +27,11 @@ pygst.require('0.10') import gst import gst.pbutils -from mopidy import config as config_lib, ext, exceptions +from mopidy import config as config_lib, exceptions, ext from mopidy.models import Track, Artist, Album from mopidy.utils import log, path, versioning -class ScannerError(exceptions.ExtensionError): - pass - - def main(): args = parse_args() # TODO: support config files and overrides (shared from main?) @@ -116,7 +112,7 @@ def main(): track = translator(data) local_updater.add(track) logging.debug('Added %s', track.uri) - except ScannerError as error: + except exceptions.ScannerError as error: logging.warning('Failed %s: %s', uri, error) logging.info('Done scanning; commiting changes.') @@ -197,13 +193,13 @@ class Scanner(object): info = self.discoverer.discover_uri(uri) except gobject.GError as e: # Loosing traceback is non-issue since this is from C code. - raise ScannerError(e) + raise exceptions.ScannerError(e) data = {} audio_streams = info.get_audio_streams() if not audio_streams: - raise ScannerError('Did not find any audio streams.') + raise exceptions.ScannerError('Did not find any audio streams.') for stream in audio_streams: taglist = stream.get_tags() @@ -223,7 +219,7 @@ class Scanner(object): data[b'duration'] = info.get_duration() // gst.MSECOND if data[b'duration'] == 0: - raise ScannerError('Zero length audio streams are not supported.') + raise exceptions.ScannerError('Rejecting zero length audio.') return data diff --git a/tests/scanner_test.py b/tests/scanner_test.py index be8cbd40..deae4835 100644 --- a/tests/scanner_test.py +++ b/tests/scanner_test.py @@ -2,7 +2,8 @@ from __future__ import unicode_literals import unittest -from mopidy.scanner import Scanner, ScannerError, translator +from mopidy import exceptions +from mopidy.scanner import Scanner, translator from mopidy.models import Track, Artist, Album from mopidy.utils import path as path_lib @@ -155,7 +156,7 @@ class ScannerTest(unittest.TestCase): key = uri[len('file://'):] try: self.data[key] = scanner.scan(uri) - except ScannerError as error: + except exceptions.ScannerError as error: self.errors[key] = error def check(self, name, key, value):