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

Fix detection of tracks/artists charts in lastfm

Browse Source
This commit is contained in:
Casey Link
2011-09-04 22:32:33 -05:00
parent 0a7e49f6d5
commit f32320fd67
2 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp
View File

@@ -403,8 +403,9 @@ LastFmPlugin::notInCacheSlot( uint requestId, QHash<QString, QString> criteria,
{ {
case InfoChart: case InfoChart:
{ {
tDebug() << "LastfmPlugin: InfoChart not in cache, fetching"; tDebug() << "LastFmPlugin: InfoChart not in cache, fetching";
QMap<QString, QString> args; QMap<QString, QString> args;
tDebug() << "LastFmPlugin: " << "args chart_id" << criteria["chart_id"];
args["method"] = criteria["chart_id"]; args["method"] = criteria["chart_id"];
args["limit"] = "100"; args["limit"] = "100";
QNetworkReply* reply = lastfm::ws::get(args); QNetworkReply* reply = lastfm::ws::get(args);
@@ -539,8 +540,11 @@ LastFmPlugin::chartReturned()
QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() ); QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
QVariantMap returnedData; QVariantMap returnedData;
const QRegExp tracks_rx( "chart\\.\\S+tracks\\S*", Qt::CaseInsensitive );
const QRegExp artists_rx( "chart\\.\\S+artists\\S*", Qt::CaseInsensitive );
const QString url = reply->url().toString();
if( replyIsTracks( reply) ) { if( url.contains( tracks_rx ) ) {
QList<lastfm::Track> tracks = parseTrackList( reply ); QList<lastfm::Track> tracks = parseTrackList( reply );
QList<ArtistTrackPair> top_tracks; QList<ArtistTrackPair> top_tracks;
foreach( const lastfm::Track &t, tracks ) { foreach( const lastfm::Track &t, tracks ) {
@@ -553,7 +557,7 @@ LastFmPlugin::chartReturned()
returnedData["tracks"] = QVariant::fromValue( top_tracks ); returnedData["tracks"] = QVariant::fromValue( top_tracks );
returnedData["type"] = "tracks"; returnedData["type"] = "tracks";
} else if( replyIsArtists( reply ) ) { } else if( url.contains( artists_rx ) ) {
QList<lastfm::Artist> list = lastfm::Artist::list( reply ); QList<lastfm::Artist> list = lastfm::Artist::list( reply );
QStringList al; QStringList al;
tDebug() << "LastFmPlugin:"<< "\tgot " << list.size() << " artists"; tDebug() << "LastFmPlugin:"<< "\tgot " << list.size() << " artists";
@@ -823,32 +827,3 @@ LastFmPlugin::parseTrackList( QNetworkReply * reply )
return tracks; return tracks;
} }
bool
LastFmPlugin::replyIsTracks( QNetworkReply *reply )
{
try {
lastfm::XmlQuery lfm = lastfm::ws::parse(reply);
QDomElement e(lfm["tracks"]);
return !e.isNull();
}
catch (lastfm::ws::ParseError& e)
{
qWarning() << e.what();
return false;
}
}
bool
LastFmPlugin::replyIsArtists( QNetworkReply *reply )
{
try {
lastfm::XmlQuery lfm = lastfm::ws::parse(reply);
QDomElement e(lfm["artists"]);
return !e.isNull();
}
catch (lastfm::ws::ParseError& e)
{
qWarning() << e.what();
return false;
}
}

2
src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h
View File

@@ -78,8 +78,6 @@ private:
void dataError( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void dataError( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData );
QList<lastfm::Track> parseTrackList( QNetworkReply * reply ); QList<lastfm::Track> parseTrackList( QNetworkReply * reply );
bool replyIsTracks( QNetworkReply *reply );
bool replyIsArtists( QNetworkReply *reply );
lastfm::MutableTrack m_track; lastfm::MutableTrack m_track;
lastfm::Audioscrobbler* m_scrobbler; lastfm::Audioscrobbler* m_scrobbler;