From ad816350f92d02ab283e433b55549029942ad287 Mon Sep 17 00:00:00 2001
From: Nick Steel <kingosticks@gmail.com>
Date: Thu, 18 Jun 2015 00:13:55 +0100
Subject: [PATCH] Use a fake 'mbw:' URI scheme for our internal track caches.
 (Fixes #109).

Better solution is to prevent sending our internal cache URIs to Mopidy in the first place.
Also removed unused customPlaylists.
---
 mopidy_musicbox_webclient/static/js/controls.js    |  2 +-
 .../static/js/functionsvars.js                     |  4 ----
 mopidy_musicbox_webclient/static/js/gui.js         |  2 +-
 mopidy_musicbox_webclient/static/js/library.js     | 14 +++++++-------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 83cfc39..e2c035d 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -153,7 +153,7 @@ function playTrackByUri(track_uri, playlist_uri) {
     func = mopidy.tracklist.add(null, null, playlist_uri);
     func.then(
         function(tltracks) {
-            //check if tltracks is filled, some backends (gmusic) do not support adding by uri, it seems
+            //check if tltracks is filled, some backends (gmusic, m3u) do not support adding by uri, it seems
             if (tltracks.length == 0) {
                 var tracks = getTracksFromUri(playlist_uri);
                 mopidy.tracklist.add(tracks).then(findAndPlayTrack);
diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index 19e547d..1886bde 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -37,7 +37,6 @@ var playlistslistScroll;
 //array of cached playlists (not only user-playlists, also search, artist, album-playlists)
 var playlists = {};
 var currentplaylist;
-var customPlaylists = [];
 var customTracklists = [];
 
 var browseStack = [];
@@ -408,9 +407,6 @@ function getPlaylistFromUri(uri) {
     if (playlists[uri]) {
         return playlists[uri];
     }
-    if (customPlaylists[uri]) {
-        return customPlaylists[uri];
-    }
 }
 
 function getTracksFromUri(uri) {
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index c87c851..401e7ac 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -410,7 +410,7 @@ function locationHashChanged() {
         case 'search':
             $('#navsearch a').addClass($.mobile.activeBtnClass);
             $("#searchinput").focus();
-            if (customTracklists['allresultscache'] == '') {
+            if (customTracklists['mbw:allresultscache'] == '') {
                 initSearch($('#searchinput').val());
             }
             break;
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index f149d86..16f6bf0 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -23,10 +23,10 @@ function initSearch() {
         document.activeElement.blur();
         $("input").blur();
 
-        delete customTracklists['allresultscache'];
-        delete customTracklists['artistresultscache'];
-        delete customTracklists['albumresultscache'];
-        delete customTracklists['trackresultscache'];
+        delete customTracklists['mbw:allresultscache'];
+        delete customTracklists['mbw:artistresultscache'];
+        delete customTracklists['mbw:albumresultscache'];
+        delete customTracklists['mbw:trackresultscache'];
         $("#searchresults").hide();
 
         if (searchService != 'all') {
@@ -113,7 +113,7 @@ function processSearchResults(resultArr) {
 
 
 
-    customTracklists['trackresultscache'] = results.tracks;
+    customTracklists['mbw:trackresultscache'] = results.tracks;
 
     if (emptyResult) {
         toast('No results');
@@ -196,8 +196,8 @@ function processSearchResults(resultArr) {
     $('#expandsearch').show();
 
     // Track results
-//    playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
-    resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
+//    playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'mbw:trackresultscache');
+    resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'mbw:trackresultscache');
 
     showLoading(false);
 }