Move mopidy.__main__._get_class to mopidy.get_class
This commit is contained in:
parent
4729605a6b
commit
34b7f679f5
@ -1,11 +1,23 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
from mopidy import settings as raw_settings
|
from mopidy import settings as raw_settings
|
||||||
|
|
||||||
|
logger = logging.getLogger('mopidy')
|
||||||
|
|
||||||
def get_version():
|
def get_version():
|
||||||
return u'0.1.dev'
|
return u'0.1.dev'
|
||||||
|
|
||||||
def get_mpd_protocol_version():
|
def get_mpd_protocol_version():
|
||||||
return u'0.16.0'
|
return u'0.16.0'
|
||||||
|
|
||||||
|
def get_class(name):
|
||||||
|
module_name = name[:name.rindex('.')]
|
||||||
|
class_name = name[name.rindex('.') + 1:]
|
||||||
|
logger.info('Loading: %s from %s', class_name, module_name)
|
||||||
|
module = __import__(module_name, globals(), locals(), [class_name], -1)
|
||||||
|
class_object = getattr(module, class_name)
|
||||||
|
return class_object
|
||||||
|
|
||||||
class SettingsError(Exception):
|
class SettingsError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@ -6,15 +6,15 @@ import sys
|
|||||||
sys.path.insert(0,
|
sys.path.insert(0,
|
||||||
os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
|
os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
|
||||||
|
|
||||||
from mopidy import settings, SettingsError
|
from mopidy import get_class, settings, SettingsError
|
||||||
from mopidy.mpd.server import MpdServer
|
from mopidy.mpd.server import MpdServer
|
||||||
|
|
||||||
logger = logging.getLogger('mopidy')
|
logger = logging.getLogger('mopidy')
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
_setup_logging(2)
|
_setup_logging(2)
|
||||||
mixer = _get_class(settings.MIXER)()
|
mixer = get_class(settings.MIXER)()
|
||||||
backend = _get_class(settings.BACKENDS[0])(mixer=mixer)
|
backend = get_class(settings.BACKENDS[0])(mixer=mixer)
|
||||||
MpdServer(backend=backend)
|
MpdServer(backend=backend)
|
||||||
asyncore.loop()
|
asyncore.loop()
|
||||||
|
|
||||||
@ -30,14 +30,6 @@ def _setup_logging(verbosity_level):
|
|||||||
level=level,
|
level=level,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _get_class(name):
|
|
||||||
module_name = name[:name.rindex('.')]
|
|
||||||
class_name = name[name.rindex('.') + 1:]
|
|
||||||
logger.info('Loading: %s from %s', class_name, module_name)
|
|
||||||
module = __import__(module_name, globals(), locals(), [class_name], -1)
|
|
||||||
class_object = getattr(module, class_name)
|
|
||||||
return class_object
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
try:
|
try:
|
||||||
main()
|
main()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user