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

* Robuster error / retry handling.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-05-22 11:38:12 +02:00
parent 2ee66a3cda
commit ac8703c9e7
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/accounts/lastfm/LastFmConfig.cpp
View File

@@ -34,6 +34,7 @@ using namespace Tomahawk::Accounts;
LastFmConfig::LastFmConfig( LastFmAccount* account ) LastFmConfig::LastFmConfig( LastFmAccount* account )
: QWidget( 0 ) : QWidget( 0 )
, m_account( account ) , m_account( account )
, m_page( 1 )
{ {
m_ui = new Ui_LastFmConfig; m_ui = new Ui_LastFmConfig;
m_ui->setupUi( this ); m_ui->setupUi( this );
@@ -105,9 +106,9 @@ LastFmConfig::enableButton()
void void
LastFmConfig::loadHistory( int page ) LastFmConfig::loadHistory()
{ {
if ( page == 1 ) if ( m_page == 1 )
{ {
m_ui->importHistory->setText( tr( "Importing History..." ) ); m_ui->importHistory->setText( tr( "Importing History..." ) );
m_ui->importHistory->setEnabled( false ); m_ui->importHistory->setEnabled( false );
@@ -115,7 +116,7 @@ LastFmConfig::loadHistory( int page )
m_ui->progressBar->show(); m_ui->progressBar->show();
} }
QNetworkReply* reply = lastfm::User( m_ui->username->text().toLower() ).getRecentTracks( 200, page ); QNetworkReply* reply = lastfm::User( m_ui->username->text().toLower() ).getRecentTracks( 200, m_page );
connect( reply, SIGNAL( finished() ), SLOT( onHistoryLoaded() ) ); connect( reply, SIGNAL( finished() ), SLOT( onHistoryLoaded() ) );
} }
@@ -123,6 +124,7 @@ LastFmConfig::loadHistory( int page )
void void
LastFmConfig::onHistoryLoaded() LastFmConfig::onHistoryLoaded()
{ {
int total = 0;
bool finished = false; bool finished = false;
QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() ); QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
@@ -132,7 +134,7 @@ LastFmConfig::onHistoryLoaded()
foreach ( lastfm::XmlQuery e, lfm.children( "track" ) ) foreach ( lastfm::XmlQuery e, lfm.children( "track" ) )
{ {
tDebug() << "Found:" << e["artist"].text() << e["name"].text() << e["date"].attribute( "uts" ).toUInt(); // tDebug() << "Found:" << e["artist"].text() << e["name"].text() << e["date"].attribute( "uts" ).toUInt();
Tomahawk::query_ptr query = Query::get( e["artist"].text(), e["name"].text(), QString(), QString(), false ); Tomahawk::query_ptr query = Query::get( e["artist"].text(), e["name"].text(), QString(), QString(), false );
uint timeStamp = e["date"].attribute( "uts" ).toUInt(); uint timeStamp = e["date"].attribute( "uts" ).toUInt();
@@ -145,14 +147,16 @@ LastFmConfig::onHistoryLoaded()
lastfm::XmlQuery stats = lfm.children( "recenttracks" ).first(); lastfm::XmlQuery stats = lfm.children( "recenttracks" ).first();
int page = stats.attribute( "page" ).toInt(); int page = stats.attribute( "page" ).toInt();
int total = stats.attribute( "totalPages" ).toInt(); total = stats.attribute( "totalPages" ).toInt();
tDebug() << "page:" << page << "total:" << total;
m_ui->progressBar->setMaximum( total ); m_ui->progressBar->setMaximum( total );
m_ui->progressBar->setValue( page ); m_ui->progressBar->setValue( page );
if ( page < total ) if ( page < total )
loadHistory( ++page ); {
m_page = page + 1;
loadHistory();
}
else else
finished = true; finished = true;
} }
@@ -167,12 +171,15 @@ LastFmConfig::onHistoryLoaded()
if ( finished ) if ( finished )
{ {
if ( m_ui->progressBar->value() != m_ui->progressBar->maximum() ) if ( m_page != total )
{
m_ui->importHistory->setText( tr( "History Incomplete. Retry" ) ); m_ui->importHistory->setText( tr( "History Incomplete. Retry" ) );
m_ui->importHistory->setEnabled( true );
}
else else
m_ui->importHistory->setText( tr( "Import Playback History" ) ); {
m_ui->importHistory->setText( tr( "Playback History Imported" ) );
m_ui->importHistory->setEnabled( true ); }
} }
} }

4
src/accounts/lastfm/LastFmConfig.h
View File

@@ -46,12 +46,14 @@ public slots:
private slots: private slots:
void enableButton(); void enableButton();
void loadHistory( int page = 1 ); void loadHistory();
void onHistoryLoaded(); void onHistoryLoaded();
private: private:
LastFmAccount* m_account; LastFmAccount* m_account;
Ui_LastFmConfig* m_ui; Ui_LastFmConfig* m_ui;
unsigned int m_page;
}; };
} }