Start of mod downloading

launcher/ui/pages/instance/ModFolderPage.cpp

@@ -26,6 +26,7 @@
 #include "Application.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/ModDownloadDialog.h"
 #include "ui/GuiUtil.h"
 
 #include "DesktopServices.h"
@@ -36,6 +37,7 @@
 #include "minecraft/PackProfile.h"
 
 #include "Version.h"
+#include "ui/dialogs/ProgressDialog.h"
 
 namespace {
     // FIXME: wasteful
@@ -342,6 +344,33 @@ void ModFolderPage::on_actionRemove_triggered()
     m_mods->deleteMods(selection.indexes());
 }
 
+void ModFolderPage::on_actionInstall_mods_triggered()
+{
+    if(!m_controlsEnabled) {
+        return;
+    }
+    ModDownloadDialog mdownload(m_mods, this);
+    mdownload.exec();
+    ModDownloadTask * task = mdownload.getTask();
+    if(task){
+        connect(task, &Task::failed, [this](QString reason)
+        {
+            CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
+        });
+        connect(task, &Task::succeeded, [this, task]()
+        {
+            QStringList warnings = task->warnings();
+            if(warnings.count())
+            {
+                CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
+            }
+        });
+        ProgressDialog loadDialog(this);
+        loadDialog.setSkipButton(true, tr("Abort"));
+        loadDialog.execWithTask(task);
+    }
+}
+
 void ModFolderPage::on_actionView_configs_triggered()
 {
     DesktopServices::openDirectory(m_inst->instanceConfigFolder(), true);

launcher/ui/pages/instance/ModFolderPage.h

@@ -102,6 +102,7 @@ slots:
     void on_actionRemove_triggered();
     void on_actionEnable_triggered();
     void on_actionDisable_triggered();
+    void on_actionInstall_mods_triggered();
     void on_actionView_Folder_triggered();
     void on_actionView_configs_triggered();
     void ShowContextMenu(const QPoint &pos);

launcher/ui/pages/instance/ModFolderPage.ui

@@ -88,6 +88,7 @@
    <addaction name="actionRemove"/>
    <addaction name="actionEnable"/>
    <addaction name="actionDisable"/>
+   <addaction name="actionInstall_mods"/>
    <addaction name="actionView_configs"/>
    <addaction name="actionView_Folder"/>
   </widget>
@@ -136,6 +137,14 @@
     <string>View &amp;Folder</string>
    </property>
   </action>
+  <action name="actionInstall_mods">
+   <property name="text">
+    <string>Install mods</string>
+   </property>
+   <property name="toolTip">
+    <string>Install mods from Modrinth or Curseforge</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp

@@ -0,0 +1,256 @@
+#include "ModrinthModel.h"
+#include "Application.h"
+#include <Json.h>
+
+#include <MMCStrings.h>
+#include <Version.h>
+
+#include <QtMath>
+#include <QLabel>
+
+#include <RWStorage.h>
+
+namespace Modrinth {
+
+ListModel::ListModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+ListModel::~ListModel()
+{
+}
+
+int ListModel::rowCount(const QModelIndex &parent) const
+{
+    return modpacks.size();
+}
+
+int ListModel::columnCount(const QModelIndex &parent) const
+{
+    return 1;
+}
+
+QVariant ListModel::data(const QModelIndex &index, int role) const
+{
+    int pos = index.row();
+    if(pos >= modpacks.size() || pos < 0 || !index.isValid())
+    {
+        return QString("INVALID INDEX %1").arg(pos);
+    }
+
+    IndexedPack pack = modpacks.at(pos);
+    if(role == Qt::DisplayRole)
+    {
+        return pack.name;
+    }
+    else if (role == Qt::ToolTipRole)
+    {
+        if(pack.description.length() > 100)
+        {
+            //some magic to prevent to long tooltips and replace html linebreaks
+            QString edit = pack.description.left(97);
+            edit = edit.left(edit.lastIndexOf("<br>")).left(edit.lastIndexOf(" ")).append("...");
+            return edit;
+
+        }
+        return pack.description;
+    }
+    else if(role == Qt::DecorationRole)
+    {
+        if(m_logoMap.contains(pack.logoName))
+        {
+            return (m_logoMap.value(pack.logoName));
+        }
+        QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
+        ((ListModel *)this)->requestLogo(pack.logoName, pack.logoUrl);
+        return icon;
+    }
+    else if(role == Qt::UserRole)
+    {
+        QVariant v;
+        v.setValue(pack);
+        return v;
+    }
+
+    return QVariant();
+}
+
+void ListModel::logoLoaded(QString logo, QIcon out)
+{
+    m_loadingLogos.removeAll(logo);
+    m_logoMap.insert(logo, out);
+    for(int i = 0; i < modpacks.size(); i++) {
+        if(modpacks[i].logoName == logo) {
+            emit dataChanged(createIndex(i, 0), createIndex(i, 0), {Qt::DecorationRole});
+        }
+    }
+}
+
+void ListModel::logoFailed(QString logo)
+{
+    m_failedLogos.append(logo);
+    m_loadingLogos.removeAll(logo);
+}
+
+void ListModel::requestLogo(QString logo, QString url)
+{
+    if(m_loadingLogos.contains(logo) || m_failedLogos.contains(logo))
+    {
+        return;
+    }
+
+    MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ModrinthPacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
+    NetJob *job = new NetJob(QString("Modrinth Icon Download %1").arg(logo), APPLICATION->network());
+    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+
+    auto fullPath = entry->getFullPath();
+    QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath]
+    {
+        emit logoLoaded(logo, QIcon(fullPath));
+        if(waitingCallbacks.contains(logo))
+        {
+            waitingCallbacks.value(logo)(fullPath);
+        }
+    });
+
+    QObject::connect(job, &NetJob::failed, this, [this, logo]
+    {
+        emit logoFailed(logo);
+    });
+
+    job->start();
+
+    m_loadingLogos.append(logo);
+}
+
+void ListModel::getLogo(const QString &logo, const QString &logoUrl, LogoCallback callback)
+{
+    if(m_logoMap.contains(logo))
+    {
+        callback(APPLICATION->metacache()->resolveEntry("ModrinthPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
+    }
+    else
+    {
+        requestLogo(logo, logoUrl);
+    }
+}
+
+Qt::ItemFlags ListModel::flags(const QModelIndex &index) const
+{
+    return QAbstractListModel::flags(index);
+}
+
+bool ListModel::canFetchMore(const QModelIndex& parent) const
+{
+    return searchState == CanPossiblyFetchMore;
+}
+
+void ListModel::fetchMore(const QModelIndex& parent)
+{
+    if (parent.isValid())
+        return;
+    if(nextSearchOffset == 0) {
+        qWarning() << "fetchMore with 0 offset is wrong...";
+        return;
+    }
+    performPaginatedSearch();
+}
+const char* sorts[4]{"relevance","downloads","updated","newest"};
+
+void ListModel::performPaginatedSearch()
+{
+    NetJob *netJob = new NetJob("Modrinth::Search", APPLICATION->network());
+    auto searchUrl = QString(
+        "https://api.modrinth.com/api/v1/mod?"
+        "offset=%1&"
+        "limit=25&"
+        "query=%2&"
+        "index=%3"
+    ).arg(nextSearchOffset).arg(currentSearchTerm).arg(sorts[currentSort]);
+    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
+    jobPtr = netJob;
+    jobPtr->start();
+    QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::searchRequestFinished);
+    QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
+}
+
+void ListModel::searchWithTerm(const QString& term, int sort)
+{
+    if(currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort) {
+        return;
+    }
+    currentSearchTerm = term;
+    currentSort = sort;
+    if(jobPtr) {
+        jobPtr->abort();
+        searchState = ResetRequested;
+        return;
+    }
+    else {
+        beginResetModel();
+        modpacks.clear();
+        endResetModel();
+        searchState = None;
+    }
+    nextSearchOffset = 0;
+    performPaginatedSearch();
+}
+
+void Modrinth::ListModel::searchRequestFinished()
+{
+    jobPtr.reset();
+
+    QJsonParseError parse_error;
+    QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
+    if(parse_error.error != QJsonParseError::NoError) {
+        qWarning() << "Error while parsing JSON response from Modrinth at " << parse_error.offset << " reason: " << parse_error.errorString();
+        qWarning() << response;
+        return;
+    }
+
+    QList<Modrinth::IndexedPack> newList;
+    auto packs = doc.object().value("hits").toArray();
+    for(auto packRaw : packs) {
+        auto packObj = packRaw.toObject();
+
+        Modrinth::IndexedPack pack;
+        try
+        {
+            Modrinth::loadIndexedPack(pack, packObj);
+            newList.append(pack);
+        }
+        catch(const JSONValidationError &e)
+        {
+            qWarning() << "Error while loading mod from Modrinth: " << e.cause();
+            continue;
+        }
+    }
+    if(packs.size() < 25) {
+        searchState = Finished;
+    } else {
+        nextSearchOffset += 25;
+        searchState = CanPossiblyFetchMore;
+    }
+    beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1);
+    modpacks.append(newList);
+    endInsertRows();
+}
+
+void Modrinth::ListModel::searchRequestFailed(QString reason)
+{
+    jobPtr.reset();
+
+    if(searchState == ResetRequested) {
+        beginResetModel();
+        modpacks.clear();
+        endResetModel();
+
+        nextSearchOffset = 0;
+        performPaginatedSearch();
+    } else {
+        searchState = Finished;
+    }
+}
+
+}
+

launcher/ui/pages/modplatform/modrinth/ModrinthModel.h

@@ -0,0 +1,77 @@
+#pragma once
+
+#include <RWStorage.h>
+
+#include <QAbstractListModel>
+#include <QSortFilterProxyModel>
+#include <QThreadPool>
+#include <QIcon>
+#include <QStyledItemDelegate>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QMetaType>
+
+#include <functional>
+#include <net/NetJob.h>
+
+#include <modplatform/flame/FlamePackIndex.h>
+#include "modplatform/modrinth/ModrinthPackIndex.h"
+
+namespace Modrinth {
+
+
+typedef QMap<QString, QIcon> LogoMap;
+typedef std::function<void(QString)> LogoCallback;
+
+class ListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    ListModel(QObject *parent);
+    virtual ~ListModel();
+
+    int rowCount(const QModelIndex &parent) const override;
+    int columnCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    bool canFetchMore(const QModelIndex & parent) const override;
+    void fetchMore(const QModelIndex & parent) override;
+
+    void getLogo(const QString &logo, const QString &logoUrl, LogoCallback callback);
+    void searchWithTerm(const QString & term, const int sort);
+
+private slots:
+    void performPaginatedSearch();
+
+    void logoFailed(QString logo);
+    void logoLoaded(QString logo, QIcon out);
+
+    void searchRequestFinished();
+    void searchRequestFailed(QString reason);
+
+private:
+    void requestLogo(QString file, QString url);
+
+private:
+    QList<IndexedPack> modpacks;
+    QStringList m_failedLogos;
+    QStringList m_loadingLogos;
+    LogoMap m_logoMap;
+    QMap<QString, LogoCallback> waitingCallbacks;
+
+    QString currentSearchTerm;
+    int currentSort = 0;
+    int nextSearchOffset = 0;
+    enum SearchState {
+        None,
+        CanPossiblyFetchMore,
+        ResetRequested,
+        Finished
+    } searchState = None;
+    NetJob::Ptr jobPtr;
+    QByteArray response;
+};
+
+}

launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp

@@ -0,0 +1,180 @@
+#include "ModrinthPage.h"
+#include "ui_ModrinthPage.h"
+
+#include <QKeyEvent>
+
+#include "Application.h"
+#include "Json.h"
+#include "ui/dialogs/ModDownloadDialog.h"
+#include "InstanceImportTask.h"
+#include "ModrinthModel.h"
+#include "ModDownloadTask.h"
+
+ModrinthPage::ModrinthPage(ModDownloadDialog* dialog, QWidget *parent)
+    : QWidget(parent), ui(new Ui::ModrinthPage), dialog(dialog)
+{
+    ui->setupUi(this);
+    connect(ui->searchButton, &QPushButton::clicked, this, &ModrinthPage::triggerSearch);
+    ui->searchEdit->installEventFilter(this);
+    listModel = new Modrinth::ListModel(this);
+    ui->packView->setModel(listModel);
+
+    ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
+
+    // index is used to set the sorting with the modrinth api
+    ui->sortByBox->addItem(tr("Sort by Relevence"));
+    ui->sortByBox->addItem(tr("Sort by Downloads"));
+    ui->sortByBox->addItem(tr("Sort by last updated"));
+    ui->sortByBox->addItem(tr("Sort by newest"));
+
+    connect(ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
+    connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthPage::onSelectionChanged);
+    connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthPage::onVersionSelectionChanged);
+}
+
+ModrinthPage::~ModrinthPage()
+{
+    delete ui;
+}
+
+bool ModrinthPage::eventFilter(QObject* watched, QEvent* event)
+{
+    if (watched == ui->searchEdit && event->type() == QEvent::KeyPress) {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == Qt::Key_Return) {
+            triggerSearch();
+            keyEvent->accept();
+            return true;
+        }
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
+bool ModrinthPage::shouldDisplay() const
+{
+    return true;
+}
+
+void ModrinthPage::openedImpl()
+{
+    suggestCurrent();
+    triggerSearch();
+}
+
+void ModrinthPage::triggerSearch()
+{
+    listModel->searchWithTerm(ui->searchEdit->text(), ui->sortByBox->currentIndex());
+}
+
+void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second)
+{
+    ui->versionSelectionBox->clear();
+
+    if(!first.isValid())
+    {
+        if(isOpened)
+        {
+            dialog->setSuggestedMod();
+        }
+        return;
+    }
+
+    current = listModel->data(first, Qt::UserRole).value<Modrinth::IndexedPack>();
+    QString text = "";
+    QString name = current.name;
+
+    if (current.websiteUrl.isEmpty())
+        text = name;
+    else
+        text = "<a href=\"" + current.websiteUrl + "\">" + name + "</a>";
+    if (!current.authors.empty()) {
+        auto authorToStr = [](Modrinth::ModpackAuthor & author) {
+            if(author.url.isEmpty()) {
+                return author.name;
+            }
+            return QString("<a href=\"%1\">%2</a>").arg(author.url, author.name);
+        };
+        QStringList authorStrs;
+        for(auto & author: current.authors) {
+            authorStrs.push_back(authorToStr(author));
+        }
+        text += "<br>" + tr(" by ") + authorStrs.join(", ");
+    }
+    text += "<br><br>";
+
+    ui->packDescription->setHtml(text + current.description);
+
+    if (!current.versionsLoaded)
+    {
+        qDebug() << "Loading Modrinth mod versions";
+        NetJob *netJob = new NetJob(QString("Modrinth::ModVersions(%1)").arg(current.name), APPLICATION->network());
+        std::shared_ptr<QByteArray> response = std::make_shared<QByteArray>();
+        QString addonId = current.addonId;
+        addonId.remove(0,6);
+        netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.modrinth.com/api/v1/mod/%1/version").arg(addonId), response.get()));
+
+        QObject::connect(netJob, &NetJob::succeeded, this, [this, response]
+        {
+            QJsonParseError parse_error;
+            QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+            if(parse_error.error != QJsonParseError::NoError) {
+                qWarning() << "Error while parsing JSON response from Modrinth at " << parse_error.offset << " reason: " << parse_error.errorString();
+                qWarning() << *response;
+                return;
+            }
+            QJsonArray arr = doc.array();
+            try
+            {
+                Modrinth::loadIndexedPackVersions(current, arr, APPLICATION->network());
+            }
+            catch(const JSONValidationError &e)
+            {
+                qDebug() << *response;
+                qWarning() << "Error while reading Modrinth mod version: " << e.cause();
+            }
+
+            for(auto version : current.versions) {
+                ui->versionSelectionBox->addItem(version.version, QVariant(version.downloadUrl));
+            }
+
+            suggestCurrent();
+        });
+        netJob->start();
+    }
+    else
+    {
+        for(auto version : current.versions) {
+            ui->versionSelectionBox->addItem(version.version, QVariant(version.downloadUrl));
+        }
+
+        suggestCurrent();
+    }
+}
+
+void ModrinthPage::suggestCurrent()
+{
+    if(!isOpened)
+    {
+        return;
+    }
+
+    if (selectedVersion.isEmpty())
+    {
+        dialog->setSuggestedMod();
+        return;
+    }
+
+    dialog->setSuggestedMod(current.name, new ModDownloadTask(selectedVersion));
+}
+
+void ModrinthPage::onVersionSelectionChanged(QString data)
+{
+    if(data.isNull() || data.isEmpty())
+    {
+        selectedVersion = "";
+        return;
+    }
+    selectedVersion = ui->versionSelectionBox->currentData().toString();
+    suggestCurrent();
+}

launcher/ui/pages/modplatform/modrinth/ModrinthPage.h

@@ -0,0 +1,80 @@
+/* Copyright 2013-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <QWidget>
+
+#include "ui/pages/BasePage.h"
+#include <Application.h>
+#include "tasks/Task.h"
+#include "modplatform/modrinth/ModrinthPackIndex.h"
+
+namespace Ui
+{
+class ModrinthPage;
+}
+
+class ModDownloadDialog;
+
+namespace Modrinth {
+    class ListModel;
+}
+
+class ModrinthPage : public QWidget, public BasePage
+{
+    Q_OBJECT
+
+public:
+    explicit ModrinthPage(ModDownloadDialog* dialog, QWidget *parent = 0);
+    virtual ~ModrinthPage();
+    virtual QString displayName() const override
+    {
+        return tr("Modrinth");
+    }
+    virtual QIcon icon() const override
+    {
+        return APPLICATION->getThemedIcon("flame");
+    }
+    virtual QString id() const override
+    {
+        return "modrinth";
+    }
+    virtual QString helpPage() const override
+    {
+        return "Modrinth-platform";
+    }
+    virtual bool shouldDisplay() const override;
+
+    void openedImpl() override;
+
+    bool eventFilter(QObject * watched, QEvent * event) override;
+
+private:
+    void suggestCurrent();
+
+private slots:
+    void triggerSearch();
+    void onSelectionChanged(QModelIndex first, QModelIndex second);
+    void onVersionSelectionChanged(QString data);
+
+private:
+    Ui::ModrinthPage *ui = nullptr;
+    ModDownloadDialog* dialog = nullptr;
+    Modrinth::ListModel* listModel = nullptr;
+    Modrinth::IndexedPack current;
+
+    QString selectedVersion;
+};

launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+  <class>ModrinthPage</class>
+  <widget class="QWidget" name="ModrinthPage">
+    <property name="geometry">
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>837</width>
+        <height>685</height>
+      </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+      <item row="1" column="0" colspan="2">
+        <layout class="QGridLayout" name="gridLayout_3">
+          <item row="1" column="0">
+            <widget class="QListView" name="packView">
+              <property name="iconSize">
+                <size>
+                  <width>48</width>
+                  <height>48</height>
+                </size>
+              </property>
+              <property name="horizontalScrollBarPolicy">
+                <enum>Qt::ScrollBarAlwaysOff</enum>
+              </property>
+              <property name="alternatingRowColors">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+          <item row="1" column="1">
+            <widget class="QTextBrowser" name="packDescription">
+              <property name="openExternalLinks">
+                <bool>true</bool>
+              </property>
+              <property name="openLinks">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+        </layout>
+      </item>
+      <item row="2" column="0" colspan="2">
+        <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0">
+          <item row="0" column="2">
+            <widget class="QComboBox" name="versionSelectionBox"/>
+          </item>
+          <item row="0" column="1">
+            <widget class="QLabel" name="label">
+              <property name="text">
+                <string>Version selected:</string>
+              </property>
+              <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+            </widget>
+          </item>
+          <item row="0" column="0">
+            <widget class="QComboBox" name="sortByBox"/>
+          </item>
+        </layout>
+      </item>
+      <item row="0" column="1">
+        <widget class="QPushButton" name="searchButton">
+          <property name="text">
+            <string>Search</string>
+          </property>
+        </widget>
+      </item>
+      <item row="0" column="0">
+        <widget class="QLineEdit" name="searchEdit">
+          <property name="placeholderText">
+            <string>Search and filter ...</string>
+          </property>
+        </widget>
+      </item>
+    </layout>
+  </widget>
+  <tabstops>
+    <tabstop>searchEdit</tabstop>
+    <tabstop>searchButton</tabstop>
+    <tabstop>packView</tabstop>
+    <tabstop>packDescription</tabstop>
+    <tabstop>sortByBox</tabstop>
+    <tabstop>versionSelectionBox</tabstop>
+  </tabstops>
+  <resources/>
+  <connections/>
+</ui>