From fc235ccf1b0697c7366b673853be69fa26827816 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 21 Aug 2011 18:04:44 -0500 Subject: [PATCH] Implement fetching and displaying of the Top Tracks Chart. --- .../infoplugins/generic/lastfmplugin.cpp | 100 +++++++++++++++++- .../infoplugins/generic/lastfmplugin.h | 4 + src/libtomahawk/infosystem/infosystem.h | 7 ++ src/libtomahawk/widgets/whatshotwidget.cpp | 25 ++++- src/tomahawkapp.cpp | 2 + 5 files changed, 131 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp index 1162e9ec5..a752a5d1b 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp @@ -47,7 +47,7 @@ LastFmPlugin::LastFmPlugin() : InfoPlugin() , m_scrobbler( 0 ) { - m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChartArtists; + m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChartArtists << InfoChartTracks; m_supportedPushTypes << InfoSubmitScrobble << InfoSubmitNowPlaying << InfoLove << InfoUnLove; /* @@ -151,6 +151,10 @@ LastFmPlugin::getInfo( uint requestId, Tomahawk::InfoSystem::InfoRequestData req fetchChartArtists( requestId, requestData ); break; + case InfoChartTracks: + fetchChartTracks( requestId, requestData ); + break; + default: dataError( requestId, requestData ); } @@ -321,6 +325,25 @@ LastFmPlugin::fetchChartArtists( uint requestId, Tomahawk::InfoSystem::InfoReque } +void +LastFmPlugin::fetchChartTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ) +{ + if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoCriteriaHash >() ) + { + dataError( requestId, requestData ); + return; + } + InfoCriteriaHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash >(); + Tomahawk::InfoSystem::InfoCriteriaHash criteria; + if ( hash.contains( "country" ) ) + { + criteria["country"] = hash["country"]; + } + + emit getCachedInfo( requestId, criteria, 2419200000, requestData ); +} + + void LastFmPlugin::fetchCoverArt( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ) { @@ -397,6 +420,25 @@ LastFmPlugin::notInCacheSlot( uint requestId, QHash criteria, return; } + case InfoChartTracks: + { + tDebug() << "LastfmPlugin: InfoChartTracks not in cache, fetching"; + QMap args; + if( criteria.contains( "country" ) ) { + args["method"] = "geo.getTopTracks"; + args["country"] = criteria["country"]; + } else { + args["method"] = "chart.getTopTracks"; + } + args["limit"] = "100"; + QNetworkReply* reply = lastfm::ws::get(args); + reply->setProperty( "requestId", requestId ); + reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) ); + + connect( reply, SIGNAL( finished() ), SLOT( chartTopTracksReturned() ) ); + return; + } + case InfoArtistSimilars: { lastfm::Artist a( criteria["artist"] ); @@ -519,6 +561,42 @@ LastFmPlugin::chartTopArtistsReturned() emit updateCache( criteria, 2419200000, requestData.type, returnedData ); } +void +LastFmPlugin::chartTopTracksReturned() +{ + tDebug() << "LastfmPlugin: InfoChartTracks data returned!"; + QNetworkReply* reply = qobject_cast( sender() ); + QList tracks = parseTrackList( reply ); + + QList top_tracks; + + foreach( const lastfm::Track &t, tracks ) { + ArtistTrackPair pair; + pair.artist = t.artist().toString(); + pair.track = t.title(); + top_tracks << pair; + } + + tDebug() << "\tgot " << top_tracks.size() << " tracks"; + + QVariantMap returnedData; + returnedData["tracks"] = QVariant::fromValue( top_tracks ); + + Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(); + + emit info( + reply->property( "requestId" ).toUInt(), + requestData, + returnedData + ); + + Tomahawk::InfoSystem::InfoCriteriaHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash>(); + Tomahawk::InfoSystem::InfoCriteriaHash criteria; + if( origData.contains("country") ) + criteria["country"] = origData["country"]; + emit updateCache( criteria, 0, requestData.type, returnedData ); +} + void LastFmPlugin::topTracksReturned() { @@ -539,7 +617,7 @@ LastFmPlugin::topTracksReturned() Tomahawk::InfoSystem::InfoCriteriaHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoCriteriaHash>(); Tomahawk::InfoSystem::InfoCriteriaHash criteria; criteria["artist"] = origData["artist"]; - emit updateCache( criteria, 2419200000, requestData.type, returnedData ); + emit updateCache( criteria, 0, requestData.type, returnedData ); } @@ -746,3 +824,21 @@ LastFmPlugin::createScrobbler() } } + +QList +LastFmPlugin::parseTrackList( QNetworkReply * reply ) +{ + QList tracks; + try { + lastfm::XmlQuery lfm = lastfm::ws::parse(reply); + foreach (lastfm::XmlQuery xq, lfm.children( "track" )) { + tracks.append( lastfm::Track( xq ) ); + } + } + catch (lastfm::ws::ParseError& e) + { + qWarning() << e.what(); + } + return tracks; +} + diff --git a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h index 59f8af6ce..c8da91a73 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h @@ -53,6 +53,7 @@ public slots: void similarArtistsReturned(); void topTracksReturned(); void chartTopArtistsReturned(); + void chartTopTracksReturned(); void namChangedSlot( QNetworkAccessManager *nam ); @@ -68,6 +69,7 @@ private: void fetchSimilarArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void fetchTopTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void fetchChartArtists( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); + void fetchChartTracks( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); void createScrobbler(); void nowPlaying( const QVariant &input ); @@ -76,6 +78,8 @@ private: void dataError( uint requestId, Tomahawk::InfoSystem::InfoRequestData requestData ); + QList parseTrackList( QNetworkReply * reply ); + lastfm::MutableTrack m_track; lastfm::Audioscrobbler* m_scrobbler; QString m_pw; diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/infosystem.h index b04394356..7037da075 100644 --- a/src/libtomahawk/infosystem/infosystem.h +++ b/src/libtomahawk/infosystem/infosystem.h @@ -122,6 +122,11 @@ struct InfoRequestData { QVariantMap customData; }; +struct ArtistTrackPair { + QString artist; + QString track; +}; + typedef QMap< InfoType, QVariant > InfoTypeMap; typedef QMap< InfoType, uint > InfoTimeoutMap; typedef QMap< QString, QMap< QString, QString > > InfoGenericMap; @@ -258,5 +263,7 @@ Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoRequestData ); Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoGenericMap ); Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoCriteriaHash ); Q_DECLARE_METATYPE( QWeakPointer< Tomahawk::InfoSystem::InfoSystemCache > ); +Q_DECLARE_METATYPE( Tomahawk::InfoSystem::ArtistTrackPair ); +Q_DECLARE_METATYPE( QList ); #endif // TOMAHAWK_INFOSYSTEM_H diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index 83badbaa3..429b1f2af 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -56,9 +56,10 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) m_tracksModel = new PlaylistModel( ui->tracksView ); - m_tracksModel->setStyle( TrackModel::ShortWithAvatars ); + m_tracksModel->setStyle( TrackModel::Short ); + ui->tracksView->overlay()->setEnabled( false ); - ui->tracksView->setPlaylistModel( m_tracksModel ); + ui->tracksView->setTrackModel( m_tracksModel ); ui->tracksView->setHeaderHidden( true ); ui->tracksView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); @@ -99,7 +100,11 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) requestData.type = Tomahawk::InfoSystem::InfoChartArtists; Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); - tDebug() << "WhatsHot: requested InfoChartArtists"; + + requestData.type = Tomahawk::InfoSystem::InfoChartTracks; + Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); + + tDebug() << "WhatsHot: requested InfoChartArtists+Tracks"; } @@ -113,7 +118,7 @@ void WhatsHotWidget::checkQueries() { m_timer->stop(); -// m_tracksModel->ensureResolved(); + m_tracksModel->ensureResolved(); } @@ -141,7 +146,17 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat } break; } - + case InfoSystem::InfoChartTracks: + { + const QList tracks = returnedData["tracks"].value >(); + tDebug() << "WhatsHot: got tracks! " << tracks.size(); + foreach ( const Tomahawk::InfoSystem::ArtistTrackPair& track, tracks ) + { + query_ptr query = Query::get( track.artist, track.track, QString(), uuid() ); + m_tracksModel->append( query ); + } + break; + } default: return; } diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index bd841c2dc..55819319c 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -389,6 +389,8 @@ TomahawkApp::registerMetaTypes() qRegisterMetaType< QWeakPointer< Tomahawk::InfoSystem::InfoSystemCache > >( "QWeakPointer< Tomahawk::InfoSystem::InfoSystemCache >" ); qRegisterMetaType< DirLister::Mode >("DirLister::Mode"); + qRegisterMetaType< Tomahawk::InfoSystem::ArtistTrackPair >("Tomahawk::InfoSystem::ArtistTrackPair"); + qRegisterMetaType< QList >("QList"); }