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

Expect javascript resolvers to return "tracks" instead of "results"

Browse Source
This commit is contained in:
Dominik Schmidt
2015-11-20 23:55:14 +01:00
parent 16946592b7
commit a589e4f688
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
data/js/tomahawk.js
View File

@@ -274,7 +274,7 @@ Tomahawk.Resolver = {
_adapter_resolve: function (params) { _adapter_resolve: function (params) {
return RSVP.Promise.resolve(this.resolve(params)).then(function (results) { return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
return { return {
'results': results 'tracks': results
}; };
}); });
}, },
@@ -282,7 +282,7 @@ Tomahawk.Resolver = {
_adapter_search: function (params) { _adapter_search: function (params) {
return RSVP.Promise.resolve(this.search(params)).then(function (results) { return RSVP.Promise.resolve(this.search(params)).then(function (results) {
return { return {
'results': results 'tracks': results
}; };
}); });
}, },
@@ -1558,7 +1558,7 @@ Tomahawk.Collection = {
_adapter_resolve: function (params) { _adapter_resolve: function (params) {
return RSVP.Promise.resolve(this.resolve(params)).then(function (results) { return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
return { return {
'results': results 'tracks': results
}; };
}); });
}, },
@@ -1568,17 +1568,14 @@ Tomahawk.Collection = {
return this._fuzzyIndexIdsToTracks(resultIds); return this._fuzzyIndexIdsToTracks(resultIds);
}, },
_adapter_search: function (params) {
return RSVP.Promise.resolve(this.search(params)).then(function (results) {
return {
'results': results
};
});
},
search: function (params) { search: function (params) {
var resultIds = Tomahawk.searchFuzzyIndex(params.query); var resultIds = Tomahawk.searchFuzzyIndex(params.query);
return this._fuzzyIndexIdsToTracks(resultIds);
return this._fuzzyIndexIdsToTracks(resultIds).then(function(tracks) {
return {
tracks: tracks
};
});
}, },
tracks: function (params, where) { tracks: function (params, where) {
@@ -1625,7 +1622,7 @@ Tomahawk.Collection = {
); );
return t.execDeferredStatements(); return t.execDeferredStatements();
}).then(function (results) { }).then(function (results) {
return {results: results[0]}; return {tracks: results[0]};
}); });
}, },

2
src/libtomahawk/resolvers/JSResolver.cpp
View File

@@ -562,7 +562,7 @@ JSResolver::onResolveRequestDone( const QVariantMap& data )
else else
{ {
QList< Tomahawk::result_ptr > results = scriptAccount()->parseResultVariantList( data.value( "results" ).toList() ); QList< Tomahawk::result_ptr > results = scriptAccount()->parseResultVariantList( data.value( "tracks" ).toList() );
foreach( const result_ptr& result, results ) foreach( const result_ptr& result, results )
{ {

2
src/libtomahawk/resolvers/ScriptCollection.cpp
View File

@@ -380,7 +380,7 @@ ScriptCollection::onResolveRequestDone( const QVariantMap& data )
} }
else else
{ {
QList< Tomahawk::result_ptr > results = scriptAccount()->parseResultVariantList( data.value( "results" ).toList() ); QList< Tomahawk::result_ptr > results = scriptAccount()->parseResultVariantList( data.value( "tracks" ).toList() );
foreach( const result_ptr& result, results ) foreach( const result_ptr& result, results )
{ {

2
src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
View File

@@ -117,7 +117,7 @@ ScriptCommand_AllTracks::onTracksJobDone( const QVariantMap& result )
QSharedPointer< ScriptCollection > collection = m_collection.objectCast< ScriptCollection >(); QSharedPointer< ScriptCollection > collection = m_collection.objectCast< ScriptCollection >();
Q_ASSERT( !collection.isNull() ); Q_ASSERT( !collection.isNull() );
QList< Tomahawk::result_ptr > t = collection->scriptAccount()->parseResultVariantList( result[ "results"].toList() ); QList< Tomahawk::result_ptr > t = collection->scriptAccount()->parseResultVariantList( result[ "tracks" ].toList() );
QList< Tomahawk::query_ptr > queries; QList< Tomahawk::query_ptr > queries;