1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-08 05:00:50 +02:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Dominik Schmidt
501572bba2 Don't use property to track fulltextness of query 2016-02-16 17:07:35 +01:00
Dominik Schmidt
37583eb57f Don't parse artists/albums for non-fulltext queries 2016-02-16 16:48:49 +01:00

View File

@@ -541,7 +541,6 @@ void
JSResolver::resolve( const Tomahawk::query_ptr& query )
{
ScriptJob* job = scriptAccount()->resolve( scriptObject(), query, "resolver" );
connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onResolveRequestDone( QVariantMap ) ) );
job->start();
@@ -563,11 +562,17 @@ JSResolver::onResolveRequestDone( const QVariantMap& data )
}
else
{
QList< artist_ptr > artists = scriptAccount()->parseArtistVariantList( data.value( "artists" ).toList() );
Tomahawk::Pipeline::instance()->reportArtists( qid, artists );
if ( !data.value( "artists" ).isNull() )
{
QList< artist_ptr > artists = scriptAccount()->parseArtistVariantList( data.value( "artists" ).toList() );
Tomahawk::Pipeline::instance()->reportArtists( qid, artists );
}
QList< album_ptr > albums = scriptAccount()->parseAlbumVariantList( data.value( "albums" ).toList() );
Tomahawk::Pipeline::instance()->reportAlbums( qid, albums );
if ( !data.value( "albums" ).isNull() )
{
QList< album_ptr > albums = scriptAccount()->parseAlbumVariantList( data.value( "albums" ).toList() );
Tomahawk::Pipeline::instance()->reportAlbums( qid, albums );
}
QList< Tomahawk::result_ptr > results = scriptAccount()->parseResultVariantList( data.value( "tracks" ).toList() );
foreach( const result_ptr& result, results )