Allow to search by any supported URI scheme

This commit is contained in:
Szymon Nowak 2014-07-15 14:28:38 +02:00
parent 2d95978829
commit 736ebcee80

View File

@ -28,18 +28,26 @@ function initSearch() {
delete customTracklists['trackresultscache']; delete customTracklists['trackresultscache'];
$("#searchresults").hide(); $("#searchresults").hide();
var query = {}, mopidy.getUriSchemes().then(function (schemes) {
uris = []; var query = {},
uris = [];
if (value.match(/^spotify:/)) { var regexp = $.map(schemes, function (scheme) {
query = {uri: [value]}; return '^' + scheme + ':';
uris = ["spotify:"]; }).join('|');
} else {
query = {any: [value]};
}
mopidy.library.search(query, uris).then(processSearchResults, console.error); var match = value.match(regexp);
// console.log('search sent', value); if (match) {
var scheme = match[0];
query = {uri: [value]};
uris = [scheme];
} else {
query = {any: [value]};
}
mopidy.library.search(query, uris).then(processSearchResults, console.error);
// console.log('search sent', value);
});
} }
} }