summaryrefslogtreecommitdiffstats
path: root/logic/OneSixAssets.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-26 02:28:50 +0100
committerSky <git@bunnies.cc>2013-10-26 02:31:58 +0100
commit0430a2a38fe3b6a18dc13090c236272fbb85df0b (patch)
treeec07fae4d522e83297f84e7b76e95b0b322663e6 /logic/OneSixAssets.cpp
parentba938dd8e2cf95110624a338a891e8395bc4a1d2 (diff)
downloadMultiMC-0430a2a38fe3b6a18dc13090c236272fbb85df0b.tar
MultiMC-0430a2a38fe3b6a18dc13090c236272fbb85df0b.tar.gz
MultiMC-0430a2a38fe3b6a18dc13090c236272fbb85df0b.tar.lz
MultiMC-0430a2a38fe3b6a18dc13090c236272fbb85df0b.tar.xz
MultiMC-0430a2a38fe3b6a18dc13090c236272fbb85df0b.zip
Add assets download status to status bar.
Diffstat (limited to 'logic/OneSixAssets.cpp')
-rw-r--r--logic/OneSixAssets.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/logic/OneSixAssets.cpp b/logic/OneSixAssets.cpp
index 6aa0a207..ff19a86b 100644
--- a/logic/OneSixAssets.cpp
+++ b/logic/OneSixAssets.cpp
@@ -67,6 +67,8 @@ void OneSixAssets::fetchXMLFinished()
QString fprefix ( "assets/" );
nuke_whitelist.clear();
+ emit filesStarted();
+
auto firstJob = index_job->first();
QByteArray ba = std::dynamic_pointer_cast<ByteArrayDownload>(firstJob)->m_data;
@@ -84,6 +86,7 @@ void OneSixAssets::fetchXMLFinished()
DownloadJob *job = new DownloadJob("Assets");
connect ( job, SIGNAL(succeeded()), SLOT(downloadFinished()) );
connect ( job, SIGNAL(failed()), SIGNAL(failed()) );
+ connect ( job, SIGNAL(filesProgress(int, int, int)), SIGNAL(filesProgress(int, int, int)) );
auto metacache = MMC->metacache();
@@ -130,14 +133,15 @@ void OneSixAssets::fetchXMLFinished()
emit finished();
}
}
+
void OneSixAssets::start()
{
auto job = new DownloadJob("Assets index");
job->addByteArrayDownload(QUrl ( "http://s3.amazonaws.com/Minecraft.Resources/" ));
connect ( job, SIGNAL(succeeded()), SLOT ( fetchXMLFinished() ) );
+ emit indexStarted();
index_job.reset ( job );
job->start();
}
-
#include "OneSixAssets.moc"