From f897b14e3e8ae658a6e63ffd9f61b7ad8a4259bf Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 24 Aug 2023 13:05:27 +0300
Subject: [PATCH] changed technic icon name retrival

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../ui/pages/modplatform/import_ftb/ImportFTBPage.cpp     | 2 +-
 launcher/ui/pages/modplatform/legacy_ftb/Page.cpp         | 8 +++-----
 launcher/ui/pages/modplatform/technic/TechnicModel.cpp    | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
index b3b18e2ca..e54a487c6 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
@@ -76,7 +76,7 @@ void ImportFTBPage::suggestCurrent()
     }
 
     dialog->setSuggestedPack(selected.name, new PackInstallTask(selected));
-    QString editedLogoName = QString("ftb_%1.jpg").arg(selected.id);
+    QString editedLogoName = QString("ftb_%1_%2,jpg").arg(selected.name, selected.id);
     dialog->setSuggestedIconFromFile(FS::PathCombine(selected.path, "folder.jpg"), editedLogoName);
 }
 
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
index 243c90dcd..9ba70da05 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp
@@ -173,11 +173,9 @@ void Page::suggestCurrent()
     }
 
     dialog->setSuggestedPack(selected.name, selectedVersion, new PackInstallTask(APPLICATION->network(), selected, selectedVersion));
-    QString editedLogoName;
-    if (selected.logo.toLower().startsWith("ftb")) {
-        editedLogoName = selected.logo;
-    } else {
-        editedLogoName = "ftb_" + selected.logo;
+    QString editedLogoName = selected.logo;
+    if (!selected.logo.toLower().startsWith("ftb")) {
+        editedLogoName = "ftb_" + editedLogoName;
     }
 
     if (selected.type == PackType::Public) {
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index 6fbfd7624..9675534e1 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -34,14 +34,15 @@
  */
 
 #include "TechnicModel.h"
-#include <QUrl>
 #include "Application.h"
 #include "BuildConfig.h"
 #include "Json.h"
 
 #include "net/ApiDownload.h"
 
+#include <QFileInfo>
 #include <QIcon>
+#include <QUrl>
 
 Technic::ListModel::ListModel(QObject* parent) : QAbstractListModel(parent) {}
 
@@ -160,7 +161,7 @@ void Technic::ListModel::searchRequestFinished()
                         pack.logoName = "null";
                     } else {
                         pack.logoUrl = rawURL;
-                        pack.logoName = QUrl(rawURL).fileName();
+                        pack.logoName = pack.slug + "." + QFileInfo(QUrl(rawURL).fileName()).suffix();
                     }
                     pack.broken = false;
                     newList.append(pack);
@@ -182,7 +183,7 @@ void Technic::ListModel::searchRequestFinished()
                     auto iconUrl = Json::requireString(iconObj, "url");
 
                     pack.logoUrl = iconUrl;
-                    pack.logoName = QUrl(iconUrl).fileName();
+                    pack.logoName = pack.slug + "." + QFileInfo(QUrl(iconUrl).fileName()).suffix();
                 } else {
                     pack.logoUrl = "null";
                     pack.logoName = "null";