aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame/FlamePackExportTask.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-06-24 15:02:00 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-06-24 15:02:00 +0300
commit4a84084d9d605ae4fa9a8063f36bfdbcdc4c5c3d (patch)
treee3baf17e57b50bf95836384bd4c2a47b481886be /launcher/modplatform/flame/FlamePackExportTask.cpp
parent25579fbedcfac6b36c6b30ad2447d702b601e1d6 (diff)
downloadPrismLauncher-4a84084d9d605ae4fa9a8063f36bfdbcdc4c5c3d.tar.gz
PrismLauncher-4a84084d9d605ae4fa9a8063f36bfdbcdc4c5c3d.tar.bz2
PrismLauncher-4a84084d9d605ae4fa9a8063f36bfdbcdc4c5c3d.zip
Added condition for modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/modplatform/flame/FlamePackExportTask.cpp')
-rw-r--r--launcher/modplatform/flame/FlamePackExportTask.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index fb5bcc0b..dc407653 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -118,7 +118,7 @@ void FlamePackExportTask::collectHashes()
}
if (mod->metadata() && mod->metadata()->provider == ModPlatform::ResourceProvider::FLAME) {
resolvedFiles.insert(mod->fileinfo().absoluteFilePath(),
- { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(),
+ { mod->metadata()->project_id.toInt(), mod->metadata()->file_id.toInt(), mod->enabled(), true,
mod->metadata()->name, mod->metadata()->slug, mod->authors().join(", ") });
setProgress(m_progress + 1, totalProgres);
continue;
@@ -128,7 +128,7 @@ void FlamePackExportTask::collectHashes()
connect(hash_task.get(), &Hashing::Hasher::resultsReady, [this, mod, totalProgres](QString hash) {
if (m_state == Task::State::Running) {
setProgress(m_progress + 1, totalProgres);
- pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled() });
+ pendingHashes.insert(hash, { mod->name(), mod->fileinfo().absoluteFilePath(), mod->enabled(), true });
}
});
connect(hash_task.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
@@ -215,8 +215,8 @@ void FlamePackExportTask::makeApiRequest()
setStatus(tr("Parsing API response from CurseForge for '%1'...").arg(mod->name));
if (Json::ensureBoolean(file_obj, "isAvailable", false, "isAvailable"))
- resolvedFiles.insert(mod->path,
- { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"), mod->enabled });
+ resolvedFiles.insert(mod->path, { Json::requireInteger(file_obj, "modId"), Json::requireInteger(file_obj, "id"),
+ mod->enabled, mod->isMod });
}
} catch (Json::JsonException& e) {
@@ -336,11 +336,13 @@ void FlamePackExportTask::buildZip()
}
QString content = "";
for (auto mod : resolvedFiles) {
- content += QString(TEMPLATE)
- .replace("{name}", mod.name)
- .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
- .replace("{authors}", mod.authors) +
- "\n";
+ if (mod.isMod) {
+ content += QString(TEMPLATE)
+ .replace("{name}", mod.name)
+ .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug))
+ .replace("{authors}", mod.authors) +
+ "\n";
+ }
}
content = "<ul>" + content + "</ul>";
modlist.write(content.toUtf8());