summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt3
-rw-r--r--gui/MainWindow.cpp2
-rw-r--r--logic/OneSixUpdate.cpp1
-rw-r--r--logic/QObjectPtr.h52
-rw-r--r--logic/net/NetAction.h7
-rw-r--r--logic/net/NetJob.cpp90
-rw-r--r--logic/net/NetJob.h21
7 files changed, 130 insertions, 46 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 145a519a..c26f57e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -478,6 +478,9 @@ SET(MULTIMC_SOURCES
logic/OneSixInstance.h
logic/OneSixInstance.cpp
+ # a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
+ logic/QObjectPtr.h
+
# Common utils for instances
logic/JarUtils.h
logic/JarUtils.cpp
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 43e8b6c0..7df3ac0e 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -297,7 +297,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
connect(job, SIGNAL(succeeded()), SLOT(skinJobFinished()));
connect(job, SIGNAL(failed()), SLOT(skinJobFinished()));
for (auto action : skin_dls)
+ {
job->addNetAction(action);
+ }
skin_download_job.reset(job);
job->start();
}
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index fe8cf3b5..789032d3 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -201,6 +201,7 @@ void OneSixUpdate::jarlibStart()
auto entry = metacache->resolveEntry("versions", localPath);
job->addNetAction(CacheDownload::make(QUrl(urlstr), entry));
jarHashOnEntry = entry->md5sum;
+
jarlibDownloadJob.reset(job);
}
diff --git a/logic/QObjectPtr.h b/logic/QObjectPtr.h
new file mode 100644
index 00000000..74c6e82a
--- /dev/null
+++ b/logic/QObjectPtr.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <memory>
+
+/**
+ * A pointer class with the usual shared pointer semantics intended for derivates of QObject
+ * Calls deleteLater() instead of destroying the contained object immediately
+ */
+template <typename T>
+class QObjectPtr
+{
+public:
+ QObjectPtr(){}
+ QObjectPtr(T * wrap)
+ {
+ reset(wrap);
+ }
+ QObjectPtr(const QObjectPtr<T>& other)
+ {
+ m_ptr = other.m_ptr;
+ }
+
+public:
+ void reset(T * wrap)
+ {
+ using namespace std::placeholders;
+ m_ptr.reset(wrap, std::bind(&QObject::deleteLater, _1));
+ }
+ void reset()
+ {
+ m_ptr.reset();
+ }
+ T * get() const
+ {
+ return m_ptr.get();
+ }
+ T * operator->() const
+ {
+ return m_ptr.get();
+ }
+ T & operator*() const
+ {
+ return *m_ptr.get();
+ }
+ operator bool() const
+ {
+ return m_ptr.get() != nullptr;
+ }
+
+private:
+ std::shared_ptr <T> m_ptr;
+};
diff --git a/logic/net/NetAction.h b/logic/net/NetAction.h
index eb3153d2..803c9259 100644
--- a/logic/net/NetAction.h
+++ b/logic/net/NetAction.h
@@ -29,7 +29,7 @@ enum JobStatus
};
typedef std::shared_ptr<class NetAction> NetActionPtr;
-class NetAction : public QObject
+class NetAction : public QObject, public std::enable_shared_from_this<NetAction>
{
Q_OBJECT
protected:
@@ -51,6 +51,11 @@ public:
{
return m_failures;
}
+ NetActionPtr getSharedPtr()
+ {
+ return shared_from_this();
+ }
+
public:
/// the network reply
std::shared_ptr<QNetworkReply> m_reply;
diff --git a/logic/net/NetJob.cpp b/logic/net/NetJob.cpp
index 4418d17b..282ee789 100644
--- a/logic/net/NetJob.cpp
+++ b/logic/net/NetJob.cpp
@@ -28,46 +28,27 @@ void NetJob::partSucceeded(int index)
auto &slot = parts_progress[index];
partProgress(index, slot.total_progress, slot.total_progress);
- num_succeeded++;
- QLOG_INFO() << m_job_name.toLocal8Bit() << "progress:" << num_succeeded << "/"
- << downloads.size();
-
- if (num_failed + num_succeeded == downloads.size())
- {
- if (num_failed)
- {
- QLOG_ERROR() << m_job_name.toLocal8Bit() << "failed.";
- emit failed();
- }
- else
- {
- QLOG_INFO() << m_job_name.toLocal8Bit() << "succeeded.";
- emit succeeded();
- }
- }
+ m_doing.remove(index);
+ m_done.insert(index);
+ disconnect(downloads[index].get(), 0, this, 0);
+ startMoreParts();
}
void NetJob::partFailed(int index)
{
+ m_doing.remove(index);
auto &slot = parts_progress[index];
if (slot.failures == 3)
{
- QLOG_ERROR() << "Part" << index << "failed 3 times (" << downloads[index]->m_url << ")";
- num_failed++;
- if (num_failed + num_succeeded == downloads.size())
- {
- QLOG_ERROR() << m_job_name.toLocal8Bit() << "failed.";
- emit failed();
- }
+ m_failed.insert(index);
}
else
{
- QLOG_ERROR() << "Part" << index << "failed, restarting (" << downloads[index]->m_url
- << ")";
- // restart the job
slot.failures++;
- downloads[index]->start();
+ m_todo.enqueue(index);
}
+ disconnect(downloads[index].get(), 0, this, 0);
+ startMoreParts();
}
void NetJob::partProgress(int index, qint64 bytesReceived, qint64 bytesTotal)
@@ -88,25 +69,58 @@ void NetJob::start()
{
QLOG_INFO() << m_job_name.toLocal8Bit() << " started.";
m_running = true;
- for (auto iter : downloads)
+ for (int i = 0; i < downloads.size(); i++)
{
- connect(iter.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int)));
- connect(iter.get(), SIGNAL(failed(int)), SLOT(partFailed(int)));
- connect(iter.get(), SIGNAL(progress(int, qint64, qint64)),
+ m_todo.enqueue(i);
+ }
+ startMoreParts();
+}
+
+void NetJob::startMoreParts()
+{
+ // check for final conditions if there's nothing in the queue
+ if(!m_todo.size())
+ {
+ if(!m_doing.size())
+ {
+ if(!m_failed.size())
+ {
+ QLOG_INFO() << m_job_name.toLocal8Bit() << "succeeded.";
+ emit succeeded();
+ }
+ else
+ {
+ QLOG_ERROR() << m_job_name.toLocal8Bit() << "failed.";
+ emit failed();
+ }
+ }
+ return;
+ }
+ // otherwise try to start more parts
+ while (m_doing.size() < 6)
+ {
+ if(!m_todo.size())
+ return;
+ int doThis = m_todo.dequeue();
+ m_doing.insert(doThis);
+ auto part = downloads[doThis];
+ // connect signals :D
+ connect(part.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int)));
+ connect(part.get(), SIGNAL(failed(int)), SLOT(partFailed(int)));
+ connect(part.get(), SIGNAL(progress(int, qint64, qint64)),
SLOT(partProgress(int, qint64, qint64)));
- iter->start();
+ part->start();
}
}
+
QStringList NetJob::getFailedFiles()
{
QStringList failed;
- for (auto download : downloads)
+ for (auto index: m_failed)
{
- if (download->m_status == Job_Failed)
- {
- failed.push_back(download->m_url.toString());
- }
+ failed.push_back(downloads[index]->m_url.toString());
}
+ failed.sort();
return failed;
}
diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h
index e8adcfa3..1b6f49b6 100644
--- a/logic/net/NetJob.h
+++ b/logic/net/NetJob.h
@@ -22,9 +22,10 @@
#include "CacheDownload.h"
#include "HttpMetaCache.h"
#include "logic/tasks/ProgressProvider.h"
+#include "logic/QObjectPtr.h"
class NetJob;
-typedef std::shared_ptr<NetJob> NetJobPtr;
+typedef QObjectPtr<NetJob> NetJobPtr;
class NetJob : public ProgressProvider
{
@@ -81,18 +82,22 @@ public:
return m_running;
}
QStringList getFailedFiles();
+
+private:
+ void startMoreParts();
+
signals:
void started();
void progress(qint64 current, qint64 total);
void succeeded();
void failed();
-public
-slots:
+
+public slots:
virtual void start();
// FIXME: implement
virtual void abort() {};
-private
-slots:
+
+private slots:
void partProgress(int index, qint64 bytesReceived, qint64 bytesTotal);
void partSucceeded(int index);
void partFailed(int index);
@@ -107,9 +112,11 @@ private:
QString m_job_name;
QList<NetActionPtr> downloads;
QList<part_info> parts_progress;
+ QQueue<int> m_todo;
+ QSet<int> m_doing;
+ QSet<int> m_done;
+ QSet<int> m_failed;
qint64 current_progress = 0;
qint64 total_progress = 0;
- int num_succeeded = 0;
- int num_failed = 0;
bool m_running = false;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 13:10:02 +0000