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

Don't use pykka callbacks on_start and on_stop.

Browse Source 
Introduce setup() and teardown() for Core.
This commit is contained in:
Jens Luetjen 2016-01-09 12:00:35 +01:00
parent 46bb780a46
commit a9327c559f
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mopidy/commands.py
View File

@ -291,6 +291,7 @@ class RootCommand(Command):
mixer_class = self.get_mixer_class(config, args.registry['mixer'])
backend_classes = args.registry['backend']
frontend_classes = args.registry['frontend']
core = None
exit_status_code = 0
try:
@ -316,7 +317,7 @@ class RootCommand(Command):
finally:
loop.quit()
self.stop_frontends(frontend_classes)
self.stop_core()
self.stop_core(core)
self.stop_backends(backend_classes)
self.stop_audio()
if mixer_class is not None:
@ -392,8 +393,10 @@ class RootCommand(Command):
def start_core(self, config, mixer, backends, audio):
logger.info('Starting Mopidy core')
return Core.start(
core = Core.start(
config=config, mixer=mixer, backends=backends, audio=audio).proxy()
core.setup().get()
return core
def start_frontends(self, config, frontend_classes, core):
logger.info(
@ -410,8 +413,10 @@ class RootCommand(Command):
for frontend_class in frontend_classes:
process.stop_actors_by_class(frontend_class)
def stop_core(self):
def stop_core(self, core):
logger.info('Stopping Mopidy core')
if core:
core.teardown().get()
process.stop_actors_by_class(Core)
def stop_backends(self, backend_classes):

30
mopidy/core/actor.py
View File

@ -138,43 +138,39 @@ class Core(
self.playback._stream_title = title
CoreListener.send('stream_title_changed', title=title)
def on_start(self):
logger.debug("core on_start")
def setup(self):
try:
coverage = []
if self._config and 'restore_state' in self._config['core']:
amount = self._config['core']['restore_state']
if not amount or 'off' == amount:
value = self._config['core']['restore_state']
if not value or 'off' == value:
pass
elif 'volume' == amount:
elif 'volume' == value:
coverage = ['volume']
elif 'load' == amount:
elif 'load' == value:
coverage = ['tracklist', 'mode', 'volume', 'history']
elif 'last' == amount:
elif 'last' == value:
coverage = ['tracklist', 'mode', 'play-last', 'volume',
'history']
elif 'play' == amount:
elif 'play' == value:
coverage = ['tracklist', 'mode', 'play-always', 'volume',
'history']
else:
logger.warn('Unknown value for config '
'core.restore_state: %s', amount)
'core.restore_state: %s', value)
if len(coverage):
self.load_state('persistent', coverage)
except Exception as e:
logger.warn('Unexpected error: %s', str(e))
pykka.ThreadingActor.on_start(self)
logger.warn('setup: Unexpected error: %s', str(e))
def on_stop(self):
logger.debug("core on_stop")
def teardown(self):
try:
if self._config and 'restore_state' in self._config['core']:
amount = self._config['core']['restore_state']
if amount and 'off' != amount:
self.save_state('persistent')
except Exception as e:
logger.warn('on_stop: Unexpected error: %s', str(e))
pykka.ThreadingActor.on_stop(self)
logger.warn('teardown: Unexpected error: %s', str(e))
def save_state(self, name):
"""
@ -184,7 +180,7 @@ class Core(
:type name: str
"""
if not name:
raise TypeError('missing file name')
raise TypeError('Missing file name.')
file_name = os.path.join(
self._config['core']['data_dir'], name)
@ -219,7 +215,7 @@ class Core(
:type coverage: list of string (see above)
"""
if not name:
raise TypeError('missing file name')
raise TypeError('Missing file name.')
file_name = os.path.join(
self._config['core']['data_dir'], name)