aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--launcher/ModDownloadTask.cpp2
-rw-r--r--launcher/minecraft/mod/LocalModUpdateTask.cpp7
-rw-r--r--launcher/minecraft/mod/ModFolderModel.h7
-rw-r--r--launcher/modplatform/packwiz/Packwiz.cpp44
-rw-r--r--launcher/modplatform/packwiz/Packwiz.h5
5 files changed, 48 insertions, 17 deletions
diff --git a/launcher/ModDownloadTask.cpp b/launcher/ModDownloadTask.cpp
index e5766435..ad1e64e3 100644
--- a/launcher/ModDownloadTask.cpp
+++ b/launcher/ModDownloadTask.cpp
@@ -5,7 +5,7 @@
ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods)
: m_mod(mod), m_mod_version(version), mods(mods)
{
- m_update_task.reset(new LocalModUpdateTask(mods->dir(), m_mod, m_mod_version));
+ m_update_task.reset(new LocalModUpdateTask(mods->indexDir(), m_mod, m_mod_version));
addTask(m_update_task);
diff --git a/launcher/minecraft/mod/LocalModUpdateTask.cpp b/launcher/minecraft/mod/LocalModUpdateTask.cpp
index 0f48217b..63f5cf9a 100644
--- a/launcher/minecraft/mod/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/LocalModUpdateTask.cpp
@@ -5,12 +5,11 @@
#include "FileSystem.h"
#include "modplatform/packwiz/Packwiz.h"
-LocalModUpdateTask::LocalModUpdateTask(QDir mods_dir, ModPlatform::IndexedPack& mod, ModPlatform::IndexedVersion& mod_version)
- : m_mod(mod), m_mod_version(mod_version)
+LocalModUpdateTask::LocalModUpdateTask(QDir index_dir, ModPlatform::IndexedPack& mod, ModPlatform::IndexedVersion& mod_version)
+ : m_index_dir(index_dir), m_mod(mod), m_mod_version(mod_version)
{
// Ensure a '.index' folder exists in the mods folder, and create it if it does not
- m_index_dir = { QString("%1/.index").arg(mods_dir.absolutePath()) };
- if (!FS::ensureFolderPathExists(m_index_dir.path())) {
+ if (!FS::ensureFolderPathExists(index_dir.path())) {
emitFailed(QString("Unable to create index for mod %1!").arg(m_mod.name));
}
}
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 62c504df..f8ad4ca8 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -108,11 +108,16 @@ public:
bool isValid();
- QDir dir()
+ QDir& dir()
{
return m_dir;
}
+ QDir indexDir()
+ {
+ return { QString("%1/.index").arg(dir().absolutePath()) };
+ }
+
const QList<Mod> & allMods()
{
return mods;
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index 58bead82..bfadf7cb 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -7,6 +7,12 @@
#include <QDir>
#include <QObject>
+// Helpers
+static inline QString indexFileName(QString const& mod_name)
+{
+ return QString("%1.toml").arg(mod_name);
+}
+
auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
{
Mod mod;
@@ -28,14 +34,13 @@ auto Packwiz::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pac
void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
{
// Ensure the corresponding mod's info exists, and create it if not
- auto index_file_name = QString("%1.toml").arg(mod.name);
- QFile index_file(index_dir.absoluteFilePath(index_file_name));
+ QFile index_file(index_dir.absoluteFilePath(indexFileName(mod.name)));
// There's already data on there!
if (index_file.exists()) { index_file.remove(); }
if (!index_file.open(QIODevice::ReadWrite)) {
- qCritical() << "Could not open file " << index_file_name << "!";
+ qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
return;
}
@@ -60,15 +65,34 @@ void Packwiz::updateModIndex(QDir& index_dir, Mod& mod)
}
}
-auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
+void Packwiz::deleteModIndex(QDir& index_dir, QString& mod_name)
+{
+ QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
+
+ if(!index_file.exists()){
+ qWarning() << QString("Tried to delete non-existent mod metadata for %1!").arg(mod_name);
+ return;
+ }
+
+ if(!index_file.remove()){
+ qWarning() << QString("Failed to remove metadata for mod %1!").arg(mod_name);
+ }
+}
+
+auto Packwiz::getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod
{
Mod mod;
- auto index_file_name = QString("%1.toml").arg(mod_name);
- QFile index_file(index_dir.absoluteFilePath(index_file_name));
+ QFile index_file(index_dir.absoluteFilePath(indexFileName(mod_name)));
- if (!index_file.exists()) { return mod; }
- if (!index_file.open(QIODevice::ReadOnly)) { return mod; }
+ if (!index_file.exists()) {
+ qWarning() << QString("Tried to get a non-existent mod metadata for %1").arg(mod_name);
+ return mod;
+ }
+ if (!index_file.open(QIODevice::ReadOnly)) {
+ qWarning() << QString("Failed to open mod metadata for %1").arg(mod_name);
+ return mod;
+ }
toml_table_t* table;
@@ -78,7 +102,7 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
index_file.close();
if (!table) {
- qCritical() << QString("Could not open file %1").arg(index_file_name);
+ qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
return mod;
}
@@ -136,7 +160,7 @@ auto Packwiz::getIndexForMod(QDir& index_dir, QString mod_name) -> Mod
} else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps::providerName(Provider::MODRINTH)))) {
mod.provider = Provider::MODRINTH;
} else {
- qCritical() << "No mod provider on mod metadata!";
+ qCritical() << QString("No mod provider on mod metadata!");
return {};
}
diff --git a/launcher/modplatform/packwiz/Packwiz.h b/launcher/modplatform/packwiz/Packwiz.h
index 08edaab9..541059d0 100644
--- a/launcher/modplatform/packwiz/Packwiz.h
+++ b/launcher/modplatform/packwiz/Packwiz.h
@@ -40,8 +40,11 @@ class Packwiz {
* */
static void updateModIndex(QDir& index_dir, Mod& mod);
+ /* Deletes the metadata for the mod with the given name. If the metadata doesn't exist, it does nothing. */
+ static void deleteModIndex(QDir& index_dir, QString& mod_name);
+
/* Gets the metadata for a mod with a particular name.
* If the mod doesn't have a metadata, it simply returns an empty Mod object.
* */
- static auto getIndexForMod(QDir& index_dir, QString mod_name) -> Mod;
+ static auto getIndexForMod(QDir& index_dir, QString& mod_name) -> Mod;
};
generated by cgit (git 2.46.0) at 2025-02-02 21:52:27 +0000