aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-06-24 15:04:18 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-06-24 15:04:18 +0300
commit19cb6ad5883c59c27f954042025bf89d44bed096 (patch)
tree14b6c94ca3b734b06c3f2f296fd5a546b9b08c5a
parent4a84084d9d605ae4fa9a8063f36bfdbcdc4c5c3d (diff)
downloadPrismLauncher-19cb6ad5883c59c27f954042025bf89d44bed096.tar.gz
PrismLauncher-19cb6ad5883c59c27f954042025bf89d44bed096.tar.bz2
PrismLauncher-19cb6ad5883c59c27f954042025bf89d44bed096.zip
Updated Modrinth esport messages
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
-rw-r--r--launcher/modplatform/flame/FlamePackExportTask.cpp2
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackExportTask.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index dc407653..837ded0f 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -157,12 +157,12 @@ void FlamePackExportTask::collectHashes()
void FlamePackExportTask::makeApiRequest()
{
- setStatus(tr("Find versions for hashes..."));
if (pendingHashes.isEmpty()) {
buildZip();
return;
}
+ setStatus(tr("Find versions for hashes..."));
auto response = std::make_shared<QByteArray>();
QList<uint> fingerprints;
diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
index c607bb89..dd748687 100644
--- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp
@@ -64,7 +64,8 @@ bool ModrinthPackExportTask::abort()
if (buildZipFuture.isRunning()) {
buildZipFuture.cancel();
- // NOTE: Here we don't do `emitAborted()` because it will be done when `buildZipFuture` actually cancels, which may not occur immediately.
+ // NOTE: Here we don't do `emitAborted()` because it will be done when `buildZipFuture` actually cancels, which may not occur
+ // immediately.
return true;
}
@@ -94,6 +95,7 @@ void ModrinthPackExportTask::collectFiles()
void ModrinthPackExportTask::collectHashes()
{
+ setStatus(tr("Find file hashes..."));
for (const QFileInfo& file : files) {
QCoreApplication::processEvents();
@@ -157,6 +159,7 @@ void ModrinthPackExportTask::makeApiRequest()
if (pendingHashes.isEmpty())
buildZip();
else {
+ setStatus(tr("Find versions for hashes..."));
auto response = std::make_shared<QByteArray>();
task = api.currentVersions(pendingHashes.values(), "sha512", response);
connect(task.get(), &NetJob::succeeded, [this, response]() { parseApiResponse(response); });