Use 'm3u' format for saving playlists. Invalidate the playlist cache …

…on refresh or external changes. Fixes pimusicbox#173. Fixes 177.
jcass77 · Feb 28, 2016 · 2777875 · kingosticks · Feb 29, 2016 · jcass77
1 parent f7ea11d
commit 2777875
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/README.rst b/README.rst
@@ -79,6 +79,8 @@ v2.2.0 (UNRELEASED)
 - Volume slider now works with Mopidy-ALSAMixer again. (Fixes: `#168 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/168>`_).
 - Now falls back to track artist if album artist is not available for rendering cover art. (Fixes: `#128 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/128>`_).
 - Replace Javascript prompt with jQuery Mobile equivalent. (Fixes: `#113 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/113>`_).
+- Fix playlist refresh button. (Fixes: `#173 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/173>`_).
+- Update save queue functionality to use 'm3u' format. (Fixes: `#177 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/177>`_).
 
 v2.1.1 (2016-02-04)
 -------------------

diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html
@@ -233,7 +233,7 @@ <h2>Artists</h2>
             <button class="btn" type="button" id="overwriteConfirmBtn">
                 Ok
             </button>
-            <button class="btn" type="button" onclick="return $('#popupOverwrite').popup('close');">
+            <button class="btn" type="button" onclick="$('#popupOverwrite').popup('close'); return $('#popupSave').popup('open');">
                 Cancel
             </button>
         </div>

diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
@@ -207,10 +207,8 @@ function removeTrack() {
 }
 
 function clearQueue() {
-    mopidy.playback.stop().then(
-        mopidy.tracklist.clear().then(
-            resetSong()
-        )
+    mopidy.tracklist.clear().then(
+        resetSong()
     );
     return false;
 }
@@ -235,21 +233,17 @@ function showSavePopup(){
 
 function saveQueue() {
     mopidy.tracklist.getTracks().then(function(tracks) {
-        var plname = $('#saveinput').val().trim();
-        if (plname != null && plname != "") {
-            mopidy.playlists.filter({"name": plname}).then(function(existing) {
-                var exists = false;
-                for (var i = 0; i < existing.length; i++) {
-                    exists = exists || existing[i].uri.indexOf("m3u:") == 0 || existing[i].uri.indexOf("local:") == 0;
-                }
+        var playlistName = $('#saveinput').val().trim();
+        if (playlistName != null && playlistName != "") {
+            getPlaylistByName(playlistName, 'm3u', false).then(function(exists) {
                 if (exists) {
                     $('#popupSave').popup('close');
                     $('#popupOverwrite').popup('open');
                     $('#overwriteConfirmBtn').click(function() {
-                        initSave(plname, tracks);
+                        initSave(playlistName, tracks);
                     });
                 } else {
-                    initSave(plname, tracks);
+                    initSave(playlistName, tracks);
                 }
             });
         }
@@ -262,15 +256,17 @@ function initSave(playlistName, tracks) {
     $('#popupSave').popup('close');
     $('#saveinput').val('');
     toast('Saving...');
-    mopidy.playlists.create({'name': playlistName, 'uri_scheme': "local"}).then(function(playlist) {
+    mopidy.playlists.create({'name': playlistName, 'uri_scheme': "m3u"}).then(function(playlist) {
          playlist.tracks = tracks;
          mopidy.playlists.save({'playlist': playlist}).then();
-         getPlaylists();
      });
 }
 
 function refreshPlaylists() {
-    mopidy.playlists.refresh();
+    mopidy.playlists.refresh().then(function() {
+        playlists = {};
+        $('#playlisttracksdiv').hide();
+    });
     return false;
 }
 

diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
@@ -258,6 +258,18 @@ function initSocketevents() {
         getPlaylists();
     });
 
+    mopidy.on("event:playlistChanged", function(data) {
+        $('#playlisttracksdiv').hide();
+        delete playlists[data["playlist"].uri];
+        getPlaylists();
+    });
+
+    mopidy.on("event:playlistDeleted", function(data) {
+        $('#playlisttracksdiv').hide();
+        delete playlists[data["uri"]];
+        getPlaylists();
+    });
+
     mopidy.on("event:volumeChanged", function(data) {
         setVolume(data["volume"]);
     });

diff --git a/mopidy_musicbox_webclient/static/mb.appcache b/mopidy_musicbox_webclient/static/mb.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2016-02-18:v2
+# 2016-02-28:v1
 
 NETWORK:
 *