From af5120c828831dfe41482ebaff79608ba8531ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 18 Nov 2019 00:38:36 +0100 Subject: [PATCH] GH-2859 remove twitch page and modpack import from URL The functionality was broken, beyond repair and an ongoing maintenance nightmare. --- api/logic/CMakeLists.txt | 2 - .../modplatform/flame/UrlResolvingTask.cpp | 175 ------------------ .../modplatform/flame/UrlResolvingTask.h | 43 ----- application/CMakeLists.txt | 3 - application/dialogs/NewInstanceDialog.cpp | 13 +- application/dialogs/NewInstanceDialog.h | 2 - application/main.cpp | 1 - application/pages/modplatform/TwitchPage.cpp | 65 ------- application/pages/modplatform/TwitchPage.h | 69 ------- application/pages/modplatform/TwitchPage.ui | 79 -------- application/resources/assets/assets.qrc | 6 - application/resources/assets/deadglitch.svg | 66 ------- 12 files changed, 2 insertions(+), 522 deletions(-) delete mode 100644 api/logic/modplatform/flame/UrlResolvingTask.cpp delete mode 100644 api/logic/modplatform/flame/UrlResolvingTask.h delete mode 100644 application/pages/modplatform/TwitchPage.cpp delete mode 100644 application/pages/modplatform/TwitchPage.h delete mode 100644 application/pages/modplatform/TwitchPage.ui delete mode 100644 application/resources/assets/assets.qrc delete mode 100644 application/resources/assets/deadglitch.svg diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index c6b3e4227..995c9d4e6 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -455,8 +455,6 @@ set(FLAME_SOURCES modplatform/flame/PackManifest.cpp modplatform/flame/FileResolvingTask.h modplatform/flame/FileResolvingTask.cpp - modplatform/flame/UrlResolvingTask.h - modplatform/flame/UrlResolvingTask.cpp ) add_unit_test(Index diff --git a/api/logic/modplatform/flame/UrlResolvingTask.cpp b/api/logic/modplatform/flame/UrlResolvingTask.cpp deleted file mode 100644 index 2a96f703d..000000000 --- a/api/logic/modplatform/flame/UrlResolvingTask.cpp +++ /dev/null @@ -1,175 +0,0 @@ -#include "UrlResolvingTask.h" -#include -#include - - -namespace { - const char * metabase = "https://cursemeta.dries007.net"; -} - -Flame::UrlResolvingTask::UrlResolvingTask(const QString& toProcess) - : m_url(toProcess) -{ -} - -void Flame::UrlResolvingTask::executeTask() -{ - resolveUrl(); -} - -void Flame::UrlResolvingTask::resolveUrl() -{ - setStatus(tr("Resolving URL...")); - setProgress(0, 1); - QUrl actualUrl(m_url); - if(actualUrl.host() != "www.curseforge.com") { - emitFailed(tr("Not a Twitch URL.")); - return; - } - m_dljob.reset(new NetJob("URL resolver")); - - bool weAreDigging = false; - needle = QString(); - - if(m_url.startsWith("https://")) { - if(m_url.endsWith("?client=y")) { - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download?client=y - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download/2697088?client=y - m_url.chop(9); - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download/2697088 - } - if(m_url.endsWith("/download")) { - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download -> need to dig inside html... - weAreDigging = true; - needle = m_url; - needle.replace("https://", "twitch://"); - needle.replace("/download", "/download-client/"); - m_url.append("?client=y"); - } else if (m_url.contains("/download/")) { - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download/2697088 - m_url.replace("/download/", "/download-client/"); - } - } - else if(m_url.startsWith("twitch://")) { - // twitch://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download-client/2697088 - m_url.replace(0, 9, "https://"); - // https://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download-client/2697088 - } - auto dl = Net::Download::makeByteArray(QUrl(m_url), &results); - m_dljob->addNetAction(dl); - if(weAreDigging) { - connect(m_dljob.get(), &NetJob::finished, this, &Flame::UrlResolvingTask::processHTML); - } else { - connect(m_dljob.get(), &NetJob::finished, this, &Flame::UrlResolvingTask::processCCIP); - } - m_dljob->start(); -} - -void Flame::UrlResolvingTask::processHTML() -{ - QString htmlDoc = QString::fromUtf8(results); - auto index = htmlDoc.indexOf(needle); - if(index < 0) { - emitFailed(tr("Couldn't find the needle in the haystack...")); - return; - } - auto indexStart = index; - int indexEnd = -1; - while((index + 1) < htmlDoc.size() && htmlDoc[index] != '"') { - index ++; - if(htmlDoc[index] == '"') { - indexEnd = index; - break; - } - } - if(indexEnd > 0) { - QString found = htmlDoc.mid(indexStart, indexEnd - indexStart); - qDebug() << "Found needle: " << found; - // twitch://www.curseforge.com/minecraft/modpacks/ftb-sky-odyssey/download-client/2697088 - m_url = found; - resolveUrl(); - return; - } - emitFailed(tr("Couldn't find the end of the needle in the haystack...")); - return; -} - -void Flame::UrlResolvingTask::processCCIP() -{ - QDomDocument doc; - if (!doc.setContent(results)) { - qDebug() << results; - emitFailed(tr("Resolving failed.")); - return; - } - auto packageNode = doc.namedItem("package"); - if(!packageNode.isElement()) { - emitFailed(tr("Resolving failed: missing package root element.")); - return; - } - auto projectNode = packageNode.namedItem("project"); - if(!projectNode.isElement()) { - emitFailed(tr("Resolving failed: missing project element.")); - return; - } - auto attribs = projectNode.attributes(); - - auto projectIdNode = attribs.namedItem("id"); - if(!projectIdNode.isAttr()) { - emitFailed(tr("Resolving failed: missing id attribute.")); - return; - } - auto fileIdNode = attribs.namedItem("file"); - if(!fileIdNode.isAttr()) { - emitFailed(tr("Resolving failed: missing file attribute.")); - return; - } - - auto projectId = projectIdNode.nodeValue(); - auto fileId = fileIdNode.nodeValue(); - bool success = true; - m_result.projectId = projectId.toInt(&success); - if(!success) { - emitFailed(tr("Failed to resolve projectId as a number.")); - return; - } - m_result.fileId = fileId.toInt(&success); - if(!success) { - emitFailed(tr("Failed to resolve fileId as a number.")); - return; - } - qDebug() << "Resolved" << m_url << "as" << m_result.projectId << "/" << m_result.fileId; - resolveIDs(); -} - -void Flame::UrlResolvingTask::resolveIDs() -{ - setStatus(tr("Resolving mod IDs...")); - m_dljob.reset(new NetJob("Mod id resolver")); - auto projectIdStr = QString::number(m_result.projectId); - auto fileIdStr = QString::number(m_result.fileId); - QString metaurl = QString("%1/%2/%3.json").arg(metabase, projectIdStr, fileIdStr); - auto dl = Net::Download::makeByteArray(QUrl(metaurl), &results); - m_dljob->addNetAction(dl); - connect(m_dljob.get(), &NetJob::finished, this, &Flame::UrlResolvingTask::processCursemeta); - m_dljob->start(); -} - -void Flame::UrlResolvingTask::processCursemeta() -{ - try { - if(m_result.parseFromBytes(results)) { - emitSucceeded(); - qDebug() << results; - return; - } - } catch (const JSONValidationError &e) { - - qCritical() << "Resolving of" << m_result.projectId << m_result.fileId << "failed because of a parsing error:"; - qCritical() << e.cause(); - qCritical() << "JSON:"; - qCritical() << results; - } - emitFailed(tr("Failed to resolve the modpack file.")); -} diff --git a/api/logic/modplatform/flame/UrlResolvingTask.h b/api/logic/modplatform/flame/UrlResolvingTask.h deleted file mode 100644 index 98b78f67e..000000000 --- a/api/logic/modplatform/flame/UrlResolvingTask.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include "tasks/Task.h" -#include "net/NetJob.h" -#include "PackManifest.h" - -#include "multimc_logic_export.h" - -namespace Flame -{ -class MULTIMC_LOGIC_EXPORT UrlResolvingTask : public Task -{ - Q_OBJECT -public: - explicit UrlResolvingTask(const QString &toProcess); - virtual ~UrlResolvingTask() {}; - - const Flame::File &getResults() const - { - return m_result; - } - -protected: - virtual void executeTask() override; - -protected slots: - void processCCIP(); - void processHTML(); - void processCursemeta(); - -private: - void resolveUrl(); - void resolveIDs(); - -private: /* data */ - QString m_url; - QString needle; - Flame::File m_result; - QByteArray results; - NetJobPtr m_dljob; -}; -} - diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 0583c4518..a0e01ac82 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -133,8 +133,6 @@ SET(MULTIMC_SOURCES pages/modplatform/legacy_ftb/Page.h pages/modplatform/legacy_ftb/ListModel.h pages/modplatform/legacy_ftb/ListModel.cpp - pages/modplatform/TwitchPage.cpp - pages/modplatform/TwitchPage.h pages/modplatform/ImportPage.cpp pages/modplatform/ImportPage.h @@ -277,7 +275,6 @@ SET(MULTIMC_UIS ) set(MULTIMC_QRCS - resources/assets/assets.qrc resources/backgrounds/backgrounds.qrc resources/multimc/multimc.qrc resources/pe_dark/pe_dark.qrc diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp index c59369539..804340bca 100644 --- a/application/dialogs/NewInstanceDialog.cpp +++ b/application/dialogs/NewInstanceDialog.cpp @@ -35,7 +35,6 @@ #include "widgets/PageContainer.h" #include #include -#include #include @@ -95,14 +94,8 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString if(!url.isEmpty()) { QUrl actualUrl(url); - if(actualUrl.host() == "www.curseforge.com") { - m_container->selectPage("twitch"); - twitchPage->setUrl(url); - } - else { - m_container->selectPage("import"); - importPage->setUrl(url); - } + m_container->selectPage("import"); + importPage->setUrl(url); } updateDialogState(); @@ -126,13 +119,11 @@ void NewInstanceDialog::accept() QList NewInstanceDialog::getPages() { importPage = new ImportPage(this); - twitchPage = new TwitchPage(this); return { new VanillaPage(this), importPage, new LegacyFTB::Page(this), - twitchPage }; } diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h index 0b8b2fb87..c86ab73f4 100644 --- a/application/dialogs/NewInstanceDialog.h +++ b/application/dialogs/NewInstanceDialog.h @@ -29,7 +29,6 @@ class NewInstanceDialog; class PageContainer; class QDialogButtonBox; class ImportPage; -class TwitchPage; class NewInstanceDialog : public QDialog, public BasePageProvider { @@ -68,7 +67,6 @@ private: QString InstIconKey; ImportPage *importPage = nullptr; - TwitchPage *twitchPage = nullptr; std::unique_ptr creationTask; bool importIcon = false; diff --git a/application/main.cpp b/application/main.cpp index c871bf1bf..b0360c7e4 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -43,7 +43,6 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(multimc); Q_INIT_RESOURCE(backgrounds); - Q_INIT_RESOURCE(assets); Q_INIT_RESOURCE(pe_dark); Q_INIT_RESOURCE(pe_light); diff --git a/application/pages/modplatform/TwitchPage.cpp b/application/pages/modplatform/TwitchPage.cpp deleted file mode 100644 index 389e3194f..000000000 --- a/application/pages/modplatform/TwitchPage.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "TwitchPage.h" -#include "ui_TwitchPage.h" - -#include "MultiMC.h" -#include "dialogs/NewInstanceDialog.h" -#include - -TwitchPage::TwitchPage(NewInstanceDialog* dialog, QWidget *parent) - : QWidget(parent), ui(new Ui::TwitchPage), dialog(dialog) -{ - ui->setupUi(this); - connect(ui->checkButton, &QPushButton::clicked, this, &TwitchPage::triggerCheck); - connect(ui->twitchLabel, &DropLabel::droppedURLs, [this](QList urls){ - if(urls.size()) { - setUrl(urls[0].toString()); - } - }); -} - -TwitchPage::~TwitchPage() -{ - delete ui; -} - -bool TwitchPage::shouldDisplay() const -{ - return true; -} - -void TwitchPage::openedImpl() -{ - dialog->setSuggestedPack(); -} - -void TwitchPage::triggerCheck(bool) -{ - if(m_modIdResolver) { - return; - } - auto task = new Flame::UrlResolvingTask(ui->lineEdit->text()); - connect(task, &Task::finished, this, &TwitchPage::checkDone); - m_modIdResolver.reset(task); - task->start(); -} - -void TwitchPage::setUrl(const QString& url) -{ - ui->lineEdit->setText(url); - triggerCheck(true); -} - -void TwitchPage::checkDone() -{ - auto result = m_modIdResolver->getResults(); - auto formatted = QString("Project %1, File %2").arg(result.projectId).arg(result.fileId); - if(result.resolved && result.type == Flame::File::Type::Modpack) { - ui->twitchLabel->setText(formatted); - QFileInfo fi(result.fileName); - dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(result.url)); - } else { - ui->twitchLabel->setPixmap(QPixmap(QString::fromUtf8(":/assets/deadglitch"))); - dialog->setSuggestedPack(); - } - m_modIdResolver.reset(); -} diff --git a/application/pages/modplatform/TwitchPage.h b/application/pages/modplatform/TwitchPage.h deleted file mode 100644 index 600913cd2..000000000 --- a/application/pages/modplatform/TwitchPage.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2013-2019 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 - -#include "pages/BasePage.h" -#include -#include "tasks/Task.h" -#include "modplatform/flame/UrlResolvingTask.h" - -namespace Ui -{ -class TwitchPage; -} - -class NewInstanceDialog; - -class TwitchPage : public QWidget, public BasePage -{ - Q_OBJECT - -public: - explicit TwitchPage(NewInstanceDialog* dialog, QWidget *parent = 0); - virtual ~TwitchPage(); - virtual QString displayName() const override - { - return tr("Twitch URL"); - } - virtual QIcon icon() const override - { - return MMC->getThemedIcon("twitch"); - } - virtual QString id() const override - { - return "twitch"; - } - virtual QString helpPage() const override - { - return "Twitch-platform"; - } - virtual bool shouldDisplay() const override; - - void openedImpl() override; - - void setUrl(const QString & url); - -private slots: - void triggerCheck(bool checked); - void checkDone(); - -private: - Ui::TwitchPage *ui = nullptr; - NewInstanceDialog* dialog = nullptr; - shared_qobject_ptr m_modIdResolver; -}; diff --git a/application/pages/modplatform/TwitchPage.ui b/application/pages/modplatform/TwitchPage.ui deleted file mode 100644 index 43a775a0b..000000000 --- a/application/pages/modplatform/TwitchPage.ui +++ /dev/null @@ -1,79 +0,0 @@ - - - TwitchPage - - - - 0 - 0 - 666 - 424 - - - - - - - - 0 - 0 - - - - - 40 - - - - :/assets/deadglitch - - - Qt::AlignCenter - - - - - - - Check - - - - - - - Twitch URL: - - - - - - - - - - Drag and drop an Install button from CurseForge into the area above. - - - Qt::AlignCenter - - - - - - - - DropLabel - QLabel -
widgets/DropLabel.h
- - - - lineEdit - checkButton - - - - - - diff --git a/application/resources/assets/assets.qrc b/application/resources/assets/assets.qrc deleted file mode 100644 index 7a916f05d..000000000 --- a/application/resources/assets/assets.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - - deadglitch.svg - - diff --git a/application/resources/assets/deadglitch.svg b/application/resources/assets/deadglitch.svg deleted file mode 100644 index 5682b8a31..000000000 --- a/application/resources/assets/deadglitch.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - -