mirrors
/
ympd
mirror of https://github.com/SuperBFG7/ympd
1
0
Fork 0
Code Issues Releases Wiki Activity

fix handling of special characters in paths

This commit is contained in:
SuperBFG7 2021-06-24 10:16:21 +02:00
parent 4d30fff4bc
commit 7b5496e06c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/js/mpd.js
View File

@ -103,7 +103,7 @@ var app = $.sammy(function () {
full_path = full_path + chunk; full_path = full_path + chunk;
$('#breadcrump').append( $('#breadcrump').append(
'<li><a uri="' + full_path + '">' + chunk + '</a></li>' '<li><a uri="' + encodeURIComponent(full_path) + '">' + chunk + '</a></li>'
); );
full_path += '/'; full_path += '/';
}); });
@ -441,9 +441,12 @@ function webSocketConnect() {
if (current_app !== 'browse' && current_app !== 'search') if (current_app !== 'browse' && current_app !== 'search')
break; break;
/* The use of encodeURI() below might seem useless, but it's not. It prevents /* The use of encodeURIComponent() below might seem useless, but it's not. It prevents
* some browsers, such as Safari, from changing the normalization form of the * some browsers, such as Safari, from changing the normalization form of the
* URI from NFD to NFC, breaking our link with MPD. * URI from NFD to NFC, breaking our link with MPD.
*
* encodeURIComponent() instead of encodeURI() is used to ensure special characters
* (like e.g. +) are handled correctly.
*/ */
if ($('#salamisandwich > tbody').is(':ui-sortable')) { if ($('#salamisandwich > tbody').is(':ui-sortable')) {
$('#salamisandwich > tbody').sortable('destroy'); $('#salamisandwich > tbody').sortable('destroy');
@ -468,7 +471,7 @@ function webSocketConnect() {
} }
$('#salamisandwich > tbody').append( $('#salamisandwich > tbody').append(
'<tr uri="' + '<tr uri="' +
encodeURI(obj.data[item].dir) + encodeURIComponent(obj.data[item].dir) +
'" class="' + '" class="' +
clazz + clazz +
'">' + '">' +
@ -486,7 +489,7 @@ function webSocketConnect() {
} }
$('#salamisandwich > tbody').append( $('#salamisandwich > tbody').append(
'<tr uri="' + '<tr uri="' +
encodeURI(obj.data[item].plist) + encodeURIComponent(obj.data[item].plist) +
'" class="' + '" class="' +
clazz + clazz +
'">' + '">' +
@ -517,7 +520,7 @@ function webSocketConnect() {
$('#salamisandwich > tbody').append( $('#salamisandwich > tbody').append(
'<tr uri="' + '<tr uri="' +
encodeURI(obj.data[item].uri) + encodeURIComponent(obj.data[item].uri) +
'" class="song">' + '" class="song">' +
'<td><span class="glyphicon glyphicon-music"></span></td>' + '<td><span class="glyphicon glyphicon-music"></span></td>' +
'<td>' + '<td>' +
@ -571,7 +574,7 @@ function webSocketConnect() {
socket.send( socket.send(
onClickAction + onClickAction +
',' + ',' +
decodeURI( decodeURIComponent(
$(this).parents('tr').attr('uri') $(this).parents('tr').attr('uri')
) )
); );
@ -664,7 +667,7 @@ function webSocketConnect() {
case 'song': case 'song':
socket.send( socket.send(
'MPD_API_ADD_TRACK,' + 'MPD_API_ADD_TRACK,' +
decodeURI($(this).attr('uri')) decodeURIComponent($(this).attr('uri'))
); );
$('.top-right') $('.top-right')
.notify({ .notify({
@ -683,7 +686,7 @@ function webSocketConnect() {
case 'plist': case 'plist':
socket.send( socket.send(
'MPD_API_ADD_PLAYLIST,' + 'MPD_API_ADD_PLAYLIST,' +
decodeURI($(this).attr('uri')) decodeURIComponent($(this).attr('uri'))
); );
$('.top-right') $('.top-right')
.notify({ .notify({