http: Override CoreListener.on_event() instead of the specific event handlers

mopidy/frontends/http/actor.py

@@ -98,40 +98,7 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
         cherrypy.engine.exit()
         logger.info('Stopped HTTP server')
 
-    def track_playback_paused(self, **data):
+    def on_event(self, name, **data):
-        self._broadcast_event('track_playback_paused', data)
-
-    def track_playback_resumed(self, **data):
-        self._broadcast_event('track_playback_resumed', data)
-
-    def track_playback_started(self, **data):
-        self._broadcast_event('track_playback_started', data)
-
-    def track_playback_ended(self, **data):
-        self._broadcast_event('track_playback_ended', data)
-
-    def playback_state_changed(self, **data):
-        self._broadcast_event('playback_state_changed', data)
-
-    def tracklist_changed(self, **data):
-        self._broadcast_event('tracklist_changed', data)
-
-    def playlists_loaded(self, **data):
-        self._broadcast_event('playlists_loaded', data)
-
-    def playlist_changed(self, **data):
-        self._broadcast_event('playlist_changed', data)
-
-    def options_changed(self, **data):
-        self._broadcast_event('options_changed', data)
-
-    def volume_changed(self, **data):
-        self._broadcast_event('volume_changed', data)
-
-    def seeked(self, **data):
-        self._broadcast_event('seeked', data)
-
-    def _broadcast_event(self, name, data):
         event = {}
         event.update(data)
         event['event'] = name

tests/frontends/http/events_test.py

@@ -15,7 +15,7 @@ class HttpEventsTest(unittest.TestCase):
 
     def test_track_playback_paused_is_broadcasted(self, publish):
         publish.reset_mock()
-        self.http.track_playback_paused(foo='bar')
+        self.http.on_event('track_playback_paused', foo='bar')
         self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
         self.assertDictEqual(
             json.loads(str(publish.call_args[0][1])), {
@@ -25,100 +25,10 @@ class HttpEventsTest(unittest.TestCase):
 
     def test_track_playback_resumed_is_broadcasted(self, publish):
         publish.reset_mock()
-        self.http.track_playback_resumed(foo='bar')
+        self.http.on_event('track_playback_resumed', foo='bar')
         self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
         self.assertDictEqual(
             json.loads(str(publish.call_args[0][1])), {
                 'event': 'track_playback_resumed',
                 'foo': 'bar',
             })
-
-    def test_track_playback_started_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.track_playback_started(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'track_playback_started',
-                'foo': 'bar',
-            })
-
-    def test_track_playback_ended_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.track_playback_ended(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'track_playback_ended',
-                'foo': 'bar',
-            })
-
-    def test_playback_state_changed_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.playback_state_changed(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'playback_state_changed',
-                'foo': 'bar',
-            })
-
-    def test_tracklist_changed_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.tracklist_changed(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'tracklist_changed',
-                'foo': 'bar',
-            })
-
-    def test_playlists_loaded_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.playlists_loaded(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'playlists_loaded',
-                'foo': 'bar',
-            })
-
-    def test_playlist_changed_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.playlist_changed(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'playlist_changed',
-                'foo': 'bar',
-            })
-
-    def test_options_changed_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.options_changed(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'options_changed',
-                'foo': 'bar',
-            })
-
-    def test_volume_changed_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.volume_changed(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'volume_changed',
-                'foo': 'bar',
-            })
-
-    def test_seeked_is_broadcasted(self, publish):
-        publish.reset_mock()
-        self.http.seeked(foo='bar')
-        self.assertEqual(publish.call_args[0][0], 'websocket-broadcast')
-        self.assertDictEqual(
-            json.loads(str(publish.call_args[0][1])), {
-                'event': 'seeked',
-                'foo': 'bar',
-            })