mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

Go back to old way of sending artists in charts, as old data type may be cached

Browse Source
This commit is contained in:
Leo Franchi
2011-12-24 11:10:23 -06:00
parent 01d6a22f92
commit 9634d3230f
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp
View File

@@ -453,7 +453,7 @@ ChartsPlugin::chartReturned()
QVariantList chartResponse = res.value( "list" ).toList();
QList< Tomahawk::InfoSystem::InfoStringHash > top_tracks;
QList< Tomahawk::InfoSystem::InfoStringHash > top_albums;
QList< Tomahawk::InfoSystem::InfoStringHash > top_artists;
QStringList top_artists;
/// Deside what type, we need to handle it differently
/// @todo: We allready know the type, append it to breadcrumb hash
@@ -528,9 +528,7 @@ ChartsPlugin::chartReturned()
}
else
{
Tomahawk::InfoSystem::InfoStringHash artistHash;
artistHash["artist"] = artist;
top_artists.append( artistHash );
top_artists.append( artist );
}
}
@@ -540,7 +538,7 @@ ChartsPlugin::chartReturned()
if( chartType() == Artist )
{
tDebug() << "ChartsPlugin:" << "\tgot " << top_artists.size() << " artists";
returnedData[ "artists" ] = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( top_artists );
returnedData[ "artists" ] = QVariant::fromValue< QStringList >( top_artists );
returnedData[ "type" ] = "artists";
}

5
src/libtomahawk/widgets/ChartDataLoader.cpp
View File

@@ -45,8 +45,9 @@ ChartDataLoader::go()
{
QList< artist_ptr > artist_ptrs;
foreach ( const Tomahawk::InfoSystem::InfoStringHash& artistname, m_data ) {
artist_ptrs << Artist::get( artistname[ "artist" ], false );
foreach ( const QString& artistname, m_artists )
{
artist_ptrs << Artist::get( artistname, false );
}
emit artists( this, artist_ptrs );

2
src/libtomahawk/widgets/ChartDataLoader.h
View File

@@ -47,6 +47,7 @@ public:
void setType( DataType type ) { m_type = type; }
void setData( const QList< InfoSystem::InfoStringHash >& data ) { m_data = data; }
void setData( const QStringList& artists ) { m_artists = artists; }
public slots:
void go();
@@ -60,6 +61,7 @@ signals:
private:
DataType m_type;
QList<InfoSystem::InfoStringHash> m_data;
QStringList m_artists;
};
}

6
src/libtomahawk/widgets/whatshotwidget.cpp
View File

@@ -253,7 +253,7 @@ WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestDat
if ( type == "artists" )
{
loader->setType( ChartDataLoader::Artist );
loader->setData( returnedData[ "artists" ].value< QList< Tomahawk::InfoSystem::InfoStringHash > >() );
loader->setData( returnedData[ "artists" ].value< QStringList >() );
connect( loader, SIGNAL( artists( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ), this, SLOT( chartArtistsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ) );
@@ -479,10 +479,12 @@ WhatsHotWidget::chartArtistsLoaded( ChartDataLoader* loader, const QList< artist
QString chartId = loader->property( "chartid" ).toString();
Q_ASSERT( m_artistModels.contains( chartId ) );
if ( !m_artistModels.contains( chartId ) )
if ( m_artistModels.contains( chartId ) )
{
foreach( const artist_ptr& artist, artists )
{
m_artistModels[ chartId ]->addArtists( artist );
}
}
loader->deleteLater();