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

Add type (collection/resolver) to resolve / search javascript arguments

Browse Source
This commit is contained in:
Dominik Schmidt
2016-01-07 02:14:21 +01:00
parent 4ba32e0add
commit acdd0e3b9f
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,7 +540,7 @@ JSResolver::error() const
void void
JSResolver::resolve( const Tomahawk::query_ptr& query ) JSResolver::resolve( const Tomahawk::query_ptr& query )
{ {
ScriptJob* job = scriptAccount()->resolve( scriptObject(), query ); ScriptJob* job = scriptAccount()->resolve( scriptObject(), query, "resolver" );
connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onResolveRequestDone( QVariantMap ) ) ); connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onResolveRequestDone( QVariantMap ) ) );

4
src/libtomahawk/resolvers/ScriptAccount.cpp
View File

@@ -334,7 +334,7 @@ ScriptAccount::parseResultVariantList( const QVariantList& reslist )
ScriptJob* ScriptJob*
ScriptAccount::resolve( const scriptobject_ptr& scriptObject, const query_ptr& query ) ScriptAccount::resolve( const scriptobject_ptr& scriptObject, const query_ptr& query, const QString& resolveType )
{ {
ScriptJob* job = nullptr; ScriptJob* job = nullptr;
if ( !query->isFullTextQuery() ) if ( !query->isFullTextQuery() )
@@ -343,6 +343,7 @@ ScriptAccount::resolve( const scriptobject_ptr& scriptObject, const query_ptr& q
arguments["artist"] = query->queryTrack()->artist(); arguments["artist"] = query->queryTrack()->artist();
arguments["album"] = query->queryTrack()->album(); arguments["album"] = query->queryTrack()->album();
arguments["track"] = query->queryTrack()->track(); arguments["track"] = query->queryTrack()->track();
arguments["type"] = resolveType;
job = scriptObject->invoke( "resolve", arguments ); job = scriptObject->invoke( "resolve", arguments );
} }
@@ -350,6 +351,7 @@ ScriptAccount::resolve( const scriptobject_ptr& scriptObject, const query_ptr& q
{ {
QVariantMap arguments; QVariantMap arguments;
arguments["query"] = query->fullTextQuery(); arguments["query"] = query->fullTextQuery();
arguments["type"] = resolveType;
job = scriptObject->invoke( "search", arguments ); job = scriptObject->invoke( "search", arguments );
} }

2
src/libtomahawk/resolvers/ScriptAccount.h
View File

@@ -78,7 +78,7 @@ public:
// helpers // helpers
QList< Tomahawk::result_ptr > parseResultVariantList( const QVariantList& reslist ); QList< Tomahawk::result_ptr > parseResultVariantList( const QVariantList& reslist );
ScriptJob* resolve( const scriptobject_ptr& scriptObject, const query_ptr& query ); ScriptJob* resolve( const scriptobject_ptr& scriptObject, const query_ptr& query, const QString& resolveType );
private slots: private slots:
void onJobDeleted( const QString& jobId ); void onJobDeleted( const QString& jobId );

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

@@ -357,7 +357,7 @@ ScriptCollection::weight() const
void void
ScriptCollection::resolve( const Tomahawk::query_ptr& query ) ScriptCollection::resolve( const Tomahawk::query_ptr& query )
{ {
ScriptJob* job = scriptAccount()->resolve( scriptObject(), query ); ScriptJob* job = scriptAccount()->resolve( scriptObject(), query, "collection" );
connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onResolveRequestDone( QVariantMap ) ) ); connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onResolveRequestDone( QVariantMap ) ) );