From e523bec7f9a8499f38fb9607d1e2cbcec32b1b20 Mon Sep 17 00:00:00 2001 From: Johannes Knutsen Date: Wed, 23 Dec 2009 23:53:00 +0100 Subject: [PATCH] Added initial backend methods and updated handler to call the backend --- mopidy/backends/backend.py | 21 ++++++++++++++++++++- mopidy/handler.py | 19 ++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/mopidy/backends/backend.py b/mopidy/backends/backend.py index f6a1b3a5..2dece95b 100644 --- a/mopidy/backends/backend.py +++ b/mopidy/backends/backend.py @@ -1,4 +1,23 @@ class BaseBackend(object): - def status(self): + def current_song(self): return None + + def list_playlists(self): + return None + + def playlist_changes(self, version): + return None + + def status(self): + return { + 'volume': 0, + 'repeat': 0, + 'random': 0, + 'single': 0, + 'consume': 0, + 'playlist': 0, + 'playlistlength': 0, + 'xfade': 0, + 'state': 'stop', + } diff --git a/mopidy/handler.py b/mopidy/handler.py index ced96b8a..6b714b55 100644 --- a/mopidy/handler.py +++ b/mopidy/handler.py @@ -32,11 +32,11 @@ class MpdHandler(object): @register(r'^currentsong$') def _currentsong(self): - return None # TODO + return self.backend.current_song() @register(r'^listplaylists$') def _listplaylists(self): - return None # TODO + return self.backend.list_playlists() @register(r'^lsinfo( "(?P[^"]*)")*$') def _lsinfo(self, uri): @@ -50,19 +50,8 @@ class MpdHandler(object): @register(r'^plchanges "(?P\d+)"$') def _plchanges(self, version): - return None # TODO + return self.backend.playlist_changes(version) @register(r'^status$') def _status(self): - # TODO - return { - 'volume': 0, - 'repeat': 0, - 'random': 0, - 'single': 0, - 'consume': 0, - 'playlist': 0, - 'playlistlength': 0, - 'xfade': 0, - 'state': 'stop', - } + return self.backend.status()