CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed some setProgress calls

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-06-25 17:50:56 +03:00
parent fa3a46498f
commit d344ffe370
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/modplatform/flame/FlamePackExportTask.cpp
View File

@ -110,8 +110,7 @@ void FlamePackExportTask::collectHashes()
auto allMods = mcInstance->loaderModList()->allMods(); auto allMods = mcInstance->loaderModList()->allMods();
ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10)); ConcurrentTask::Ptr hashing_task(new ConcurrentTask(this, "MakeHashesTask", 10));
task.reset(hashing_task); task.reset(hashing_task);
int totalProgres = allMods.count(); int totalProgres = 0;
setProgress(0, totalProgres);
for (const QFileInfo& file : files) { for (const QFileInfo& file : files) {
const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath()); const QString relative = gameRoot.relativeFilePath(file.absoluteFilePath());
@ -142,17 +141,16 @@ void FlamePackExportTask::collectHashes()
modIter != allMods.end()) { modIter != allMods.end()) {
const Mod* mod = *modIter; const Mod* mod = *modIter;
if (!mod || mod->type() == ResourceType::FOLDER) { if (!mod || mod->type() == ResourceType::FOLDER) {
setProgress(m_progress + 1, totalProgres);
continue; continue;
} }
if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) { if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
resolvedFiles.insert(mod->fileinfo().absoluteFilePath(), resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
{ mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true, { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") }); mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
setProgress(m_progress + 1, totalProgres);
continue; continue;
} }
totalProgres++;
auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath()); auto hash_task = Hashing::createFlameHasher(mod->fileinfo().absoluteFilePath());
connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) { connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
if (m_state == Task::State::Running) { if (m_state == Task::State::Running) {
@ -209,9 +207,7 @@ void FlamePackExportTask::makeApiRequest()
return; return;
} }
size_t progress = 0;
for (auto match : data_arr) { for (auto match : data_arr) {
setProgress(progress++, data_arr.count());
auto match_obj = Json::ensureObject(match, {}); auto match_obj = Json::ensureObject(match, {});
auto file_obj = Json::ensureObject(match_obj, "file", {}); auto file_obj = Json::ensureObject(match_obj, "file", {});
@ -284,9 +280,7 @@ void FlamePackExportTask::getProjectsInfo()
else else
entries = Json::requireArray(Json::requireObject(doc), "data"); entries = Json::requireArray(Json::requireObject(doc), "data");
size_t progress = 0;
for (auto entry : entries) { for (auto entry : entries) {
setProgress(progress++, entries.count());
auto entry_obj = Json::requireObject(entry); auto entry_obj = Json::requireObject(entry);
try { try {