Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: add metadata get/delete via mod id

Browse Source 
This is, in many cases, more reliable than name comparisons, so it's
useful specially in cases where a mod changes name between versions

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-06-11 17:19:34 -03:00
parent 9a07ede615
commit 91a5c4bdcb
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
6 changed files with 57 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/ModDownloadTask.cpp
View File

@ -46,8 +46,12 @@ ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::Inde
void ModDownloadTask::downloadSucceeded()
{
m_filesNetJob.reset();
if (!std::get<0>(to_delete).isEmpty())
mods->uninstallMod(std::get<1>(to_delete), true);
auto name = std::get<0>(to_delete);
if (!name.isEmpty()) {
// If they have the same name, we keep the metadata.
// This is a workaround for mods that change names between versions ;c
mods->uninstallMod(std::get<1>(to_delete), name == m_mod.name);
}
}
void ModDownloadTask::downloadFailed(QString reason)

10
launcher/minecraft/mod/MetadataHandler.h
View File

@ -52,8 +52,18 @@ class Metadata {
Packwiz::V1::deleteModIndex(index_dir, mod_name);
}
static void remove(QDir& index_dir, QVariant& mod_id)
{
Packwiz::V1::deleteModIndex(index_dir, mod_id);
}
static auto get(QDir& index_dir, QString& mod_name) -> ModStruct
{
return Packwiz::V1::getIndexForMod(index_dir, mod_name);
}
static auto get(QDir& index_dir, QVariant& mod_id) -> ModStruct
{
return Packwiz::V1::getIndexForMod(index_dir, mod_id);
}
};

8
launcher/minecraft/mod/Mod.cpp
View File

@ -164,12 +164,8 @@ void Mod::setMetadata(Metadata::ModStruct* metadata)
auto Mod::destroy(QDir& index_dir, bool preserve_metadata) -> bool
{
auto n = name();
// FIXME: This can fail to remove the metadata if the
// "ModMetadataDisabled" setting is on, since there could
// be a name mismatch!
if(!preserve_metadata)
Metadata::remove(index_dir, n);
if (!preserve_metadata && status() != ModStatus::NoMetadata)
Metadata::remove(index_dir, metadata()->mod_id());
m_type = MOD_UNKNOWN;
return FS::deletePath(m_file.filePath());

2
launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
View File

@ -44,7 +44,7 @@ void LocalModUpdateTask::executeTask()
{
setStatus(tr("Updating index for mod:\n%1").arg(m_mod.name));
auto old_metadata = Metadata::get(m_index_dir, m_mod.name);
auto old_metadata = Metadata::get(m_index_dir, m_mod.addonId);
if (old_metadata.isValid()) {
emit hasOldMod(old_metadata.name, old_metadata.filename);
}

27
launcher/modplatform/packwiz/Packwiz.cpp
View File

@ -144,6 +144,9 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
QFile index_file(index_dir.absoluteFilePath(real_fname));
if (real_fname != normalized_fname)
index_file.rename(normalized_fname);
// There's already data on there!
// TODO: We should do more stuff here, as the user is likely trying to
// override a file. In this case, check versions and ask the user what
@ -206,6 +209,18 @@ void V1::deleteModIndex(QDir& index_dir, QString& mod_name)
}
}
void V1::deleteModIndex(QDir& index_dir, QVariant& mod_id)
{
for (auto& file_name : index_dir.entryList(QDir::Filter::Files)) {
auto mod = getIndexForMod(index_dir, file_name);
if (mod.mod_id() == mod_id) {
deleteModIndex(index_dir, mod.name);
break;
}
}
}
auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
{
Mod mod;
@ -286,4 +301,16 @@ auto V1::getIndexForMod(QDir& index_dir, QString& index_file_name) -> Mod
return mod;
}
auto V1::getIndexForMod(QDir& index_dir, QVariant& mod_id) -> Mod
{
for (auto& file_name : index_dir.entryList(QDir::Filter::Files)) {
auto mod = getIndexForMod(index_dir, file_name);
if (mod.mod_id() == mod_id)
return mod;
}
return {};
}
} // namespace Packwiz

8
launcher/modplatform/packwiz/Packwiz.h
View File

@ -84,10 +84,18 @@ class V1 {
/* 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);
/* Deletes the metadata for the mod with the given id. If the metadata doesn't exist, it does nothing. */
static void deleteModIndex(QDir& index_dir, QVariant& mod_id);
/* 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& index_file_name) -> Mod;
/* Gets the metadata for a mod with a particular id.
* If the mod doesn't have a metadata, it simply returns an empty Mod object.
* */
static auto getIndexForMod(QDir& index_dir, QVariant& mod_id) -> Mod;
};
} // namespace Packwiz