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

* Check for null results / tracks being created.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-29 05:29:50 +02:00
parent 9b53dc5c4e
commit 619a2df812
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/resolvers/QtScriptResolver.cpp
View File

@@ -728,9 +728,6 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
foreach( const QVariant& rv, reslist ) foreach( const QVariant& rv, reslist )
{ {
QVariantMap m = rv.toMap(); QVariantMap m = rv.toMap();
if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() )
continue;
// TODO we need to handle preview urls separately. they should never trump a real url, and we need to display // TODO we need to handle preview urls separately. they should never trump a real url, and we need to display
// the purchaseUrl for the user to upgrade to a full stream. // the purchaseUrl for the user to upgrade to a full stream.
if ( m.value( "preview" ).toBool() == true ) if ( m.value( "preview" ).toBool() == true )
@@ -744,7 +741,18 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
} }
Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() ); Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
Tomahawk::track_ptr track = Tomahawk::Track::get( m.value( "artist" ).toString(), m.value( "track" ).toString(), m.value( "album" ).toString(), duration, QString(), m.value( "albumpos" ).toUInt(), m.value( "discnumber" ).toUInt() ); if ( !rp )
continue;
Tomahawk::track_ptr track = Tomahawk::Track::get( m.value( "artist" ).toString(),
m.value( "track" ).toString(),
m.value( "album" ).toString(),
duration,
QString(),
m.value( "albumpos" ).toUInt(),
m.value( "discnumber" ).toUInt() );
if ( !track )
continue;
rp->setBitrate( m.value( "bitrate" ).toUInt() ); rp->setBitrate( m.value( "bitrate" ).toUInt() );
rp->setSize( m.value( "size" ).toUInt() ); rp->setSize( m.value( "size" ).toUInt() );

11
src/libtomahawk/resolvers/ScriptResolver.cpp
View File

@@ -274,13 +274,16 @@ ScriptResolver::handleMsg( const QByteArray& msg )
{ {
QVariantMap m = rv.toMap(); QVariantMap m = rv.toMap();
tDebug( LOGVERBOSE ) << "Found result:" << m; tDebug( LOGVERBOSE ) << "Found result:" << m;
if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() )
continue;
Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() ); Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
Tomahawk::track_ptr track = Tomahawk::Track::get( m.value( "artist" ).toString(), m.value( "track" ).toString(), m.value( "album" ).toString(), m.value( "duration" ).toUInt(), QString(), m.value( "albumpos" ).toUInt(), m.value( "discnumber" ).toUInt() ); if ( !rp )
rp->setTrack( track ); continue;
Tomahawk::track_ptr track = Tomahawk::Track::get( m.value( "artist" ).toString(), m.value( "track" ).toString(), m.value( "album" ).toString(), m.value( "duration" ).toUInt(), QString(), m.value( "albumpos" ).toUInt(), m.value( "discnumber" ).toUInt() );
if ( !track )
continue;
rp->setTrack( track );
rp->setBitrate( m.value( "bitrate" ).toUInt() ); rp->setBitrate( m.value( "bitrate" ).toUInt() );
rp->setSize( m.value( "size" ).toUInt() ); rp->setSize( m.value( "size" ).toUInt() );
rp->setRID( uuid() ); rp->setRID( uuid() );