andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle unresolvable streams gracefully and don't comvert automatically.

Browse Source
This commit is contained in:
Nick Steel 2016-02-03 23:33:17 +00:00
parent 8477acc322
commit 3ecb4f65d3
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -590,22 +590,19 @@ function deleteFavourite(index) {
function showFavourites() { function showFavourites() {
$('#streamuristable').empty(); $('#streamuristable').empty();
$.cookie.json = true;
if ($.cookie('streamUris')) {
toast('Converting streamUris...');
upgradeStreamUrisToFavourites();
}
getFavourites().then(function(favourites) { getFavourites().then(function(favourites) {
if (favourites && favourites.tracks) { if (favourites && favourites.tracks) {
tracks = favourites.tracks;
var tmp = ''; var tmp = '';
$.cookie.json = true;
if ($.cookie('streamUris')) {
tmp = '<li><a style="text-align: center" href="#" onclick="upgradeStreamUrisToFavourites();"><h1>Convert StreamUris to Favourites</h1></a></li>'
}
var child = ''; var child = '';
for (var i = 0; i < tracks.length; i++) { for (var i = 0; i < favourites.tracks.length; i++) {
child = '<li><span class="ui-icon ui-icon-delete ui-icon-shadow" style="float:right; margin: .5em; margin-top: .8em;"><a href="#" onclick="return deleteFavourite(\'' + i + '\');">&nbsp;</a></span>' + child = '<li><span class="ui-icon ui-icon-delete ui-icon-shadow" style="float:right; margin: .5em; margin-top: .8em;"><a href="#" onclick="return deleteFavourite(\'' + i + '\');">&nbsp;</a></span>' +
'<i class="fa fa-rss" style="float: left; padding: .5em; padding-top: 1em;"></i>' + '<i class="fa fa-rss" style="float: left; padding: .5em; padding-top: 1em;"></i>' +
' <a style="margin-left: 20px" href="#" onclick="return playStreamUri(\'' + tracks[i].uri + '\');">'; ' <a style="margin-left: 20px" href="#" onclick="return playStreamUri(\'' + favourites.tracks[i].uri + '\');">';
child += '<h1>' + tracks[i].name + '</h1></a></li>'; child += '<h1>' + favourites.tracks[i].name + '</h1></a></li>';
tmp += child; tmp += child;
} }
$('#streamuristable').html(tmp); $('#streamuristable').html(tmp);
@ -614,6 +611,7 @@ function showFavourites() {
} }
function upgradeStreamUrisToFavourites() { function upgradeStreamUrisToFavourites() {
toast('Converting streamUris...');
$.cookie.json = true; $.cookie.json = true;
var streamUris = $.cookie('streamUris'); // Read the cookie. var streamUris = $.cookie('streamUris'); // Read the cookie.
if (streamUris) { if (streamUris) {
@ -630,8 +628,12 @@ function upgradeStreamUrisToFavourites() {
var rs = streamUris[key]; var rs = streamUris[key];
if (rs) { if (rs) {
var track = results[rs[1]][0]; var track = results[rs[1]][0];
track.name = rs[0] || track.name; // Use custom name if provided. if (track) {
tracks.push(track); track.name = rs[0] || track.name; // Use custom name if provided.
tracks.push(track);
} else {
console.log("Skipping unplayable streamUri " + rs[1]);
}
} }
} }
addToFavourites(tracks); addToFavourites(tracks);