From 84c63f4f017324b42c2470fb2e7a1ac5858fcaa0 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 14:11:41 +0300
Subject: Added plantxt export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.h | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 launcher/modplatform/helpers/ExportToModList.h

(limited to 'launcher/modplatform/helpers/ExportToModList.h')

diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
new file mode 100644
index 00000000..9ff8d25a
--- /dev/null
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <qlist.h>
+#include <QString>
+#include "minecraft/mod/Mod.h"
+
+namespace ExportToModList {
+
+enum Formats { HTML, MARKDOWN, PLAINTXT, CUSTOM };
+enum OptionalData {
+    Authors = 1 << 0,
+    Url = 1 << 1,
+    Version = 1 << 2,
+};
+QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
+QString ExportToModList(QList<Mod*> mods, QString lineTemplate);
+}  // namespace ExportToModList
-- 
cgit 


From 9a3931dac6e75a79989f13b10604a142dbafcfbb Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 27 Jun 2023 16:57:30 +0300
Subject: Added json and csv format

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.cpp | 56 ++++++++++++++++++++++++
 launcher/modplatform/helpers/ExportToModList.h   |  2 +-
 launcher/ui/dialogs/ExportToModListDialog.cpp    | 26 ++++++++++-
 launcher/ui/dialogs/ExportToModListDialog.ui     | 10 +++++
 4 files changed, 92 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform/helpers/ExportToModList.h')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index d837fb0b..86bb9c41 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -16,6 +16,9 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "ExportToModList.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 namespace ExportToModList {
 QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
@@ -94,6 +97,59 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
             }
             return lines.join("\n");
         }
+        case JSON: {
+            QJsonArray lines;
+            for (auto mod : mods) {
+                auto meta = mod->metadata();
+                auto modName = mod->name();
+                QJsonObject line;
+                line["name"] = modName;
+                if (extraData & Url) {
+                    auto url = mod->metaurl();
+                    if (!url.isEmpty())
+                        line["url"] = url;
+                }
+                if (extraData & Version) {
+                    auto ver = mod->version();
+                    if (ver.isEmpty() && meta != nullptr)
+                        ver = meta->version().toString();
+                    if (!ver.isEmpty())
+                        line["version"] = ver;
+                }
+                if (extraData & Authors && !mod->authors().isEmpty())
+                    line["authors"] = QJsonArray::fromStringList(mod->authors());
+                lines << line;
+            }
+            QJsonDocument doc;
+            doc.setArray(lines);
+            return doc.toJson();
+        }
+        case CSV: {
+            QStringList lines;
+            for (auto mod : mods) {
+                QStringList data;
+                auto meta = mod->metadata();
+                auto modName = mod->name();
+
+                data << modName;
+                if (extraData & Url) {
+                    auto url = mod->metaurl();
+                    if (!url.isEmpty())
+                        data << url;
+                }
+                if (extraData & Version) {
+                    auto ver = mod->version();
+                    if (ver.isEmpty() && meta != nullptr)
+                        ver = meta->version().toString();
+                    if (!ver.isEmpty())
+                        data << ver;
+                }
+                if (extraData & Authors && !mod->authors().isEmpty())
+                    data << QString("\"%1\"").arg(mod->authors().join(","));
+                lines << data.join(",");
+            }
+            return lines.join("\n");
+        }
         default: {
             return QString("unknown format:%1").arg(format);
         }
diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index 9ff8d25a..abd6e9bc 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -22,7 +22,7 @@
 
 namespace ExportToModList {
 
-enum Formats { HTML, MARKDOWN, PLAINTXT, CUSTOM };
+enum Formats { HTML, MARKDOWN, PLAINTXT, JSON, CSV, CUSTOM };
 enum OptionalData {
     Authors = 1 << 0,
     Url = 1 << 1,
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index 700e7178..cfd28cf8 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -89,6 +89,20 @@ void ExportToModListDialog::formatChanged(int index)
             break;
         }
         case 3: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->hide();
+            format = ExportToModList::JSON;
+            break;
+        }
+        case 4: {
+            ui->templateGroup->setDisabled(true);
+            ui->optionsGroup->setDisabled(false);
+            ui->resultText->hide();
+            format = ExportToModList::CSV;
+            break;
+        }
+        case 5: {
             ui->templateGroup->setDisabled(false);
             ui->optionsGroup->setDisabled(true);
             ui->resultText->hide();
@@ -133,6 +147,12 @@ void ExportToModListDialog::triggerImp()
         }
         case ExportToModList::CUSTOM:
             return;
+        case ExportToModList::JSON:
+            exampleLine = "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"},";
+            break;
+        case ExportToModList::CSV:
+            exampleLine = "{name},{url},{version},\"{authors}\"";
+            break;
     }
     if (!m_template_selected) {
         if (ui->templateText->toPlainText() != exampleLine)
@@ -146,7 +166,7 @@ void ExportToModListDialog::done(int result)
         const QString filename = FS::RemoveInvalidFilenameChars(name);
         const QString output =
             QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()),
-                                         "File (*.txt *.html *.md)", nullptr);
+                                         "File (*.txt *.html *.md *.json *.csv)", nullptr);
 
         if (output.isEmpty())
             return;
@@ -167,6 +187,10 @@ QString ExportToModListDialog::extension()
             return ".txt";
         case ExportToModList::CUSTOM:
             return ".txt";
+        case ExportToModList::JSON:
+            return ".json";
+        case ExportToModList::CSV:
+            return ".csv";
     }
     return ".txt";
 }
diff --git a/launcher/ui/dialogs/ExportToModListDialog.ui b/launcher/ui/dialogs/ExportToModListDialog.ui
index 640b1766..e0f138f9 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.ui
+++ b/launcher/ui/dialogs/ExportToModListDialog.ui
@@ -58,6 +58,16 @@
             <string>Plaintext</string>
            </property>
           </item>
+          <item>
+           <property name="text">
+            <string>JSON</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>CSV</string>
+           </property>
+          </item>
           <item>
            <property name="text">
             <string>Custom</string>
-- 
cgit 


From 1495bfb73ead50b45942e94a8e3b18e111820b4b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 11 Jul 2023 22:43:27 +0300
Subject: Made custom template enabled all time

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.h |  2 +-
 launcher/ui/dialogs/ExportToModListDialog.cpp  | 53 ++++++++++++--------------
 launcher/ui/dialogs/ExportToModListDialog.h    |  3 +-
 launcher/ui/dialogs/ExportToModListDialog.ui   | 14 ++++++-
 4 files changed, 40 insertions(+), 32 deletions(-)

(limited to 'launcher/modplatform/helpers/ExportToModList.h')

diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index abd6e9bc..49252fc4 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <qlist.h>
+#include <QList>
 #include <QString>
 #include "minecraft/mod/Mod.h"
 
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index cfd28cf8..b86b1056 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -33,11 +33,19 @@
 #include <QMessageBox>
 #include <QPushButton>
 
+const QHash<ExportToModList::Formats, QString> ExportToModListDialog::exampleLines = {
+    { ExportToModList::HTML, "<li><a href=\"{url}\">{name}</a> [{version}] by {authors}</li>" },
+    { ExportToModList::MARKDOWN, "[{name}]({url}) [{version}] by {authors}" },
+    { ExportToModList::PLAINTXT, "{name} ({url}) [{version}] by {authors}" },
+    { ExportToModList::JSON, "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"}," },
+    { ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" },
+};
+
 ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent)
-    : QDialog(parent), m_template_selected(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
+    : QDialog(parent), m_template_changed(false), name(instance->name()), ui(new Ui::ExportToModListDialog)
 {
     ui->setupUi(this);
-    ui->templateGroup->setDisabled(true);
+    ui->optionsGroup->setDisabled(false);
 
     MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
     if (mcInstance) {
@@ -52,7 +60,12 @@ ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* pare
     connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
     connect(ui->urlCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
-    connect(ui->templateText, &QTextEdit::textChanged, this, &ExportToModListDialog::triggerImp);
+    connect(ui->templateText, &QTextEdit::textChanged, this, [this] {
+        if (ui->templateText->toPlainText() != exampleLines[format])
+            ui->formatComboBox->setCurrentIndex(5);
+        else
+            triggerImp();
+    });
     connect(ui->copyButton, &QPushButton::clicked, this, [this](bool) {
         this->ui->finalText->selectAll();
         this->ui->finalText->copy();
@@ -68,42 +81,37 @@ void ExportToModListDialog::formatChanged(int index)
 {
     switch (index) {
         case 0: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->show();
             format = ExportToModList::HTML;
             break;
         }
         case 1: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->show();
             format = ExportToModList::MARKDOWN;
             break;
         }
         case 2: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->hide();
             format = ExportToModList::PLAINTXT;
             break;
         }
         case 3: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->hide();
             format = ExportToModList::JSON;
             break;
         }
         case 4: {
-            ui->templateGroup->setDisabled(true);
             ui->optionsGroup->setDisabled(false);
             ui->resultText->hide();
             format = ExportToModList::CSV;
             break;
         }
         case 5: {
-            ui->templateGroup->setDisabled(false);
+            m_template_changed = true;
             ui->optionsGroup->setDisabled(true);
             ui->resultText->hide();
             format = ExportToModList::CUSTOM;
@@ -116,7 +124,6 @@ void ExportToModListDialog::formatChanged(int index)
 void ExportToModListDialog::triggerImp()
 {
     if (format == ExportToModList::CUSTOM) {
-        m_template_selected = true;
         ui->finalText->setPlainText(ExportToModList::ExportToModList(m_allMods, ui->templateText->toPlainText()));
         return;
     }
@@ -129,35 +136,25 @@ void ExportToModListDialog::triggerImp()
         opt |= ExportToModList::Url;
     auto txt = ExportToModList::ExportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
     ui->finalText->setPlainText(txt);
-    QString exampleLine;
     switch (format) {
-        case ExportToModList::HTML: {
-            exampleLine = "<li><a href=\"{url}\">{name}</a> [{version}] by {authors}</li>";
+        case ExportToModList::CUSTOM:
+            return;
+        case ExportToModList::HTML:
             ui->resultText->setHtml(txt);
             break;
-        }
-        case ExportToModList::MARKDOWN: {
-            exampleLine = "[{name}]({url}) [{version}] by {authors}";
+        case ExportToModList::MARKDOWN:
             ui->resultText->setHtml(markdownToHTML(txt));
             break;
-        }
-        case ExportToModList::PLAINTXT: {
-            exampleLine = "{name} ({url}) [{version}] by {authors}";
+        case ExportToModList::PLAINTXT:
             break;
-        }
-        case ExportToModList::CUSTOM:
-            return;
         case ExportToModList::JSON:
-            exampleLine = "{\"name\":\"{name}\",\"url\":\"{url}\",\"version\":\"{version}\",\"authors\":\"{authors}\"},";
             break;
         case ExportToModList::CSV:
-            exampleLine = "{name},{url},{version},\"{authors}\"";
             break;
     }
-    if (!m_template_selected) {
-        if (ui->templateText->toPlainText() != exampleLine)
-            ui->templateText->setPlainText(exampleLine);
-    }
+    auto exampleLine = exampleLines[format];
+    if (!m_template_changed && ui->templateText->toPlainText() != exampleLine)
+        ui->templateText->setPlainText(exampleLine);
 }
 
 void ExportToModListDialog::done(int result)
diff --git a/launcher/ui/dialogs/ExportToModListDialog.h b/launcher/ui/dialogs/ExportToModListDialog.h
index a7a6bcdc..b8a83d83 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.h
+++ b/launcher/ui/dialogs/ExportToModListDialog.h
@@ -45,8 +45,9 @@ class ExportToModListDialog : public QDialog {
    private:
     QString extension();
     QList<Mod*> m_allMods;
-    bool m_template_selected;
+    bool m_template_changed;
     QString name;
     ExportToModList::Formats format = ExportToModList::Formats::HTML;
     Ui::ExportToModListDialog* ui;
+    static const QHash<ExportToModList::Formats, QString> exampleLines;
 };
diff --git a/launcher/ui/dialogs/ExportToModListDialog.ui b/launcher/ui/dialogs/ExportToModListDialog.ui
index e0f138f9..90f179a6 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.ui
+++ b/launcher/ui/dialogs/ExportToModListDialog.ui
@@ -18,7 +18,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0">
      <item>
       <widget class="QGroupBox" name="groupBox_3">
        <property name="title">
@@ -149,6 +149,16 @@
        </layout>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="warningLabel">
+       <property name="text">
+        <string>This depends on the mods meta data. To ensure the meta data run at least one time the mods update on the selected instance(no need to update the mods).</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -189,7 +199,7 @@
     </hint>
    </hints>
   </connection>
-   <connection>
+  <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ExportToModListDialog</receiver>
-- 
cgit 


From 1ccfba13ebe11a1d6ea2897db45b47c2452931f5 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 23:39:54 +0300
Subject: renames

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/modplatform/helpers/ExportToModList.cpp | 12 ++++++------
 launcher/modplatform/helpers/ExportToModList.h   |  4 ++--
 launcher/ui/dialogs/ExportToModListDialog.cpp    |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'launcher/modplatform/helpers/ExportToModList.h')

diff --git a/launcher/modplatform/helpers/ExportToModList.cpp b/launcher/modplatform/helpers/ExportToModList.cpp
index e7bafac4..1f01c4a8 100644
--- a/launcher/modplatform/helpers/ExportToModList.cpp
+++ b/launcher/modplatform/helpers/ExportToModList.cpp
@@ -47,7 +47,7 @@ QString toHTML(QList<Mod*> mods, OptionalData extraData)
     return QString("<html><body><ul>\n\t%1\n</ul></body></html>").arg(lines.join("\n\t"));
 }
 
-QString toMARKDOWN(QList<Mod*> mods, OptionalData extraData)
+QString toMarkdown(QList<Mod*> mods, OptionalData extraData)
 {
     QStringList lines;
     for (auto mod : mods) {
@@ -73,7 +73,7 @@ QString toMARKDOWN(QList<Mod*> mods, OptionalData extraData)
     return lines.join("\n");
 }
 
-QString toPLAINTXT(QList<Mod*> mods, OptionalData extraData)
+QString toPlainTXT(QList<Mod*> mods, OptionalData extraData)
 {
     QStringList lines;
     for (auto mod : mods) {
@@ -159,15 +159,15 @@ QString toCSV(QList<Mod*> mods, OptionalData extraData)
     return lines.join("\n");
 }
 
-QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
+QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData)
 {
     switch (format) {
         case HTML:
             return toHTML(mods, extraData);
         case MARKDOWN:
-            return toMARKDOWN(mods, extraData);
+            return toMarkdown(mods, extraData);
         case PLAINTXT:
-            return toPLAINTXT(mods, extraData);
+            return toPlainTXT(mods, extraData);
         case JSON:
             return toJSON(mods, extraData);
         case CSV:
@@ -178,7 +178,7 @@ QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData
     }
 }
 
-QString ExportToModList(QList<Mod*> mods, QString lineTemplate)
+QString exportToModList(QList<Mod*> mods, QString lineTemplate)
 {
     QStringList lines;
     for (auto mod : mods) {
diff --git a/launcher/modplatform/helpers/ExportToModList.h b/launcher/modplatform/helpers/ExportToModList.h
index 49252fc4..7ea4ba9c 100644
--- a/launcher/modplatform/helpers/ExportToModList.h
+++ b/launcher/modplatform/helpers/ExportToModList.h
@@ -28,6 +28,6 @@ enum OptionalData {
     Url = 1 << 1,
     Version = 1 << 2,
 };
-QString ExportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
-QString ExportToModList(QList<Mod*> mods, QString lineTemplate);
+QString exportToModList(QList<Mod*> mods, Formats format, OptionalData extraData);
+QString exportToModList(QList<Mod*> mods, QString lineTemplate);
 }  // namespace ExportToModList
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index a0f8ee7b..c811bfe6 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -127,7 +127,7 @@ void ExportToModListDialog::formatChanged(int index)
 void ExportToModListDialog::triggerImp()
 {
     if (format == ExportToModList::CUSTOM) {
-        ui->finalText->setPlainText(ExportToModList::ExportToModList(m_allMods, ui->templateText->toPlainText()));
+        ui->finalText->setPlainText(ExportToModList::exportToModList(m_allMods, ui->templateText->toPlainText()));
         return;
     }
     auto opt = 0;
@@ -137,7 +137,7 @@ void ExportToModListDialog::triggerImp()
         opt |= ExportToModList::Version;
     if (ui->urlCheckBox->isChecked())
         opt |= ExportToModList::Url;
-    auto txt = ExportToModList::ExportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
+    auto txt = ExportToModList::exportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt));
     ui->finalText->setPlainText(txt);
     switch (format) {
         case ExportToModList::CUSTOM:
-- 
cgit