From a9327c559f1c4b796759b076d283ae6c15a7bfb7 Mon Sep 17 00:00:00 2001
From: Jens Luetjen <dublok@users.noreply.github.com>
Date: Sat, 9 Jan 2016 12:00:35 +0100
Subject: [PATCH] Don't use pykka callbacks on_start and on_stop.

Introduce setup() and teardown() for Core.
---
 mopidy/commands.py   | 11 ++++++++---
 mopidy/core/actor.py | 30 +++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/mopidy/commands.py b/mopidy/commands.py
index 4890c722..e5adbc09 100644
--- a/mopidy/commands.py
+++ b/mopidy/commands.py
@@ -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):
diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py
index 817beb0f..0c877477 100644
--- a/mopidy/core/actor.py
+++ b/mopidy/core/actor.py
@@ -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)