Merge branch 'PrismLauncher:develop' into develop

Author: Diegiwg

flake.lock

@@ -616,6 +616,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("IconsDir", "icons");
         m_settings->registerSetting("DownloadsDir", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
         m_settings->registerSetting("DownloadsDirWatchRecursive", false);
+        m_settings->registerSetting("MoveModsFromDownloadsDir", false);
         m_settings->registerSetting("SkinsDir", "skins");
         m_settings->registerSetting("JavaDir", "java");
 

launcher/Application.cpp

@@ -1085,8 +1085,6 @@ SET(LAUNCHER_SOURCES
     ui/widgets/CustomCommands.h
     ui/widgets/EnvironmentVariables.cpp
     ui/widgets/EnvironmentVariables.h
-    ui/widgets/DropLabel.cpp
-    ui/widgets/DropLabel.h
     ui/widgets/FocusLineEdit.cpp
     ui/widgets/FocusLineEdit.h
     ui/widgets/IconLabel.cpp

launcher/CMakeLists.txt

@@ -196,7 +196,8 @@ void IconList::directoryChanged(const QString& path)
         qDebug() << "Adding icon " << addedPath;
 
         QFileInfo addfile(addedPath);
-        QString key = m_dir.relativeFilePath(addfile.absoluteFilePath());
+        QString relativePath = m_dir.relativeFilePath(addfile.absoluteFilePath());
+        QString key = QFileInfo(relativePath).completeBaseName();
         QString name = formatName(m_dir, addfile);
 
         if (addIcon(key, name, addfile.filePath(), IconType::FileBased)) {

launcher/icons/IconList.cpp

@@ -8,7 +8,10 @@ void MinecraftLoadAndCheck::executeTask()
 {
     // add offline metadata load task
     auto components = m_inst->getPackProfile();
-    components->reload(m_netmode);
+    if (auto result = components->reload(m_netmode); !result) {
+        emitFailed(result.error);
+        return;
+    }
     m_task = components->getCurrentTask();
 
     if (!m_task) {

launcher/minecraft/MinecraftLoadAndCheck.cpp

@@ -173,29 +173,32 @@ static bool savePackProfile(const QString& filename, const ComponentContainer& c
 }
 
 // Read the given file into component containers
-static bool loadPackProfile(PackProfile* parent,
-                            const QString& filename,
-                            const QString& componentJsonPattern,
-                            ComponentContainer& container)
+static PackProfile::Result loadPackProfile(PackProfile* parent,
+                                           const QString& filename,
+                                           const QString& componentJsonPattern,
+                                           ComponentContainer& container)
 {
     QFile componentsFile(filename);
     if (!componentsFile.exists()) {
-        qCWarning(instanceProfileC) << "Components file" << filename << "doesn't exist. This should never happen.";
-        return false;
+        auto message = QObject::tr("Components file %1 doesn't exist. This should never happen.").arg(filename);
+        qCWarning(instanceProfileC) << message;
+        return PackProfile::Result::Error(message);
     }
     if (!componentsFile.open(QFile::ReadOnly)) {
-        qCCritical(instanceProfileC) << "Couldn't open" << componentsFile.fileName() << " for reading:" << componentsFile.errorString();
+        auto message = QObject::tr("Couldn't open %1 for reading: %2").arg(componentsFile.fileName(), componentsFile.errorString());
+        qCCritical(instanceProfileC) << message;
         qCWarning(instanceProfileC) << "Ignoring overridden order";
-        return false;
+        return PackProfile::Result::Error(message);
     }
 
     // and it's valid JSON
     QJsonParseError error;
     QJsonDocument doc = QJsonDocument::fromJson(componentsFile.readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
-        qCCritical(instanceProfileC) << "Couldn't parse" << componentsFile.fileName() << ":" << error.errorString();
+        auto message = QObject::tr("Couldn't parse %1 as json: %2").arg(componentsFile.fileName(), error.errorString());
+        qCCritical(instanceProfileC) << message;
         qCWarning(instanceProfileC) << "Ignoring overridden order";
-        return false;
+        return PackProfile::Result::Error(message);
     }
 
     // and then read it and process it if all above is true.
@@ -212,11 +215,13 @@ static bool loadPackProfile(PackProfile* parent,
             container.append(componentFromJsonV1(parent, componentJsonPattern, comp_obj));
         }
     } catch ([[maybe_unused]] const JSONValidationError& err) {
-        qCCritical(instanceProfileC) << "Couldn't parse" << componentsFile.fileName() << ": bad file format";
+        auto message = QObject::tr("Couldn't parse %1 : bad file format").arg(componentsFile.fileName());
+        qCCritical(instanceProfileC) << message;
+        qCWarning(instanceProfileC) << "error:" << err.what();
         container.clear();
-        return false;
+        return PackProfile::Result::Error(message);
     }
-    return true;
+    return PackProfile::Result::Success();
 }
 
 // END: component file format
@@ -283,44 +288,43 @@ void PackProfile::save_internal()
     d->dirty = false;
 }
 
-bool PackProfile::load()
+PackProfile::Result PackProfile::load()
 {
     auto filename = componentsFilePath();
 
     // load the new component list and swap it with the current one...
     ComponentContainer newComponents;
-    if (!loadPackProfile(this, filename, patchesPattern(), newComponents)) {
+    if (auto result = loadPackProfile(this, filename, patchesPattern(), newComponents); !result) {
         qCritical() << d->m_instance->name() << "|" << "Failed to load the component config";
-        return false;
-    } else {
-        // FIXME: actually use fine-grained updates, not this...
-        beginResetModel();
-        // disconnect all the old components
-        for (auto component : d->components) {
-            disconnect(component.get(), &Component::dataChanged, this, &PackProfile::componentDataChanged);
-        }
-        d->components.clear();
-        d->componentIndex.clear();
-        for (auto component : newComponents) {
-            if (d->componentIndex.contains(component->m_uid)) {
-                qWarning() << d->m_instance->name() << "|" << "Ignoring duplicate component entry" << component->m_uid;
-                continue;
-            }
-            connect(component.get(), &Component::dataChanged, this, &PackProfile::componentDataChanged);
-            d->components.append(component);
-            d->componentIndex[component->m_uid] = component;
+        return result;
+    }
+    // FIXME: actually use fine-grained updates, not this...
+    beginResetModel();
+    // disconnect all the old components
+    for (auto component : d->components) {
+        disconnect(component.get(), &Component::dataChanged, this, &PackProfile::componentDataChanged);
+    }
+    d->components.clear();
+    d->componentIndex.clear();
+    for (auto component : newComponents) {
+        if (d->componentIndex.contains(component->m_uid)) {
+            qWarning() << d->m_instance->name() << "|" << "Ignoring duplicate component entry" << component->m_uid;
+            continue;
         }
-        endResetModel();
-        d->loaded = true;
-        return true;
+        connect(component.get(), &Component::dataChanged, this, &PackProfile::componentDataChanged);
+        d->components.append(component);
+        d->componentIndex[component->m_uid] = component;
     }
+    endResetModel();
+    d->loaded = true;
+    return Result::Success();
 }
 
-void PackProfile::reload(Net::Mode netmode)
+PackProfile::Result PackProfile::reload(Net::Mode netmode)
 {
     // Do not reload when the update/resolve task is running. It is in control.
     if (d->m_updateTask) {
-        return;
+        return Result::Success();
     }
 
     // flush any scheduled saves to not lose state
@@ -329,9 +333,11 @@ void PackProfile::reload(Net::Mode netmode)
     // FIXME: differentiate when a reapply is required by propagating state from components
     invalidateLaunchProfile();
 
-    if (load()) {
-        resolve(netmode);
+    if (auto result = load(); !result) {
+        return result;
     }
+    resolve(netmode);
+    return Result::Success();
 }
 
 Task::Ptr PackProfile::getCurrentTask()

launcher/minecraft/PackProfile.cpp

@@ -62,6 +62,19 @@ class PackProfile : public QAbstractListModel {
    public:
     enum Columns { NameColumn = 0, VersionColumn, NUM_COLUMNS };
 
+    struct Result {
+        bool success;
+        QString error;
+
+        // Implicit conversion to bool
+        operator bool() const { return success; }
+
+        // Factory methods for convenience
+        static Result Success() { return { true, "" }; }
+
+        static Result Error(const QString& errorMessage) { return { false, errorMessage }; }
+    };
+
     explicit PackProfile(MinecraftInstance* instance);
     virtual ~PackProfile();
 
@@ -102,7 +115,7 @@ class PackProfile : public QAbstractListModel {
     bool revertToBase(int index);
 
     /// reload the list, reload all components, resolve dependencies
-    void reload(Net::Mode netmode);
+    Result reload(Net::Mode netmode);
 
     // reload all components, resolve dependencies
     void resolve(Net::Mode netmode);
@@ -169,7 +182,7 @@ class PackProfile : public QAbstractListModel {
     void disableInteraction(bool disable);
 
    private:
-    bool load();
+    Result load();
     bool installJarMods_internal(QStringList filepaths);
     bool installCustomJar_internal(QString filepath);
     bool installAgents_internal(QStringList filepaths);

launcher/minecraft/PackProfile.h

@@ -597,8 +597,14 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
 
         qDebug() << "Will try to copy" << mod.localPath << "to" << destPath;
 
-        if (!FS::copy(mod.localPath, destPath)()) {
-            qDebug() << "Copy of" << mod.localPath << "to" << destPath << "Failed";
+        if (mod.move) {
+            if (!FS::move(mod.localPath, destPath)) {
+                qDebug() << "Move of" << mod.localPath << "to" << destPath << "Failed";
+            }
+        } else {
+            if (!FS::copy(mod.localPath, destPath)()) {
+                qDebug() << "Copy of" << mod.localPath << "to" << destPath << "Failed";
+            }
         }
 
         i++;

launcher/modplatform/flame/FlameInstanceCreationTask.cpp

@@ -288,13 +288,18 @@ void BlockedModsDialog::checkMatchHash(QString hash, QString path)
 
     qDebug() << "[Blocked Mods Dialog] Checking for match on hash: " << hash << "| From path:" << path;
 
+    auto downloadDir = QFileInfo(APPLICATION->settings()->get("DownloadsDir").toString()).absoluteFilePath();
+    auto moveFiles = APPLICATION->settings()->get("MoveModsFromDownloadsDir").toBool();
     for (auto& mod : m_mods) {
         if (mod.matched) {
             continue;
         }
         if (mod.hash.compare(hash, Qt::CaseInsensitive) == 0) {
             mod.matched = true;
             mod.localPath = path;
+            if (moveFiles) {
+                mod.move = QFileInfo(path).absoluteFilePath().startsWith(downloadDir);
+            }
             match = true;
 
             qDebug() << "[Blocked Mods Dialog] Hash match found:" << mod.name << hash << "| From path:" << path;
@@ -346,13 +351,18 @@ bool BlockedModsDialog::checkValidPath(QString path)
         return fsName.compare(metaName) == 0;
     };
 
+    auto downloadDir = QFileInfo(APPLICATION->settings()->get("DownloadsDir").toString()).absoluteFilePath();
+    auto moveFiles = APPLICATION->settings()->get("MoveModsFromDownloadsDir").toBool();
     for (auto& mod : m_mods) {
         if (compare(filename, mod.name)) {
             // if the mod is not yet matched and doesn't have a hash then
             // just match it with the file that has the exact same name
             if (!mod.matched && mod.hash.isEmpty()) {
                 mod.matched = true;
                 mod.localPath = path;
+                if (moveFiles) {
+                    mod.move = QFileInfo(path).absoluteFilePath().startsWith(downloadDir);
+                }
                 return false;
             }
             qDebug() << "[Blocked Mods Dialog] Name match found:" << mod.name << "| From path:" << path;

launcher/ui/dialogs/BlockedModsDialog.cpp

@@ -42,6 +42,7 @@ struct BlockedMod {
     bool matched;
     QString localPath;
     QString targetFolder;
+    bool move = false;
 };
 
 QT_BEGIN_NAMESPACE

launcher/ui/dialogs/BlockedModsDialog.h

@@ -235,6 +235,7 @@ void LauncherPage::applySettings()
     s->set("SkinsDir", ui->skinsDirTextBox->text());
     s->set("JavaDir", ui->javaDirTextBox->text());
     s->set("DownloadsDirWatchRecursive", ui->downloadsDirWatchRecursiveCheckBox->isChecked());
+    s->set("MoveModsFromDownloadsDir", ui->downloadsDirMoveCheckBox->isChecked());
 
     auto sortMode = (InstSortMode)ui->sortingModeGroup->checkedId();
     switch (sortMode) {
@@ -302,6 +303,7 @@ void LauncherPage::loadSettings()
     ui->skinsDirTextBox->setText(s->get("SkinsDir").toString());
     ui->javaDirTextBox->setText(s->get("JavaDir").toString());
     ui->downloadsDirWatchRecursiveCheckBox->setChecked(s->get("DownloadsDirWatchRecursive").toBool());
+    ui->downloadsDirMoveCheckBox->setChecked(s->get("MoveModsFromDownloadsDir").toBool());
 
     QString sortMode = s->get("InstSortMode").toString();