From e35f2b6c2c4b1c7675a4d7b72c01adbff1a43205 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Fri, 24 Dec 2021 15:00:36 +0000
Subject: [PATCH] NOISSUE Allow Technic pack API urls to be used in search

This mimics the behaviour that the Technic launcher has, and their
website displays API URLs for.

The big benefit of this, is to be able to install private packs now :)
---
 .../modplatform/technic/TechnicModel.cpp      | 80 ++++++++++++++-----
 .../pages/modplatform/technic/TechnicModel.h  |  5 ++
 2 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index 0bc0d498..c62d36a7 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -1,4 +1,5 @@
 /* Copyright 2020-2021 MultiMC Contributors
+ * Copyright 2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,12 +96,21 @@ void Technic::ListModel::performSearch()
     QString searchUrl = "";
     if (currentSearchTerm.isEmpty()) {
         searchUrl = "https://api.technicpack.net/trending?build=multimc";
+        searchMode = List;
     }
-    else
-    {
+    else if (currentSearchTerm.startsWith("http://api.technicpack.net/modpack/")) {
+        searchUrl = QString("https://%1?build=multimc").arg(currentSearchTerm.mid(7));
+        searchMode = Single;
+    }
+    else if (currentSearchTerm.startsWith("https://api.technicpack.net/modpack/")) {
+        searchUrl = QString("%1?build=multimc").arg(currentSearchTerm);
+        searchMode = Single;
+    }
+    else {
         searchUrl = QString(
             "https://api.technicpack.net/search?build=multimc&q=%1"
         ).arg(currentSearchTerm);
+        searchMode = List;
     }
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
@@ -125,26 +135,58 @@ void Technic::ListModel::searchRequestFinished()
     QList<Modpack> newList;
     try {
         auto root = Json::requireObject(doc);
-        auto objs = Json::requireArray(root, "modpacks");
-        for (auto technicPack: objs) {
-            Modpack pack;
-            auto technicPackObject = Json::requireValueObject(technicPack);
-            pack.name = Json::requireString(technicPackObject, "name");
-            pack.slug = Json::requireString(technicPackObject, "slug");
-            if (pack.slug == "vanilla")
-                continue;
 
-            auto rawURL = Json::ensureString(technicPackObject, "iconUrl", "null");
-            if(rawURL == "null") {
-                pack.logoUrl = "null";
-                pack.logoName = "null";
+        switch (searchMode) {
+            case List: {
+                auto objs = Json::requireArray(root, "modpacks");
+                for (auto technicPack: objs) {
+                    Modpack pack;
+                    auto technicPackObject = Json::requireValueObject(technicPack);
+                    pack.name = Json::requireString(technicPackObject, "name");
+                    pack.slug = Json::requireString(technicPackObject, "slug");
+                    if (pack.slug == "vanilla")
+                        continue;
+
+                    auto rawURL = Json::ensureString(technicPackObject, "iconUrl", "null");
+                    if(rawURL == "null") {
+                        pack.logoUrl = "null";
+                        pack.logoName = "null";
+                    }
+                    else {
+                        pack.logoUrl = rawURL;
+                        pack.logoName = rawURL.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
+                    }
+                    pack.broken = false;
+                    newList.append(pack);
+                }
+                break;
             }
-            else {
-                pack.logoUrl = rawURL;
-                pack.logoName = rawURL.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
+            case Single: {
+                if (root.contains("error")) {
+                    // Invalid API url
+                    break;
+                }
+
+                Modpack pack;
+                pack.name = Json::requireString(root, "displayName");
+                pack.slug = Json::requireString(root, "name");
+
+                if (root.contains("icon")) {
+                    auto iconObj = Json::requireObject(root, "icon");
+                    auto iconUrl = Json::requireString(iconObj, "url");
+
+                    pack.logoUrl = iconUrl;
+                    pack.logoName = iconUrl.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
+                }
+                else {
+                    pack.logoUrl = "null";
+                    pack.logoName = "null";
+                }
+
+                pack.broken = false;
+                newList.append(pack);
+                break;
             }
-            pack.broken = false;
-            newList.append(pack);
         }
     }
     catch (const JSONValidationError &err)
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.h b/launcher/ui/pages/modplatform/technic/TechnicModel.h
index e80e6e7c..d2748811 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.h
@@ -1,4 +1,5 @@
 /* Copyright 2020-2021 MultiMC Contributors
+ * Copyright 2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,6 +64,10 @@ private:
         ResetRequested,
         Finished
     } searchState = None;
+    enum SearchMode {
+        List,
+        Single,
+    } searchMode = List;
     NetJob::Ptr jobPtr;
     QByteArray response;
 };