dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

made hasing task async

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-06-18 17:27:17 +03:00
parent 766ddc80e3
commit 9cbdbddb08
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
3 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
launcher/modplatform/helpers/HashUtils.cpp
View file

@ -1,16 +1,11 @@
#include "HashUtils.h"
#include <QBuffer>
#include <QDebug>
#include <QFile>
#include "FileSystem.h"
#include "StringUtils.h"
#include <QtConcurrentRun>
#include <MurmurHash2.h>
#include <qbuffer.h>
#include <qcryptographichash.h>
#include <qdebug.h>
#include <qfiledevice.h>
namespace Hashing {
@ -143,12 +138,28 @@ QString hash(QByteArray data, Algorithm type)
void Hasher::executeTask()
{
m_result = hash(m_path, m_alg);
if (m_result.isEmpty()) {
emitFailed("Empty hash!");
} else {
emitSucceeded();
emit resultsReady(m_result);
m_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return hash(m_path, m_alg); });
connect(&m_zip_watcher, &QFutureWatcher<QString>::finished, this, [this] {
if (m_zip_future.isCanceled()) {
emitAborted();
} else if (m_result = m_zip_future.result(); m_result.isEmpty()) {
emitFailed("Empty hash!");
} else {
emitSucceeded();
emit resultsReady(m_result);
}
});
m_zip_watcher.setFuture(m_zip_future);
}
bool Hasher::abort()
{
if (m_zip_future.isRunning()) {
m_zip_future.cancel();
// NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not
// occur immediately.
return true;
}
return false;
}
} // namespace Hashing