1 files changed, 62 insertions, 22 deletions

diff --git a/api/logic/net/NetJob.cpp b/api/logic/net/NetJob.cpp
index 275da749..304b5820 100644
--- a/api/logic/net/NetJob.cpp
+++ b/api/logic/net/NetJob.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,55 +59,74 @@ void NetJob::partAborted(int index)
 void NetJob::partProgress(int index, qint64 bytesReceived, qint64 bytesTotal)
 {
 	auto &slot = parts_progress[index];
-
-	current_progress -= slot.current_progress;
 	slot.current_progress = bytesReceived;
-	current_progress += slot.current_progress;
-
-	total_progress -= slot.total_progress;
 	slot.total_progress = bytesTotal;
-	total_progress += slot.total_progress;
-	setProgress(current_progress, total_progress);
+
+	int done = m_done.size();
+	int doing = m_doing.size();
+	int all = parts_progress.size();
+
+	qint64 bytesAll = 0;
+	qint64 bytesTotalAll = 0;
+	for(auto & partIdx: m_doing)
+	{
+		auto part = parts_progress[partIdx];
+		// do not count parts with unknown/nonsensical total size
+		if(part.total_progress <= 0)
+		{
+			continue;
+		}
+		bytesAll += part.current_progress;
+		bytesTotalAll += part.total_progress;
+	}
+
+	qint64 inprogress = (bytesTotalAll == 0) ? 0 : (bytesAll * 1000) / bytesTotalAll;
+	auto current = done * 1000 + doing * inprogress;
+	auto current_total = all * 1000;
+	// HACK: make sure it never jumps backwards.
+	if(m_current_progress > current)
+	{
+		current = m_current_progress;
+	}
+	m_current_progress = current;
+	setProgress(current, current_total);
 }
 
 void NetJob::executeTask()
 {
-	qDebug() << m_job_name.toLocal8Bit() << " started.";
-	m_running = true;
-	for (int i = 0; i < downloads.size(); i++)
-	{
-		m_todo.enqueue(i);
-	}
 	// hack that delays early failures so they can be caught easier
 	QMetaObject::invokeMethod(this, "startMoreParts", Qt::QueuedConnection);
 }
 
 void NetJob::startMoreParts()
 {
-	// check for final conditions if there's nothing in the queue
+	if(!isRunning())
+	{
+		// this actually makes sense. You can put running downloads into a NetJob and then not start it until much later.
+		return;
+	}
+	// OK. We are actively processing tasks, proceed.
+	// Check for final conditions if there's nothing in the queue.
 	if(!m_todo.size())
 	{
 		if(!m_doing.size())
 		{
 			if(!m_failed.size())
 			{
-				qDebug() << m_job_name << "succeeded.";
 				emitSucceeded();
 			}
 			else if(m_aborted)
 			{
-				qDebug() << m_job_name << "aborted.";
-				emitFailed(tr("Job '%1' aborted.").arg(m_job_name));
+				emitAborted();
 			}
 			else
 			{
-				qCritical() << m_job_name << "failed.";
-				emitFailed(tr("Job '%1' failed to process:\n%2").arg(m_job_name).arg(getFailedFiles().join("\n")));
+				emitFailed(tr("Job '%1' failed to process:\n%2").arg(objectName()).arg(getFailedFiles().join("\n")));
 			}
 		}
 		return;
 	}
-	// otherwise try to start more parts
+	// There's work to do, try to start more parts.
 	while (m_doing.size() < 6)
 	{
 		if(!m_todo.size())
@@ -131,7 +150,7 @@ QStringList NetJob::getFailedFiles()
 	QStringList failed;
 	for (auto index: m_failed)
 	{
-		failed.push_back(downloads[index]->m_url.toString());
+		failed.push_back(downloads[index]->url().toString());
 	}
 	failed.sort();
 	return failed;
@@ -170,3 +189,24 @@ bool NetJob::abort()
 	}
 	return fullyAborted;
 }
+
+bool NetJob::addNetAction(NetActionPtr action)
+{
+	action->m_index_within_job = downloads.size();
+	downloads.append(action);
+	part_info pi;
+	parts_progress.append(pi);
+	partProgress(parts_progress.count() - 1, action->currentProgress(), action->totalProgress());
+
+	if(action->isRunning())
+	{
+		connect(action.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int)));
+		connect(action.get(), SIGNAL(failed(int)), SLOT(partFailed(int)));
+		connect(action.get(), SIGNAL(netActionProgress(int, qint64, qint64)), SLOT(partProgress(int, qint64, qint64)));
+	}
+	else
+	{
+		m_todo.append(parts_progress.size() - 1);
+	}
+	return true;
+}