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

Fix crash in parseResultVariantList for broken track data

Browse Source
This commit is contained in:
Dominik Schmidt
2016-01-27 17:31:37 +01:00
parent a5968b58e5
commit d50c16740a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,10 +259,20 @@ ScriptAccount::parseResultVariantList( const QVariantList& reslist )
{ {
QList< Tomahawk::result_ptr > results; QList< Tomahawk::result_ptr > results;
foreach( const QVariant& rv, reslist ) foreach( const QVariant& rv, reslist )
{ {
QVariantMap m = rv.toMap(); QVariantMap m = rv.toMap();
const QString artistString = m.value("artist").toString().trimmed();
const QString trackString = m.value("track").toString().trimmed();
if ( artistString.isEmpty() || trackString.isEmpty() )
{
tLog() << Q_FUNC_INFO << "Could not parse Track" << m;
continue;
}
int duration = m.value( "duration", 0 ).toInt(); int duration = m.value( "duration", 0 ).toInt();
if ( duration <= 0 && m.contains( "durationString" ) ) if ( duration <= 0 && m.contains( "durationString" ) )
{ {
@@ -270,8 +280,8 @@ ScriptAccount::parseResultVariantList( const QVariantList& reslist )
duration = time.secsTo( QTime( 0, 0 ) ) * -1; duration = time.secsTo( QTime( 0, 0 ) ) * -1;
} }
Tomahawk::track_ptr track = Tomahawk::Track::get( m.value( "artist" ).toString(), Tomahawk::track_ptr track = Tomahawk::Track::get( artistString,
m.value( "track" ).toString(), trackString,
m.value( "album" ).toString(), m.value( "album" ).toString(),
m.value( "albumArtist" ).toString(), m.value( "albumArtist" ).toString(),
duration, duration,