1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00

Merge pull request #45 from hugolm84/charts

Fix bad parsing in liblastfm2 track
This commit is contained in:
Hugo Lindström
2011-10-10 09:56:48 -07:00

View File

@@ -97,10 +97,24 @@ lastfm::Track::Track( const QDomElement& e )
if (e.isNull()) { d->null = true; return; } if (e.isNull()) { d->null = true; return; }
d->artist = e.namedItem( "artist" ).toElement().text(); // XML response may have changed
QDomNode artistName = e.namedItem( "artist" ).namedItem( "name" );
if( artistName.isNull() ) {
d->artist = e.namedItem( "artist" ).toElement().text();
} else {
d->artist = artistName.toElement().text();
}
// XML response may have changed
QDomNode trackTitle = e.namedItem( "name" );
if( trackTitle.isNull() )
d->title = e.namedItem( "track" ).toElement().text();
else
d->title = trackTitle.toElement().text();
d->albumArtist = e.namedItem( "albumArtist" ).toElement().text(); d->albumArtist = e.namedItem( "albumArtist" ).toElement().text();
d->album = e.namedItem( "album" ).toElement().text(); d->album = e.namedItem( "album" ).toElement().text();
d->title = e.namedItem( "track" ).toElement().text();
d->correctedArtist = e.namedItem( "correctedArtist" ).toElement().text(); d->correctedArtist = e.namedItem( "correctedArtist" ).toElement().text();
d->correctedAlbumArtist = e.namedItem( "correctedAlbumArtist" ).toElement().text(); d->correctedAlbumArtist = e.namedItem( "correctedAlbumArtist" ).toElement().text();
d->correctedAlbum = e.namedItem( "correctedAlbum" ).toElement().text(); d->correctedAlbum = e.namedItem( "correctedAlbum" ).toElement().text();