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

Use getStreamUrl on ResultProviders instead of awkward custom iodevicefactories

Browse Source
This commit is contained in:
Dominik Schmidt
2015-11-19 01:23:38 +01:00
parent 30789bcb9b
commit dde7db616a
10 changed files with 85 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
data/js/tomahawk.js
View File

@@ -271,17 +271,6 @@ Tomahawk.Resolver = {
getStreamUrl: function (params) {
return params;
},
_convertUrls: function (results) {
var that = this;
return results.map(function (r) {
if (r && r.url) {
r.url = that._urlProtocol + '://' + r.url;
}
return r;
});
},
_adapter_resolve: function (params) {
var that = this;
var collectionPromises = [];
@@ -297,26 +286,12 @@ Tomahawk.Resolver = {
}).then(function (collectionResults) {
return RSVP.Promise.resolve(that.resolve(params)).then(function (results) {
return {
'results': that._convertUrls(results.concat(collectionResults))
'results': results.concat(collectionResults)
};
});
});
},
_adapter_init: function () {
this._urlProtocol = this.settings.name.replace(/[^a-zA-Z]/g, '').toLowerCase();
Tomahawk.addCustomUrlHandler(this._urlProtocol, '_adapter_getStreamUrl', true);
Tomahawk.log('Registered custom url handler for protocol "' + this._urlProtocol + '"');
this.init();
},
_adapter_getStreamUrl: function (params) {
params.url = params.url.slice(this._urlProtocol.length + 3);
RSVP.Promise.resolve(this.getStreamUrl(params)).then(function (result) {
Tomahawk.reportStreamUrl(params.qid, result.url, result.headers);
});
},
_adapter_search: function (params) {
var that = this;
var collectionPromises = [];
@@ -331,7 +306,7 @@ Tomahawk.Resolver = {
}).then(function (collectionResults) {
return RSVP.Promise.resolve(that.search(params)).then(function (results) {
return {
'results': that._convertUrls(results.concat(collectionResults))
'results': results.concat(collectionResults)
};
});
});
@@ -1713,7 +1688,7 @@ Tomahawk.Collection = {
);
return t.execDeferredStatements();
}).then(function (results) {
return {results: Tomahawk.resolver.instance._convertUrls(results[0])};
return {results: results[0]};
});
},
@@ -1887,6 +1862,14 @@ Tomahawk.Collection = {
Tomahawk.Collection.BrowseCapability.Albums,
Tomahawk.Collection.BrowseCapability.Tracks];
return this.settings;
},
getStreamUrl: function(params) {
if(this.resolver) {
return this.resolver.getStreamUrl(params);
}
return params;
}
};
@@ -1910,14 +1893,6 @@ Tomahawk.addTrackResults = function (result) {
delete Tomahawk.PluginManager.resolve[result.qid];
};
Tomahawk.reportStreamUrl = function (qid, streamUrl, headers) {
Tomahawk.PluginManager.resolve[qid]({
url: streamUrl,
headers: headers
});
delete Tomahawk.PluginManager.resolve[qid];
};
Tomahawk.addUrlResult = function (url, result) {
/* Merge the whole mess into one consistent result which is independent of type
var cleanResult = {