From a6c3b78a6ff5c35c13d6aa8be9fb9f661be59901 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 14 Nov 2013 23:12:42 +0100 Subject: [PATCH] local: Convert local scanning to new commands. Also moves mopidy.backends.local.scan to .command --- mopidy/backends/local/__init__.py | 6 +++--- mopidy/backends/local/{scan.py => command.py} | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) rename mopidy/backends/local/{scan.py => command.py} (94%) diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index ad70279b..3d425084 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -37,6 +37,6 @@ class Extension(ext.Extension): from .library import LocalLibraryUpdateProvider return [LocalLibraryUpdateProvider] - def get_sub_commands(self): - from .scan import ScanSubCommand - return [ScanSubCommand] + def get_command(self): + from .command import LocalCommand + return LocalCommand() diff --git a/mopidy/backends/local/scan.py b/mopidy/backends/local/command.py similarity index 94% rename from mopidy/backends/local/scan.py rename to mopidy/backends/local/command.py index 5b57e59b..db1a392f 100644 --- a/mopidy/backends/local/scan.py +++ b/mopidy/backends/local/command.py @@ -14,9 +14,14 @@ from . import translator logger = logging.getLogger('mopidy.backends.local.scan') -class ScanSubCommand(base.BaseSubCommandProvider): - name = 'scan' - help = 'scan local media files' +class LocalCommand(base.Command): + def __init__(self): + super(LocalCommand, self).__init__() + self.add_child('scan', ScanCommand()) + + +class ScanCommand(base.Command): + """Scan local media files""" def run(self, args, config, extensions): media_dir = config['local']['media_dir']