Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-29 05:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename variables

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-01-17 21:09:44 +02:00
parent 9317a675ed
commit 7d3238d234
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -75,12 +75,12 @@ bool FlameCreationTask::abort()
return false; return false;
m_abort = true; m_abort = true;
if (m_process_update_file_info_job) if (m_processUpdateFileInfoJob)
m_process_update_file_info_job->abort(); m_processUpdateFileInfoJob->abort();
if (m_files_job) if (m_filesJob)
m_files_job->abort(); m_filesJob->abort();
if (m_mod_id_resolver) if (m_modIdResolver)
m_mod_id_resolver->abort(); m_modIdResolver->abort();
return Task::abort(); return Task::abort();
} }
@ -232,12 +232,12 @@ bool FlameCreationTask::updateInstance()
connect(job.get(), &Task::failed, this, [](QString reason) { qCritical() << "Failed to get files: " << reason; }); connect(job.get(), &Task::failed, this, [](QString reason) { qCritical() << "Failed to get files: " << reason; });
connect(job.get(), &Task::finished, &loop, &QEventLoop::quit); connect(job.get(), &Task::finished, &loop, &QEventLoop::quit);
m_process_update_file_info_job = job; m_processUpdateFileInfoJob = job;
job->start(); job->start();
loop.exec(); loop.exec();
m_process_update_file_info_job = nullptr; m_processUpdateFileInfoJob = nullptr;
} else { } else {
// We don't have an old index file, so we may duplicate stuff! // We don't have an old index file, so we may duplicate stuff!
auto dialog = CustomMessageBox::selectable(m_parent, tr("No index file."), auto dialog = CustomMessageBox::selectable(m_parent, tr("No index file."),
@ -430,26 +430,26 @@ bool FlameCreationTask::createInstance()
} }
// Don't add managed info to packs without an ID (most likely imported from ZIP) // Don't add managed info to packs without an ID (most likely imported from ZIP)
if (!m_managed_id.isEmpty()) if (!m_managedId.isEmpty())
instance.setManagedPack("flame", m_managed_id, m_pack.name, m_managed_version_id, m_pack.version); instance.setManagedPack("flame", m_managedId, m_pack.name, m_managedVersionId, m_pack.version);
else else
instance.setManagedPack("flame", "", name(), "", ""); instance.setManagedPack("flame", "", name(), "", "");
instance.setName(name()); instance.setName(name());
m_mod_id_resolver.reset(new Flame::FileResolvingTask(APPLICATION->network(), m_pack)); m_modIdResolver.reset(new Flame::FileResolvingTask(APPLICATION->network(), m_pack));
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::succeeded, this, [this, &loop] { idResolverSucceeded(loop); }); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::succeeded, this, [this, &loop] { idResolverSucceeded(loop); });
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::failed, [this, &loop](QString reason) { connect(m_modIdResolver.get(), &Flame::FileResolvingTask::failed, [this, &loop](QString reason) {
m_mod_id_resolver.reset(); m_modIdResolver.reset();
setError(tr("Unable to resolve mod IDs:\n") + reason); setError(tr("Unable to resolve mod IDs:\n") + reason);
loop.quit(); loop.quit();
}); });
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::aborted, &loop, &QEventLoop::quit); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::aborted, &loop, &QEventLoop::quit);
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::progress, this, &FlameCreationTask::setProgress); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::progress, this, &FlameCreationTask::setProgress);
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::status, this, &FlameCreationTask::setStatus); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::status, this, &FlameCreationTask::setStatus);
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::stepProgress, this, &FlameCreationTask::propagateStepProgress); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::stepProgress, this, &FlameCreationTask::propagateStepProgress);
connect(m_mod_id_resolver.get(), &Flame::FileResolvingTask::details, this, &FlameCreationTask::setDetails); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::details, this, &FlameCreationTask::setDetails);
m_mod_id_resolver->start(); m_modIdResolver->start();
loop.exec(); loop.exec();
@ -468,14 +468,14 @@ bool FlameCreationTask::createInstance()
void FlameCreationTask::idResolverSucceeded(QEventLoop& loop) void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
{ {
auto results = m_mod_id_resolver->getResults(); auto results = m_modIdResolver->getResults();
// first check for blocked mods // first check for blocked mods
QList<BlockedMod> blocked_mods; QList<BlockedMod> blocked_mods;
auto anyBlocked = false; auto anyBlocked = false;
for (const auto& result : results.files.values()) { for (const auto& result : results.files.values()) {
if (result.resourceType != PackedResourceType::Mod) { if (result.resourceType != PackedResourceType::Mod) {
m_ZIP_resources.append(std::make_pair(result.version.fileName, result.targetFolder)); m_otherResources.append(std::make_pair(result.version.fileName, result.targetFolder));
} }
if (result.version.downloadUrl.isEmpty()) { if (result.version.downloadUrl.isEmpty()) {
@ -507,7 +507,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
copyBlockedMods(blocked_mods); copyBlockedMods(blocked_mods);
setupDownloadJob(loop); setupDownloadJob(loop);
} else { } else {
m_mod_id_resolver.reset(); m_modIdResolver.reset();
setError("Canceled"); setError("Canceled");
loop.quit(); loop.quit();
} }
@ -518,8 +518,8 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
void FlameCreationTask::setupDownloadJob(QEventLoop& loop) void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
{ {
m_files_job.reset(new NetJob(tr("Mod Download Flame"), APPLICATION->network())); m_filesJob.reset(new NetJob(tr("Mod Download Flame"), APPLICATION->network()));
auto results = m_mod_id_resolver->getResults().files; auto results = m_modIdResolver->getResults().files;
QStringList optionalFiles; QStringList optionalFiles;
for (auto& result : results) { for (auto& result : results) {
@ -554,26 +554,26 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop)
if (!result.version.downloadUrl.isEmpty()) { if (!result.version.downloadUrl.isEmpty()) {
qDebug() << "Will download" << result.version.downloadUrl << "to" << path; qDebug() << "Will download" << result.version.downloadUrl << "to" << path;
auto dl = Net::ApiDownload::makeFile(result.version.downloadUrl, path); auto dl = Net::ApiDownload::makeFile(result.version.downloadUrl, path);
m_files_job->addNetAction(dl); m_filesJob->addNetAction(dl);
} }
} }
connect(m_files_job.get(), &NetJob::finished, this, [this, &loop]() { connect(m_filesJob.get(), &NetJob::finished, this, [this, &loop]() {
m_files_job.reset(); m_filesJob.reset();
validateZIPResources(loop); validateOtherResources(loop);
}); });
connect(m_files_job.get(), &NetJob::failed, [this](QString reason) { connect(m_filesJob.get(), &NetJob::failed, [this](QString reason) {
m_files_job.reset(); m_filesJob.reset();
setError(reason); setError(reason);
}); });
connect(m_files_job.get(), &NetJob::progress, this, [this](qint64 current, qint64 total) { connect(m_filesJob.get(), &NetJob::progress, this, [this](qint64 current, qint64 total) {
setDetails(tr("%1 out of %2 complete").arg(current).arg(total)); setDetails(tr("%1 out of %2 complete").arg(current).arg(total));
setProgress(current, total); setProgress(current, total);
}); });
connect(m_files_job.get(), &NetJob::stepProgress, this, &FlameCreationTask::propagateStepProgress); connect(m_filesJob.get(), &NetJob::stepProgress, this, &FlameCreationTask::propagateStepProgress);
setStatus(tr("Downloading mods...")); setStatus(tr("Downloading mods..."));
m_files_job->start(); m_filesJob->start();
} }
/// @brief copy the matched blocked mods to the instance staging area /// @brief copy the matched blocked mods to the instance staging area
@ -614,11 +614,11 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
setAbortable(true); setAbortable(true);
} }
void FlameCreationTask::validateZIPResources(QEventLoop& loop) void FlameCreationTask::validateOtherResources(QEventLoop& loop)
{ {
qDebug() << "Validating whether resources stored as .zip are in the right place"; qDebug() << "Validating whether other resources are in the right place";
QStringList zipMods; QStringList zipMods;
for (auto [fileName, targetFolder] : m_ZIP_resources) { for (auto [fileName, targetFolder] : m_otherResources) {
qDebug() << "Checking" << fileName << "..."; qDebug() << "Checking" << fileName << "...";
auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName); auto localPath = FS::PathCombine(m_stagingPath, "minecraft", targetFolder, fileName);
@ -686,7 +686,7 @@ void FlameCreationTask::validateZIPResources(QEventLoop& loop)
} }
// TODO make this work with other sorts of resource // TODO make this work with other sorts of resource
auto task = makeShared<ConcurrentTask>("CreateModMetadata", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt()); auto task = makeShared<ConcurrentTask>("CreateModMetadata", APPLICATION->settings()->get("NumberOfConcurrentTasks").toInt());
auto results = m_mod_id_resolver->getResults().files; auto results = m_modIdResolver->getResults().files;
auto folder = FS::PathCombine(m_stagingPath, "minecraft", "mods", ".index"); auto folder = FS::PathCombine(m_stagingPath, "minecraft", "mods", ".index");
for (auto file : results) { for (auto file : results) {
if (file.targetFolder != "mods" || (file.version.fileName.endsWith(".zip") && !zipMods.contains(file.version.fileName))) { if (file.targetFolder != "mods" || (file.version.fileName.endsWith(".zip") && !zipMods.contains(file.version.fileName))) {
@ -695,6 +695,6 @@ void FlameCreationTask::validateZIPResources(QEventLoop& loop)
task->addTask(makeShared<LocalResourceUpdateTask>(folder, file.pack, file.version)); task->addTask(makeShared<LocalResourceUpdateTask>(folder, file.pack, file.version));
} }
connect(task.get(), &Task::finished, &loop, &QEventLoop::quit); connect(task.get(), &Task::finished, &loop, &QEventLoop::quit);
m_process_update_file_info_job = task; m_processUpdateFileInfoJob = task;
task->start(); task->start();
} }

14
launcher/modplatform/flame/FlameInstanceCreationTask.h
View File

@ -57,7 +57,7 @@ class FlameCreationTask final : public InstanceCreationTask {
QString id, QString id,
QString version_id, QString version_id,
QString original_instance_id = {}) QString original_instance_id = {})
: InstanceCreationTask(), m_parent(parent), m_managed_id(std::move(id)), m_managed_version_id(std::move(version_id)) : InstanceCreationTask(), m_parent(parent), m_managedId(std::move(id)), m_managedVersionId(std::move(version_id))
{ {
setStagingPath(staging_path); setStagingPath(staging_path);
setParentSettings(global_settings); setParentSettings(global_settings);
@ -74,22 +74,22 @@ class FlameCreationTask final : public InstanceCreationTask {
void idResolverSucceeded(QEventLoop&); void idResolverSucceeded(QEventLoop&);
void setupDownloadJob(QEventLoop&); void setupDownloadJob(QEventLoop&);
void copyBlockedMods(QList<BlockedMod> const& blocked_mods); void copyBlockedMods(QList<BlockedMod> const& blocked_mods);
void validateZIPResources(QEventLoop& loop); void validateOtherResources(QEventLoop& loop);
QString getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion); QString getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion);
private: private:
QWidget* m_parent = nullptr; QWidget* m_parent = nullptr;
shared_qobject_ptr<Flame::FileResolvingTask> m_mod_id_resolver; shared_qobject_ptr<Flame::FileResolvingTask> m_modIdResolver;
Flame::Manifest m_pack; Flame::Manifest m_pack;
// Handle to allow aborting // Handle to allow aborting
Task::Ptr m_process_update_file_info_job = nullptr; Task::Ptr m_processUpdateFileInfoJob = nullptr;
NetJob::Ptr m_files_job = nullptr; NetJob::Ptr m_filesJob = nullptr;
QString m_managed_id, m_managed_version_id; QString m_managedId, m_managedVersionId;
QList<std::pair<QString, QString>> m_ZIP_resources; QList<std::pair<QString, QString>> m_otherResources;
std::optional<InstancePtr> m_instance; std::optional<InstancePtr> m_instance;
}; };