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

Don't wait for timeouts on resolver errors

Browse Source
This commit is contained in:
Dominik Schmidt
2015-11-13 14:12:12 +01:00
parent 35d8945975
commit 846699c03c
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/Pipeline.cpp
View File

@@ -323,6 +323,13 @@ Pipeline::resolve( QID qid, bool prioritized, bool temporaryQuery )
} }
void
Pipeline::reportError( QID qid, Tomahawk::Resolver* r )
{
reportResults( qid, r, QList< result_ptr>() );
}
void void
Pipeline::reportResults( QID qid, Tomahawk::Resolver* r, const QList< result_ptr >& results ) Pipeline::reportResults( QID qid, Tomahawk::Resolver* r, const QList< result_ptr >& results )
{ {

1
src/libtomahawk/Pipeline.h
View File

@@ -54,6 +54,7 @@ public:
unsigned int pendingQueryCount() const; unsigned int pendingQueryCount() const;
unsigned int activeQueryCount() const; unsigned int activeQueryCount() const;
void reportError( QID qid, Tomahawk::Resolver* r );
void reportResults( QID qid, Tomahawk::Resolver* r, const QList< result_ptr >& results ); void reportResults( QID qid, Tomahawk::Resolver* r, const QList< result_ptr >& results );
void reportAlbums( QID qid, const QList< album_ptr >& albums ); void reportAlbums( QID qid, const QList< album_ptr >& albums );
void reportArtists( QID qid, const QList< artist_ptr >& artists ); void reportArtists( QID qid, const QList< artist_ptr >& artists );

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

@@ -566,9 +566,12 @@ JSResolver::onResolveRequestDone( const QVariantMap& data )
Q_D( JSResolver ); Q_D( JSResolver );
ScriptJob* job = qobject_cast< ScriptJob* >( sender() ); ScriptJob* job = qobject_cast< ScriptJob* >( sender() );
QID qid = job->property( "qid" ).toString();
if ( job->error() ) if ( job->error() )
{ {
// what do here?! Tomahawk::Pipeline::instance()->reportError( qid, this );
} }
else else
{ {
@@ -581,7 +584,7 @@ JSResolver::onResolveRequestDone( const QVariantMap& data )
result->setFriendlySource( name() ); result->setFriendlySource( name() );
} }
Tomahawk::Pipeline::instance()->reportResults( job->property( "qid" ).toString(), this, results ); Tomahawk::Pipeline::instance()->reportResults( qid, this, results );
} }
sender()->deleteLater(); sender()->deleteLater();