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

cleanup the mod name checking

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-08-15 23:55:09 +03:00
parent f7f7bc6865
commit c41c39b5d8
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/minecraft/mod/ModFolderModel.cpp
View File

@ -196,10 +196,7 @@ Task* ModFolderModel::createParseTask(Resource& resource)
bool ModFolderModel::uninstallMod(const QString& filename, bool preserve_metadata) bool ModFolderModel::uninstallMod(const QString& filename, bool preserve_metadata)
{ {
for (auto mod : allMods()) { for (auto mod : allMods()) {
auto modfilename = mod->fileinfo().fileName(); if (mod->getOriginalFileName() == filename) {
if (!mod->enabled() && modfilename.endsWith(".disabled"))
modfilename.chop(9);
if (modfilename == filename) {
auto index_dir = indexDir(); auto index_dir = indexDir();
mod->destroy(index_dir, preserve_metadata, false); mod->destroy(index_dir, preserve_metadata, false);

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

@ -169,3 +169,11 @@ bool Resource::isMoreThanOneHardLink() const
{ {
return FS::hardLinkCount(m_file_info.absoluteFilePath()) > 1; return FS::hardLinkCount(m_file_info.absoluteFilePath()) > 1;
} }
auto Resource::getOriginalFileName() const -> QString
{
auto fileName = m_file_info.fileName();
if (!m_enabled)
fileName.chop(9);
return fileName;
}

1
launcher/minecraft/mod/Resource.h
View File

@ -45,6 +45,7 @@ class Resource : public QObject {
[[nodiscard]] auto internal_id() const -> QString { return m_internal_id; } [[nodiscard]] auto internal_id() const -> QString { return m_internal_id; }
[[nodiscard]] auto type() const -> ResourceType { return m_type; } [[nodiscard]] auto type() const -> ResourceType { return m_type; }
[[nodiscard]] bool enabled() const { return m_enabled; } [[nodiscard]] bool enabled() const { return m_enabled; }
[[nodiscard]] auto getOriginalFileName() const -> QString;
[[nodiscard]] virtual auto name() const -> QString { return m_name; } [[nodiscard]] virtual auto name() const -> QString { return m_name; }
[[nodiscard]] virtual bool valid() const { return m_type != ResourceType::UNKNOWN; } [[nodiscard]] virtual bool valid() const { return m_type != ResourceType::UNKNOWN; }