Add assets download status to status bar.

This commit is contained in:
Sky 2013-10-26 02:28:50 +01:00
parent ba938dd8e2
commit 0430a2a38f
6 changed files with 63 additions and 4 deletions

View File

@ -155,6 +155,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
// FIXME: stop using POINTERS everywhere // FIXME: stop using POINTERS everywhere
connect(MMC->instances().get(), SIGNAL(dataIsInvalid()), SLOT(selectionBad())); connect(MMC->instances().get(), SIGNAL(dataIsInvalid()), SLOT(selectionBad()));
m_statusLeft = new QLabel(tr("Instance type"), this);
m_statusRight = new QLabel(tr("Assets information"), this);
m_statusRight->setAlignment(Qt::AlignRight);
statusBar()->addPermanentWidget(m_statusLeft, 1);
statusBar()->addPermanentWidget(m_statusRight, 0);
// run the things that load and download other things... FIXME: this is NOT the place // run the things that load and download other things... FIXME: this is NOT the place
// FIXME: invisible actions in the background = NOPE. // FIXME: invisible actions in the background = NOPE.
{ {
@ -168,6 +174,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
MMC->lwjgllist()->loadList(); MMC->lwjgllist()->loadList();
} }
assets_downloader = new OneSixAssets(); assets_downloader = new OneSixAssets();
connect(assets_downloader, SIGNAL(indexStarted()), SLOT(assetsIndexStarted()));
connect(assets_downloader, SIGNAL(filesStarted()), SLOT(assetsFilesStarted()));
connect(assets_downloader, SIGNAL(filesProgress(int, int, int)), SLOT(assetsFilesProgress(int, int, int)));
connect(assets_downloader, SIGNAL(failed()), SLOT(assetsFailed()));
connect(assets_downloader, SIGNAL(finished()), SLOT(assetsFinished()));
assets_downloader->start(); assets_downloader->start();
} }
} }
@ -754,8 +765,7 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
m_selectedInstance->menuActionEnabled("actionEditInstMods")); m_selectedInstance->menuActionEnabled("actionEditInstMods"));
ui->actionChangeInstMCVersion->setEnabled( ui->actionChangeInstMCVersion->setEnabled(
m_selectedInstance->menuActionEnabled("actionChangeInstMCVersion")); m_selectedInstance->menuActionEnabled("actionChangeInstMCVersion"));
statusBar()->clearMessage(); m_statusLeft->setText(m_selectedInstance->getStatusbarDescription());
statusBar()->showMessage(m_selectedInstance->getStatusbarDescription());
auto ico = MMC->icons()->getIcon(iconKey); auto ico = MMC->icons()->getIcon(iconKey);
ui->actionChangeInstIcon->setIcon(ico); ui->actionChangeInstIcon->setIcon(ico);
} }
@ -851,3 +861,31 @@ void MainWindow::checkSetDefaultJava()
MMC->settings()->set("JavaPath", QString("java")); MMC->settings()->set("JavaPath", QString("java"));
} }
} }
void MainWindow::assetsIndexStarted()
{
m_statusRight->setText(tr("Checking assets..."));
}
void MainWindow::assetsFilesStarted()
{
m_statusRight->setText(tr("Downloading assets..."));
}
void MainWindow::assetsFilesProgress(int succeeded, int failed, int total)
{
QString status = tr("Downloading assets: %1 / %2").arg(succeeded + failed).arg(total);
if(failed > 0) status += tr(" (%1 failed)").arg(failed);
status += tr("...");
m_statusRight->setText(status);
}
void MainWindow::assetsFailed()
{
m_statusRight->setText(tr("Failed to update assets."));
}
void MainWindow::assetsFinished()
{
m_statusRight->setText(tr("Assets up to date."));
}

View File

@ -116,6 +116,12 @@ private slots:
void on_actionInstanceSettings_triggered(); void on_actionInstanceSettings_triggered();
void assetsIndexStarted();
void assetsFilesStarted();
void assetsFilesProgress(int, int, int);
void assetsFailed();
void assetsFinished();
public slots: public slots:
void instanceActivated(QModelIndex); void instanceActivated(QModelIndex);
@ -150,6 +156,9 @@ private:
LoginResponse m_activeLogin; LoginResponse m_activeLogin;
Task *m_versionLoadTask; Task *m_versionLoadTask;
QLabel *m_statusLeft;
QLabel *m_statusRight;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H

View File

@ -67,6 +67,8 @@ void OneSixAssets::fetchXMLFinished()
QString fprefix ( "assets/" ); QString fprefix ( "assets/" );
nuke_whitelist.clear(); nuke_whitelist.clear();
emit filesStarted();
auto firstJob = index_job->first(); auto firstJob = index_job->first();
QByteArray ba = std::dynamic_pointer_cast<ByteArrayDownload>(firstJob)->m_data; QByteArray ba = std::dynamic_pointer_cast<ByteArrayDownload>(firstJob)->m_data;
@ -84,6 +86,7 @@ void OneSixAssets::fetchXMLFinished()
DownloadJob *job = new DownloadJob("Assets"); DownloadJob *job = new DownloadJob("Assets");
connect ( job, SIGNAL(succeeded()), SLOT(downloadFinished()) ); connect ( job, SIGNAL(succeeded()), SLOT(downloadFinished()) );
connect ( job, SIGNAL(failed()), SIGNAL(failed()) ); connect ( job, SIGNAL(failed()), SIGNAL(failed()) );
connect ( job, SIGNAL(filesProgress(int, int, int)), SIGNAL(filesProgress(int, int, int)) );
auto metacache = MMC->metacache(); auto metacache = MMC->metacache();
@ -130,14 +133,15 @@ void OneSixAssets::fetchXMLFinished()
emit finished(); emit finished();
} }
} }
void OneSixAssets::start() void OneSixAssets::start()
{ {
auto job = new DownloadJob("Assets index"); auto job = new DownloadJob("Assets index");
job->addByteArrayDownload(QUrl ( "http://s3.amazonaws.com/Minecraft.Resources/" )); job->addByteArrayDownload(QUrl ( "http://s3.amazonaws.com/Minecraft.Resources/" ));
connect ( job, SIGNAL(succeeded()), SLOT ( fetchXMLFinished() ) ); connect ( job, SIGNAL(succeeded()), SLOT ( fetchXMLFinished() ) );
emit indexStarted();
index_job.reset ( job ); index_job.reset ( job );
job->start(); job->start();
} }
#include "OneSixAssets.moc" #include "OneSixAssets.moc"

View File

@ -10,6 +10,9 @@ class OneSixAssets : public QObject
signals: signals:
void failed(); void failed();
void finished(); void finished();
void indexStarted();
void filesStarted();
void filesProgress(int, int, int);
public slots: public slots:
void fetchXMLFinished(); void fetchXMLFinished();

View File

@ -56,6 +56,8 @@ void DownloadJob::partSucceeded(int index)
num_succeeded++; num_succeeded++;
QLOG_INFO() << m_job_name.toLocal8Bit() << "progress:" << num_succeeded << "/" QLOG_INFO() << m_job_name.toLocal8Bit() << "progress:" << num_succeeded << "/"
<< downloads.size(); << downloads.size();
emit filesProgress(num_succeeded, num_failed, downloads.size());
if (num_failed + num_succeeded == downloads.size()) if (num_failed + num_succeeded == downloads.size())
{ {
if (num_failed) if (num_failed)
@ -78,6 +80,7 @@ void DownloadJob::partFailed(int index)
{ {
QLOG_ERROR() << "Part" << index << "failed 3 times (" << downloads[index]->m_url << ")"; QLOG_ERROR() << "Part" << index << "failed 3 times (" << downloads[index]->m_url << ")";
num_failed++; num_failed++;
emit filesProgress(num_succeeded, num_failed, downloads.size());
if (num_failed + num_succeeded == downloads.size()) if (num_failed + num_succeeded == downloads.size())
{ {
QLOG_ERROR() << m_job_name.toLocal8Bit() << "failed."; QLOG_ERROR() << m_job_name.toLocal8Bit() << "failed.";

View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <QtNetwork> #include <QtNetwork>
#include <QLabel>
#include "Download.h" #include "Download.h"
#include "ByteArrayDownload.h" #include "ByteArrayDownload.h"
#include "FileDownload.h" #include "FileDownload.h"
@ -57,12 +58,13 @@ public:
signals: signals:
void started(); void started();
void progress(qint64 current, qint64 total); void progress(qint64 current, qint64 total);
void filesProgress(int, int, int);
void succeeded(); void succeeded();
void failed(); void failed();
public slots: public slots:
virtual void start(); virtual void start();
private slots: private slots:
void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);; void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);
void partSucceeded(int index); void partSucceeded(int index);
void partFailed(int index); void partFailed(int index);
private: private: