From 3190d3c6c8f18132a1c0ecd3e0d36b6aa3103163 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <blacklight86@gmail.com>
Date: Wed, 13 Feb 2019 00:27:36 +0100
Subject: [PATCH] Fixing music.mpd.js both for mpd and mopidy backends

---
 platypush/backend/http/static/js/music.mpd.js | 49 ++++++++++---------
 platypush/backend/music/mopidy.py             |  1 +
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/platypush/backend/http/static/js/music.mpd.js b/platypush/backend/http/static/js/music.mpd.js
index cca27124e8..e8271acd08 100644
--- a/platypush/backend/http/static/js/music.mpd.js
+++ b/platypush/backend/http/static/js/music.mpd.js
@@ -46,16 +46,25 @@ $(document).ready(function() {
         var elapsed; var length;
 
         var timeToStr = (time) => {
+            if (typeof time === 'string') {
+                return time;
+            }
+
             return parseInt(parseInt(time)/60) + ':'
                 + (parseInt(time)%60 < 10 ? '0' : '') + (parseInt(time)%60);
         };
 
         if (status) {
-            if (seekInterval) {
-                clearInterval(seekInterval);
+            if ('position' in status) {
+                elapsed = parseInt(status.position);
+                $trackSeeker.val(elapsed);
             }
 
             if ('time' in status) {
+                if (seekInterval) {
+                    clearInterval(seekInterval);
+                }
+
                 if (typeof status.time === 'string' && status.time.indexOf(':') > -1) {
                     // backend.music.mpd time format: "elapsed:total"
                     [elapsed, length] = status.time.split(':');
@@ -65,22 +74,18 @@ $(document).ready(function() {
                     // backend.music.mopidy time format: integer with elapsed seconds
                     length = parseInt(status.time);
                 }
-
-                if (length) {
-                    $trackSeeker.val(length);
-                }
-
-                if (elapsed) {
-                    $trackSeeker.attr('max', elapsed);
-                    curTrackElapsed = {
-                        'timestamp': new Date().getTime(),
-                        'elapsed': elapsed,
-                    };
-                }
             }
 
-            if ('position' in status) {
-                $trackSeeker.val(parseInt(status.position));
+            if (elapsed !== undefined) {
+                $trackSeeker.val(elapsed);
+                curTrackElapsed = {
+                    'timestamp': new Date().getTime(),
+                    'elapsed': elapsed,
+                };
+            }
+
+            if (length !== undefined) {
+                $trackSeeker.attr('max', length);
             }
 
             if ('state' in status) {
@@ -104,8 +109,8 @@ $(document).ready(function() {
                         $curTrack.find('.no-track').hide();
 
                         $trackSeeker.prop('disabled', false);
-                        $('#seek-time-elapsed').text(elapsed ? elapsed : '-:--');
-                        $('#seek-time-length').text(length ? length : '-:--');
+                        $('#seek-time-elapsed').text(elapsed ? timeToStr(elapsed) : '-:--');
+                        $('#seek-time-length').text(length ? timeToStr(length) : '-:--');
                         break;
 
                     case 'play':
@@ -116,8 +121,8 @@ $(document).ready(function() {
                         $curTrack.find('.no-track').hide();
 
                         $trackSeeker.prop('disabled', false);
-                        $('#seek-time-elapsed').text(elapsed ? elapsed : '-:--');
-                        $('#seek-time-length').text(length ? length : '-:--');
+                        $('#seek-time-elapsed').text(elapsed ? timeToStr(elapsed) : '-:--');
+                        $('#seek-time-length').text(length ? timeToStr(length) : '-:--');
 
                         seekInterval = setInterval(function() {
                             var length = parseInt($trackSeeker.attr('max'));
@@ -126,8 +131,8 @@ $(document).ready(function() {
 
                             if (value < length) {
                                 $trackSeeker.val(value);
-                                elapsed = parseInt(value/60) + ':' + (value%60 < 10 ? '0' : '') + (value%60);
-                                $('#seek-time-elapsed').text(elapsed);
+                                elapsed = value;
+                                $('#seek-time-elapsed').text(timeToStr(elapsed));
                             }
                         }, 1000);
                         break;
diff --git a/platypush/backend/music/mopidy.py b/platypush/backend/music/mopidy.py
index 7d42ed076d..6d32dfa301 100644
--- a/platypush/backend/music/mopidy.py
+++ b/platypush/backend/music/mopidy.py
@@ -151,6 +151,7 @@ class MusicMopidyBackend(Backend):
 
                 track['artist'] = m.group(1)
                 track['title'] = m.group(2)
+                track['position'] = 0.0
                 self.bus.post(NewPlayingTrackEvent(status=status, track=track))
             elif event == 'volume_changed':
                 status['volume'] = msg.get('volume')