From a589e4f6889a9379234f2c2cb4607d468b71f54a Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Fri, 20 Nov 2015 23:55:14 +0100
Subject: [PATCH] Expect javascript resolvers to return "tracks" instead of
 "results"

---
 data/js/tomahawk.js                           | 23 ++++++++-----------
 src/libtomahawk/resolvers/JSResolver.cpp      |  2 +-
 .../resolvers/ScriptCollection.cpp            |  2 +-
 .../resolvers/ScriptCommand_AllTracks.cpp     |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/data/js/tomahawk.js b/data/js/tomahawk.js
index ad77cb8e9..99de6ac3d 100644
--- a/data/js/tomahawk.js
+++ b/data/js/tomahawk.js
@@ -274,7 +274,7 @@ Tomahawk.Resolver = {
     _adapter_resolve: function (params) {
         return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
             return {
-                'results': results
+                'tracks': results
             };
         });
     },
@@ -282,7 +282,7 @@ Tomahawk.Resolver = {
     _adapter_search: function (params) {
         return RSVP.Promise.resolve(this.search(params)).then(function (results) {
             return {
-                'results': results
+                'tracks': results
             };
         });
     },
@@ -1558,7 +1558,7 @@ Tomahawk.Collection = {
     _adapter_resolve: function (params) {
         return RSVP.Promise.resolve(this.resolve(params)).then(function (results) {
             return {
-                'results': results
+                'tracks': results
             };
         });
     },
@@ -1568,17 +1568,14 @@ Tomahawk.Collection = {
         return this._fuzzyIndexIdsToTracks(resultIds);
     },
 
-    _adapter_search: function (params) {
-        return RSVP.Promise.resolve(this.search(params)).then(function (results) {
-            return {
-                'results': results
-            };
-        });
-    },
-
     search: function (params) {
         var resultIds = Tomahawk.searchFuzzyIndex(params.query);
-        return this._fuzzyIndexIdsToTracks(resultIds);
+
+        return this._fuzzyIndexIdsToTracks(resultIds).then(function(tracks) {
+            return {
+                tracks: tracks
+            };
+        });
     },
 
     tracks: function (params, where) {
@@ -1625,7 +1622,7 @@ Tomahawk.Collection = {
             );
             return t.execDeferredStatements();
         }).then(function (results) {
-            return {results: results[0]};
+            return {tracks: results[0]};
         });
     },
 
diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp
index 1e51bc9d3..bb0507918 100644
--- a/src/libtomahawk/resolvers/JSResolver.cpp
+++ b/src/libtomahawk/resolvers/JSResolver.cpp
@@ -562,7 +562,7 @@ JSResolver::onResolveRequestDone( const QVariantMap& data )
     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 )
         {
diff --git a/src/libtomahawk/resolvers/ScriptCollection.cpp b/src/libtomahawk/resolvers/ScriptCollection.cpp
index 38036a8c4..67c14409e 100644
--- a/src/libtomahawk/resolvers/ScriptCollection.cpp
+++ b/src/libtomahawk/resolvers/ScriptCollection.cpp
@@ -380,7 +380,7 @@ ScriptCollection::onResolveRequestDone( const QVariantMap& data )
     }
     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 )
         {
diff --git a/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp b/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
index 1251cebbd..2164c66a1 100644
--- a/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
+++ b/src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
@@ -117,7 +117,7 @@ ScriptCommand_AllTracks::onTracksJobDone( const QVariantMap& result )
     QSharedPointer< ScriptCollection > collection = m_collection.objectCast< ScriptCollection >();
     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;