From a81a3ac1d84205e1ee90eff7d7fdd07879a42601 Mon Sep 17 00:00:00 2001
From: jcass <john.cass77@gmail.com>
Date: Sun, 31 Jan 2016 08:17:56 +0200
Subject: [PATCH] fix:Replace calls containing deprecated 'uri' parameter of
 core.LibraryController.lookup().

---
 mopidy_musicbox_webclient/static/js/controls.js   | 2 +-
 mopidy_musicbox_webclient/static/js/library.js    | 9 ++++++---
 mopidy_musicbox_webclient/static/js/process_ws.js | 7 ++++---
 mopidy_musicbox_webclient/static/mb.manifest      | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 195285a..aa4af80 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -541,7 +541,7 @@ function getFavourites() {
 function addFavourite(uri, name) {
     var uri = uri || $('#streamuriinput').val().trim();
     var name = name || $('#streamnameinput').val().trim();
-    mopidy.library.lookup({'uri': uri}).then(function(results) {
+    mopidy.library.lookup({'uris': [uri]}).then(function(results) {
         var newTracks = results[uri];
         if (newTracks.length == 1) {
             // TODO: Supporting adding an entire playlist?
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index 1ca0e9a..f399ba4 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -266,7 +266,8 @@ function showArtist(nwuri) {
 //TODO cache
     $('#h_artistname').html('');
     showLoading(true);
-    mopidy.library.lookup({'uri': nwuri}).then(function(resultArr) {
+    mopidy.library.lookup({'uris': [nwuri]}).then(function(resultDict) {
+        var resultArr = resultDict[Object.keys(resultDict)[0]];
         resultArr.uri = nwuri;
         processArtistResults(resultArr);
     }, console.error);
@@ -291,7 +292,8 @@ function showAlbum(uri) {
         $('#coverpopupalbumname').html(albumname);
         $('#coverpopupartist').html(artistname);
         showLoading(false);
-        mopidy.library.lookup({'uri': uri}).then(function(resultArr) {
+        mopidy.library.lookup({'uris': [uri]}).then(function(resultDict) {
+            var resultArr = resultDict[Object.keys(resultDict)[0]];
             resultArr.uri = uri;
             processAlbumResults(resultArr);
         }, console.error);
@@ -299,7 +301,8 @@ function showAlbum(uri) {
         showLoading(true);
         $('#h_albumname').html('');
         $('#h_albumartist').html('');
-        mopidy.library.lookup({'uri': uri}).then(function(resultArr) {
+        mopidy.library.lookup({'uris': [uri]}).then(function(resultDict) {
+            var resultArr = resultDict[Object.keys(resultDict)[0]];
             resultArr.uri = uri;
             processAlbumResults(resultArr);
         }, console.error);
diff --git a/mopidy_musicbox_webclient/static/js/process_ws.js b/mopidy_musicbox_webclient/static/js/process_ws.js
index eb86f13..2479df2 100644
--- a/mopidy_musicbox_webclient/static/js/process_ws.js
+++ b/mopidy_musicbox_webclient/static/js/process_ws.js
@@ -118,9 +118,10 @@ function processBrowseDir(resultArr) {
         iconClass = getMediaClass(resultArr[i].uri);
         if (resultArr[i].type == 'track') {
             //console.log(resultArr[i]);
-            mopidy.library.lookup({'uri': resultArr[i].uri}).then(function (resultArr) {
-                popupData[resultArr[0].uri] = resultArr[0];
-                browseTracks.push(resultArr[0]);
+            mopidy.library.lookup({'uris': [resultArr[i].uri]}).then(function (resultDict) {
+                var uri = Object.keys(resultDict)[0];
+                popupData[uri] = resultDict[uri][0];
+                browseTracks.push(resultDict[uri][0]);
             }, console.error);
             child += '<li class="song albumli" id="browselisttracks-' + resultArr[i].uri + '">' +
                      '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\', \'' + resultArr[i].uri + '\', \'' + index + '\');">' +
diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest
index 9b0b2e0..3ea6ab1 100644
--- a/mopidy_musicbox_webclient/static/mb.manifest
+++ b/mopidy_musicbox_webclient/static/mb.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2016-01-30:v1
+# 2016-01-31:v1
 
 NETWORK:
 *