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

Fixed Ptr logic

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-05-28 18:22:55 +03:00
parent 737fc1a2a4
commit b4dff181f7
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
View File

@ -65,8 +65,8 @@ GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
void GetModDependenciesTask::prepare() void GetModDependenciesTask::prepare()
{ {
for (auto sel : m_selected) { for (auto sel : m_selected) {
for (auto dep : getDependenciesForVersion(sel->version, sel->pack.provider)) { for (auto dep : getDependenciesForVersion(sel->version, sel->pack->provider)) {
addTask(prepareDependencyTask(dep, sel->pack.provider, 20)); addTask(prepareDependencyTask(dep, sel->pack->provider, 20));
} }
} }
} }
@ -82,7 +82,7 @@ QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion
dep == c_dependencies.end()) { // check the current dependency list dep == c_dependencies.end()) { // check the current dependency list
if (auto dep = std::find_if(m_selected.begin(), m_selected.end(), if (auto dep = std::find_if(m_selected.begin(), m_selected.end(),
[&ver_dep, providerName](std::shared_ptr<PackDependency> i) { [&ver_dep, providerName](std::shared_ptr<PackDependency> i) {
return i->pack.addonId == ver_dep.addonId && i->pack.provider == providerName; return i->pack->addonId == ver_dep.addonId && i->pack->provider == providerName;
}); });
dep == m_selected.end()) { // check the selected versions dep == m_selected.end()) { // check the selected versions
if (auto dep = std::find_if(m_mods.begin(), m_mods.end(), if (auto dep = std::find_if(m_mods.begin(), m_mods.end(),
@ -92,7 +92,7 @@ QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion
dep == m_mods.end()) { // check the existing mods dep == m_mods.end()) { // check the existing mods
if (auto dep = std::find_if(m_pack_dependencies.begin(), m_pack_dependencies.end(), if (auto dep = std::find_if(m_pack_dependencies.begin(), m_pack_dependencies.end(),
[&ver_dep, providerName](std::shared_ptr<PackDependency> i) { [&ver_dep, providerName](std::shared_ptr<PackDependency> i) {
return i->pack.addonId == ver_dep.addonId && i->pack.provider == providerName; return i->pack->addonId == ver_dep.addonId && i->pack->provider == providerName;
}); });
dep == m_pack_dependencies.end()) { // check loaded dependencies dep == m_pack_dependencies.end()) { // check loaded dependencies
c_dependencies.append(ver_dep); c_dependencies.append(ver_dep);
@ -111,7 +111,9 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
{ {
auto pDep = std::make_shared<PackDependency>(); auto pDep = std::make_shared<PackDependency>();
pDep->dependency = dep; pDep->dependency = dep;
pDep->pack = { dep.addonId, providerName }; pDep->pack = std::make_shared<ModPlatform::IndexedPack>();
pDep->pack->addonId = dep.addonId;
pDep->pack->provider = providerName;
m_pack_dependencies.append(pDep); m_pack_dependencies.append(pDep);
auto provider = providerName == m_flame_provider.name ? m_flame_provider : m_modrinth_provider; auto provider = providerName == m_flame_provider.name ? m_flame_provider : m_modrinth_provider;
@ -131,7 +133,7 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
try { try {
auto obj = provider.name == ModPlatform::ResourceProvider::FLAME ? Json::requireObject(Json::requireObject(doc), "data") auto obj = provider.name == ModPlatform::ResourceProvider::FLAME ? Json::requireObject(Json::requireObject(doc), "data")
: Json::requireObject(doc); : Json::requireObject(doc);
provider.mod->loadIndexedPack(pDep->pack, obj); provider.mod->loadIndexedPack(*pDep->pack, obj);
} catch (const JSONValidationError& e) { } catch (const JSONValidationError& e) {
qDebug() << doc; qDebug() << doc;
qWarning() << "Error while reading mod info: " << e.cause(); qWarning() << "Error while reading mod info: " << e.cause();
@ -157,8 +159,8 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
return; return;
} }
pDep->version.is_currently_selected = true; pDep->version.is_currently_selected = true;
pDep->pack.versions = { pDep->version }; pDep->pack->versions = { pDep->version };
pDep->pack.versionsLoaded = true; pDep->pack->versionsLoaded = true;
} catch (const JSONValidationError& e) { } catch (const JSONValidationError& e) {
qDebug() << doc; qDebug() << doc;

4
launcher/minecraft/mod/tasks/GetModDependenciesTask.h
View File

@ -40,10 +40,10 @@ class GetModDependenciesTask : public SequentialTask {
struct PackDependency { struct PackDependency {
ModPlatform::Dependency dependency; ModPlatform::Dependency dependency;
ModPlatform::IndexedPack pack; ModPlatform::IndexedPack::Ptr pack;
ModPlatform::IndexedVersion version; ModPlatform::IndexedVersion version;
PackDependency(){}; PackDependency(){};
PackDependency(const ModPlatform::IndexedPack& p, const ModPlatform::IndexedVersion& v) PackDependency(const ModPlatform::IndexedPack::Ptr p, const ModPlatform::IndexedVersion& v)
{ {
pack = p; pack = p;
version = v; version = v;

2
launcher/ui/dialogs/ResourceDownloadDialog.cpp
View File

@ -179,7 +179,7 @@ void ResourceDownloadDialog::confirm()
}); });
for (auto& task : selected) { for (auto& task : selected) {
confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(), confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(),
ProviderCaps.name(task->getProvider()), getReqiredBy(selected, task->getPack().addonId) }); ProviderCaps.name(task->getProvider()), getReqiredBy(selected, task->getPack()->addonId) });
} }
if (confirm_dialog->exec()) { if (confirm_dialog->exec()) {