mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

Either the lastfm XML output has changed, or this library was buggy all along. This patch fixes the parsing of <track> elements.

Browse Source
This commit is contained in:
Casey Link
2011-08-21 18:03:21 -05:00
parent c6a104af93
commit a21992a99a
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
thirdparty/liblastfm2/src/types/Track.cpp vendored
View File

@@ -51,11 +51,32 @@ lastfm::Track::Track( const QDomElement& e )
d = new TrackData; d = new TrackData;
if (e.isNull()) { d->null = true; return; } if (e.isNull()) { d->null = true; return; }
d->artist = e.namedItem( "artist" ).toElement().text(); //TODO: not sure of lastfm's xml changed, but <track> nodes have
// <artist><name>Artist Name</name><mbid>..<url></artist>
// as children isntead of <artist>Artist Name<artist>
// we detect both here.
QDomNode artistName = e.namedItem( "artist" ).namedItem( "name" );
if( artistName.isNull() ) {
d->artist = e.namedItem( "artist" ).toElement().text();
} else {
d->artist = artistName.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();
//TODO: not sure if lastfm xml's changed, or if chart.getTopTracks uses
//a different format, but the title is stored at
//<track><name>Title</name>...
//we detect both here.
QDomNode trackTitle = e.namedItem( "name" );
if( trackTitle.isNull() )
d->title = e.namedItem( "track" ).toElement().text();
else
d->title = trackTitle.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();