- {# include 'header.html' #}
-
{% with plugins=templates.keys() %}
{% include 'nav.html' %}
{% endwith %}
- {% for plugin, conf in templates.items() %}
- {% with configuration=templates[plugin], utils=utils %}
- {% include conf['_template_file'] %}
-
- {% endwith %}
- {% endfor %}
+
@@ -67,10 +73,6 @@
{% include 'plugins/template.html' %}
- {% for script in scripts.values() %}
-
- {% endfor %}
-
diff --git a/platypush/backend/http/templates/nav.html b/platypush/backend/http/templates/nav.html
index a701f63f7b..83968be363 100644
--- a/platypush/backend/http/templates/nav.html
+++ b/platypush/backend/http/templates/nav.html
@@ -6,18 +6,9 @@
{{ plugin }}
-
{% endfor %}
-
- Test tab 2
-
-
- Test tab 3
-
-
diff --git a/platypush/backend/http/templates/plugins/music.mpd/browser.html b/platypush/backend/http/templates/plugins/music.mpd/browser.html
new file mode 100644
index 0000000000..f256d46546
--- /dev/null
+++ b/platypush/backend/http/templates/plugins/music.mpd/browser.html
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/platypush/backend/http/templates/plugins/music.mpd/index.html b/platypush/backend/http/templates/plugins/music.mpd/index.html
new file mode 100644
index 0000000000..37d23fc924
--- /dev/null
+++ b/platypush/backend/http/templates/plugins/music.mpd/index.html
@@ -0,0 +1,88 @@
+{% include 'plugins/music.mpd/browser.html' %}
+
+
+
diff --git a/platypush/backend/music/mopidy.py b/platypush/backend/music/mopidy.py
index 5ac5b68dc1..2e9d6fce70 100644
--- a/platypush/backend/music/mopidy.py
+++ b/platypush/backend/music/mopidy.py
@@ -185,11 +185,11 @@ class MusicMopidyBackend(Backend):
new_status = self._get_tracklist_status()
if new_status['random'] != self._latest_status.get('random'):
self.bus.post(PlaybackRandomModeChangeEvent(state=new_status['random']))
- if new_status['repeat'] != self._latest_status('repeat'):
+ if new_status['repeat'] != self._latest_status['repeat']:
self.bus.post(PlaybackRepeatModeChangeEvent(state=new_status['repeat']))
- if new_status['single'] != self._latest_status('single'):
+ if new_status['single'] != self._latest_status['single']:
self.bus.post(PlaybackSingleModeChangeEvent(state=new_status['single']))
- if new_status['consume'] != self._latest_status('consume'):
+ if new_status['consume'] != self._latest_status['consume']:
self.bus.post(PlaybackConsumeModeChangeEvent(state=new_status['consume']))
self._latest_status = new_status
diff --git a/platypush/plugins/music/mpd/__init__.py b/platypush/plugins/music/mpd/__init__.py
index de52ec5032..3339a9e561 100644
--- a/platypush/plugins/music/mpd/__init__.py
+++ b/platypush/plugins/music/mpd/__init__.py
@@ -37,37 +37,50 @@ class MusicMpdPlugin(MusicPlugin):
self.port = port
self.client = None
- def _connect(self):
- if not self.client:
- self.client = mpd.MPDClient(use_unicode=True)
- self.client.connect(self.host, self.port)
- return self.client
+ def _connect(self, n_tries=2):
+ with self._client_lock:
+ if self.client:
+ return
+
+ error = None
+ while n_tries > 0:
+ try:
+ n_tries -= 1
+ self.client = mpd.MPDClient(use_unicode=True)
+ self.client.connect(self.host, self.port)
+ return self.client
+ except Exception as e:
+ error = e
+ self.logger.warning('Connection exception: {}{}'.
+ format(str(e), (': Retrying' if n_tries > 0 else '')))
+ time.sleep(0.5)
+
+ self.client = None
+ raise error
def _exec(self, method, *args, **kwargs):
- n_tries = int(kwargs.pop('n_tries')) if 'n_tries' in kwargs else 1
+ error = None
+ n_tries = int(kwargs.pop('n_tries')) if 'n_tries' in kwargs else 2
return_status = kwargs.pop('return_status') \
if 'return_status' in kwargs else True
- try:
- self._connect()
- response = None
- with self._client_lock:
- response = getattr(self.client, method)(*args, **kwargs)
+ while n_tries > 0:
+ try:
+ self._connect()
+ n_tries -= 1
+ with self._client_lock:
+ response = getattr(self.client, method)(*args, **kwargs)
- if return_status:
- return self.status().output
- return response
- except Exception as e:
- self.logger.warning('Exception while executing MPD method {}: {}'.
- format(method, str(e)))
- self.client = None
+ if return_status:
+ return self.status().output
+ return response
+ except Exception as e:
+ error = str(e)
+ self.logger.warning('Exception while executing MPD method {}: {}'.
+ format(method, error))
+ self.client = None
- if n_tries > 0:
- kwargs['return_status'] = return_status
- kwargs['n_tries'] = n_tries-1
- return self._exec(method, *args, **kwargs)
- else:
- return (None, str(e))
+ return None, error
@action
def play(self, resource=None):
@@ -346,14 +359,21 @@ class MusicMpdPlugin(MusicPlugin):
}
"""
- try:
- self._connect()
- return self.client.status()
- except Exception as e:
- self.logger.warning('Exception while getting MPD status: {}'.
- format(str(e)))
- self.client = None
- return (None, str(e))
+ n_tries = 2
+ error = None
+
+ while n_tries > 0:
+ try:
+ n_tries -= 1
+ self._connect()
+ return self.client.status()
+ except Exception as e:
+ error = e
+ self.logger.warning('Exception while getting MPD status: {}'.
+ format(str(e)))
+ self.client = None
+
+ return None, error
@action
def currentsong(self):