andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use module imports

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-09-28 11:40:31 +02:00
parent fe80189acc
commit 3c66b3a011
3 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mopidy/__main__.py
View File

@ -28,14 +28,10 @@ sys.path.insert(0,
os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
from mopidy import (get_version, settings, OptionalDependencyError,
SettingsError, DATA_PATH, SETTINGS_PATH, SETTINGS_FILE)
from mopidy.audio import Audio
from mopidy.core import Core
from mopidy.utils import get_class, process
import mopidy
from mopidy import audio, core, settings, utils
from mopidy.utils import log, path, process
from mopidy.utils.deps import list_deps_optparse_callback
from mopidy.utils.log import setup_logging
from mopidy.utils.path import get_or_create_folder, get_or_create_file
from mopidy.utils.settings import list_settings_optparse_callback
@ -47,7 +43,7 @@ def main():
loop = gobject.MainLoop()
options = parse_options()
try:
setup_logging(options.verbosity_level, options.save_debug_log)
log.setup_logging(options.verbosity_level, options.save_debug_log)
check_old_folders()
setup_settings(options.interactive)
audio = setup_audio()
@ -55,12 +51,12 @@ def main():
core = setup_core(audio, backend)
setup_frontends(core)
loop.run()
except SettingsError as e:
logger.error(e.message)
except mopidy.SettingsError as ex:
logger.error(ex.message)
except KeyboardInterrupt:
logger.info(u'Interrupted. Exiting...')
except Exception as e:
logger.exception(e)
except Exception as ex:
logger.exception(ex)
finally:
loop.quit()
stop_frontends()
@ -71,7 +67,7 @@ def main():
def parse_options():
parser = optparse.OptionParser(version=u'Mopidy %s' % get_version())
parser = optparse.OptionParser(version=u'Mopidy %s' % mopidy.get_version())
parser.add_option('--help-gst',
action='store_true', dest='help_gst',
help='show GStreamer help options')
@ -104,57 +100,57 @@ def check_old_folders():
logger.warning(u'Old settings folder found at %s, settings.py should be '
'moved to %s, any cache data should be deleted. See release notes '
'for further instructions.', old_settings_folder, SETTINGS_PATH)
'for further instructions.', old_settings_folder, mopidy.SETTINGS_PATH)
def setup_settings(interactive):
get_or_create_folder(SETTINGS_PATH)
get_or_create_folder(DATA_PATH)
get_or_create_file(SETTINGS_FILE)
path.get_or_create_folder(mopidy.SETTINGS_PATH)
path.get_or_create_folder(mopidy.DATA_PATH)
path.get_or_create_file(mopidy.SETTINGS_FILE)
try:
settings.validate(interactive)
except SettingsError, e:
logger.error(e.message)
except mopidy.SettingsError as ex:
logger.error(ex.message)
sys.exit(1)
def setup_audio():
return Audio.start().proxy()
return audio.Audio.start().proxy()
def stop_audio():
process.stop_actors_by_class(Audio)
process.stop_actors_by_class(audio.Audio)
def setup_backend(audio):
return get_class(settings.BACKENDS[0]).start(audio=audio).proxy()
return utils.get_class(settings.BACKENDS[0]).start(audio=audio).proxy()
def stop_backend():
process.stop_actors_by_class(get_class(settings.BACKENDS[0]))
process.stop_actors_by_class(utils.get_class(settings.BACKENDS[0]))
def setup_core(audio, backend):
return Core.start(audio=audio, backend=backend).proxy()
return core.Core.start(audio=audio, backend=backend).proxy()
def stop_core():
process.stop_actors_by_class(Core)
process.stop_actors_by_class(core.Core)
def setup_frontends(core):
for frontend_class_name in settings.FRONTENDS:
try:
get_class(frontend_class_name).start(core=core)
except OptionalDependencyError as e:
logger.info(u'Disabled: %s (%s)', frontend_class_name, e)
utils.get_class(frontend_class_name).start(core=core)
except mopidy.OptionalDependencyError as ex:
logger.info(u'Disabled: %s (%s)', frontend_class_name, ex)
def stop_frontends():
for frontend_class_name in settings.FRONTENDS:
try:
process.stop_actors_by_class(get_class(frontend_class_name))
except OptionalDependencyError:
process.stop_actors_by_class(utils.get_class(frontend_class_name))
except mopidy.OptionalDependencyError:
pass

4
mopidy/core/current_playlist.py
View File

@ -4,7 +4,7 @@ import random
from mopidy.models import CpTrack
from .listener import CoreListener
from . import listener
logger = logging.getLogger('mopidy.core')
@ -241,4 +241,4 @@ class CurrentPlaylistController(object):
def _trigger_playlist_changed(self):
logger.debug(u'Triggering playlist changed event')
CoreListener.send('playlist_changed')
listener.CoreListener.send('playlist_changed')

16
mopidy/core/playback.py
View File

@ -1,7 +1,7 @@
import logging
import random
from .listener import CoreListener
from . import listener
logger = logging.getLogger('mopidy.backends.base')
@ -488,7 +488,7 @@ class PlaybackController(object):
logger.debug(u'Triggering track playback paused event')
if self.current_track is None:
return
CoreListener.send('track_playback_paused',
listener.CoreListener.send('track_playback_paused',
track=self.current_track,
time_position=self.time_position)
@ -496,7 +496,7 @@ class PlaybackController(object):
logger.debug(u'Triggering track playback resumed event')
if self.current_track is None:
return
CoreListener.send('track_playback_resumed',
listener.CoreListener.send('track_playback_resumed',
track=self.current_track,
time_position=self.time_position)
@ -504,26 +504,26 @@ class PlaybackController(object):
logger.debug(u'Triggering track playback started event')
if self.current_track is None:
return
CoreListener.send('track_playback_started',
listener.CoreListener.send('track_playback_started',
track=self.current_track)
def _trigger_track_playback_ended(self):
logger.debug(u'Triggering track playback ended event')
if self.current_track is None:
return
CoreListener.send('track_playback_ended',
listener.CoreListener.send('track_playback_ended',
track=self.current_track,
time_position=self.time_position)
def _trigger_playback_state_changed(self, old_state, new_state):
logger.debug(u'Triggering playback state change event')
CoreListener.send('playback_state_changed',
listener.CoreListener.send('playback_state_changed',
old_state=old_state, new_state=new_state)
def _trigger_options_changed(self):
logger.debug(u'Triggering options changed event')
CoreListener.send('options_changed')
listener.CoreListener.send('options_changed')
def _trigger_seeked(self, time_position):
logger.debug(u'Triggering seeked event')
CoreListener.send('seeked', time_position=time_position)
listener.CoreListener.send('seeked', time_position=time_position)