Initial better mod browser link implementation

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2022-11-01 16:58:22 +00:00
parent 04b39294ba
commit 7f32c6464d
8 changed files with 87 additions and 11 deletions

View File

@ -187,3 +187,8 @@ void ModDownloadDialog::selectedPageChanged(BasePage* previous, BasePage* select
// Same effect as having a global search bar // Same effect as having a global search bar
selected_page->setSearchTerm(prev_page->getSearchTerm()); selected_page->setSearchTerm(prev_page->getSearchTerm());
} }
bool ModDownloadDialog::selectPage(QString pageId)
{
return m_container->selectPage(pageId);
}

View File

@ -53,6 +53,8 @@ public:
const QList<ModDownloadTask*> getTasks(); const QList<ModDownloadTask*> getTasks();
const std::shared_ptr<ModFolderModel> &mods; const std::shared_ptr<ModFolderModel> &mods;
bool selectPage(QString pageId);
public slots: public slots:
void confirm(); void confirm();
void accept() override; void accept() override;

View File

@ -2,6 +2,7 @@
/* /*
* PolyMC - Minecraft Launcher * PolyMC - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -37,6 +38,7 @@
#include "Application.h" #include "Application.h"
#include "ui_ModPage.h" #include "ui_ModPage.h"
#include <QDesktopServices>
#include <QKeyEvent> #include <QKeyEvent>
#include <memory> #include <memory>
@ -80,6 +82,8 @@ ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api)
ui->packView->setItemDelegate(new ProjectItemDelegate(this)); ui->packView->setItemDelegate(new ProjectItemDelegate(this));
ui->packView->installEventFilter(this); ui->packView->installEventFilter(this);
connect(ui->packDescription, &QTextBrowser::anchorClicked, this, &ModPage::openUrl);
} }
ModPage::~ModPage() ModPage::~ModPage()
@ -159,7 +163,7 @@ void ModPage::triggerSearch()
auto changed = m_filter_widget->changed(); auto changed = m_filter_widget->changed();
m_filter = m_filter_widget->getFilter(); m_filter = m_filter_widget->getFilter();
if(changed){ if (changed) {
ui->packView->clearSelection(); ui->packView->clearSelection();
ui->packDescription->clear(); ui->packDescription->clear();
ui->versionSelectionBox->clear(); ui->versionSelectionBox->clear();
@ -241,6 +245,54 @@ void ModPage::onModSelected()
ui->packView->adjustSize(); ui->packView->adjustSize();
} }
void ModPage::openUrl(const QUrl& url)
{
// do not allow other url schemes for security reasons
if (!(url.scheme() == "http" || url.scheme() == "https")) {
qWarning() << "Unsupported scheme" << url.scheme();
return;
}
// detect mod URLs and search instead
int prefixLength;
const char* page;
if ((url.host() == "modrinth.com" || url.host() == "www.modrinth.com")
&& url.path().startsWith("/mod/")) {
prefixLength = 5;
page = "modrinth";
}
else if (APPLICATION->capabilities() & Application::SupportsFlame
&& url.host() == "www.curseforge.com"
&& url.path().toLower().startsWith("/minecraft/mc-mods/")) {
prefixLength = 19;
page = "curseforge";
}
else
prefixLength = 0;
if (prefixLength != 0) {
QString slug = url.path().mid(prefixLength);
// remove trailing slash(es)
while (slug.endsWith('/'))
slug.remove(slug.length() - 1, 1);
// ensure that the path doesn't contain any further slashes,
// and the user isn't opening the same mod; they probably
// intended to view in their web browser
if (!slug.isEmpty() && !slug.contains('/') && slug != current.slug) {
ui->searchEdit->setText(slug);
dialog->selectPage(page);
triggerSearch();
return;
}
}
// open in the user's web browser
QDesktopServices::openUrl(url);
}
/******** Make changes to the UI ********/ /******** Make changes to the UI ********/
@ -317,8 +369,7 @@ void ModPage::updateUi()
text += "<br>" + tr(" by ") + authorStrs.join(", "); text += "<br>" + tr(" by ") + authorStrs.join(", ");
} }
if (current.extraDataLoaded) {
if(current.extraDataLoaded) {
if (!current.extraData.donate.isEmpty()) { if (!current.extraData.donate.isEmpty()) {
text += "<br><br>" + tr("Donate information: "); text += "<br><br>" + tr("Donate information: ");
auto donateToStr = [](ModPlatform::DonationData& donate) -> QString { auto donateToStr = [](ModPlatform::DonationData& donate) -> QString {

View File

@ -82,6 +82,7 @@ class ModPage : public QWidget, public BasePage {
void onSelectionChanged(QModelIndex first, QModelIndex second); void onSelectionChanged(QModelIndex first, QModelIndex second);
void onVersionSelectionChanged(QString data); void onVersionSelectionChanged(QString data);
void onModSelected(); void onModSelected();
virtual void openUrl(const QUrl& url);
protected: protected:
Ui::ModPage* ui = nullptr; Ui::ModPage* ui = nullptr;

View File

@ -16,10 +16,10 @@
<item row="1" column="2"> <item row="1" column="2">
<widget class="ProjectDescriptionPage" name="packDescription"> <widget class="ProjectDescriptionPage" name="packDescription">
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="openLinks"> <property name="openLinks">
<bool>true</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -78,3 +78,18 @@ bool FlameModPage::optedOut(ModPlatform::IndexedVersion& ver) const
// other mod providers start loading before being selected, at least with // other mod providers start loading before being selected, at least with
// my Qt, so we need to implement this in every derived class... // my Qt, so we need to implement this in every derived class...
auto FlameModPage::shouldDisplay() const -> bool { return true; } auto FlameModPage::shouldDisplay() const -> bool { return true; }
void FlameModPage::openUrl(const QUrl& url)
{
if (url.scheme().isEmpty()) {
QString query = url.query(QUrl::FullyDecoded);
if (query.startsWith("remoteUrl=")) {
// attempt to resolve url from warning page
query.remove(0, 10);
ModPage::openUrl({QUrl::fromPercentEncoding(query.toUtf8())}); // double decoding is necessary
return;
}
}
ModPage::openUrl(url);
}

View File

@ -64,4 +64,6 @@ class FlameModPage : public ModPage {
bool optedOut(ModPlatform::IndexedVersion& ver) const override; bool optedOut(ModPlatform::IndexedVersion& ver) const override;
auto shouldDisplay() const -> bool override; auto shouldDisplay() const -> bool override;
void openUrl(const QUrl& url) override;
}; };