mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 22:56:42 +02:00
Code Issues Releases Wiki Activity

Port JSResolver::resolve()

Browse Source
This commit is contained in:
Dominik Schmidt
2015-11-13 13:20:52 +01:00
parent 07752fe9f0
commit 35d8945975
5 changed files with 70 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
data/js/tomahawk.js
View File

@@ -281,27 +281,23 @@ Tomahawk.Resolver = {
});
},
_adapter_resolve: function (qid, artist, album, title) {
_adapter_resolve: function (params) {
var that = this;
var collectionPromises = [];
Tomahawk.collections.forEach(function (col) {
if (col.resolve) {
collectionPromises.push(col.resolve({artist: artist, album: album, track: title}));
collectionPromises.push(col.resolve(params));
}
});
RSVP.Promise.all(collectionPromises).then(function (collectionResults) {
return RSVP.Promise.all(collectionPromises).then(function (collectionResults) {
var merged = [];
return merged.concat.apply(merged, collectionResults);
}).then(function (collectionResults) {
RSVP.Promise.resolve(that.resolve({
artist: artist,
album: album,
track: title
})).then(function (results) {
Tomahawk.addTrackResults({
'qid': qid,
return RSVP.Promise.resolve(that.resolve(params)).then(function (results) {
return {
'results': that._convertUrls(results.concat(collectionResults))
});
};
});
});
},
@@ -320,23 +316,22 @@ Tomahawk.Resolver = {
});
},
_adapter_search: function (qid, query) {
_adapter_search: function (params) {
var that = this;
var collectionPromises = [];
Tomahawk.collections.forEach(function (col) {
if (col.search) {
collectionPromises.push(col.search({query: query}));
collectionPromises.push(col.search(params));
}
});
RSVP.Promise.all(collectionPromises).then(function (collectionResults) {
return RSVP.Promise.all(collectionPromises).then(function (collectionResults) {
var merged = [];
return merged.concat.apply(merged, collectionResults);
}).then(function (collectionResults) {
RSVP.Promise.resolve(that.search({query: query})).then(function (results) {
Tomahawk.addTrackResults({
'qid': qid,
return RSVP.Promise.resolve(that.search(params)).then(function (results) {
return {
'results': that._convertUrls(results.concat(collectionResults))
});
};
});
});
},
@@ -815,7 +810,9 @@ Tomahawk.base64Encode = function (b) {
return window.btoa(b);
};
Tomahawk.PluginManager = {
wrapperPrefix: '_adapter_',
objects: {},
objectCounter: 0,
identifyObject: function (object) {
@@ -852,6 +849,12 @@ Tomahawk.PluginManager = {
}
}
if (this.objects[objectId][this.wrapperPrefix + methodName]) {
methodName = this.wrapperPrefix + methodName;
}
var pluginManager = this;
if (!this.objects[objectId]) {
Tomahawk.log("Object not found! objectId: " + objectId + " methodName: " + methodName);