1 files changed, 82 insertions, 43 deletions

diff --git a/launcher/ui/dialogs/SkinUploadDialog.cpp b/launcher/ui/dialogs/SkinUploadDialog.cpp
index 8d137afc..8180ac1f 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.cpp
+++ b/launcher/ui/dialogs/SkinUploadDialog.cpp
@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  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
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      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.
+ */
+
 #include <QFileInfo>
 #include <QFileDialog>
 #include <QPainter>
@@ -22,68 +57,72 @@ void SkinUploadDialog::on_buttonBox_accepted()
 {
     QString fileName;
     QString input = ui->skinPathTextBox->text();
-    QRegExp urlPrefixMatcher("^([a-z]+)://.+$");
-    bool isLocalFile = false;
-    // it has an URL prefix -> it is an URL
-    if(urlPrefixMatcher.exactMatch(input))
-    {
-        QUrl fileURL = input;
-        if(fileURL.isValid())
+    ProgressDialog prog(this);
+    SequentialTask skinUpload;
+
+    if (!input.isEmpty()) {
+        QRegularExpression urlPrefixMatcher(QRegularExpression::anchoredPattern("^([a-z]+)://.+$"));
+        bool isLocalFile = false;
+        // it has an URL prefix -> it is an URL
+        if(urlPrefixMatcher.match(input).hasMatch())
         {
-            // local?
-            if(fileURL.isLocalFile())
+            QUrl fileURL = input;
+            if(fileURL.isValid())
             {
-                isLocalFile = true;
-                fileName = fileURL.toLocalFile();
+                // local?
+                if(fileURL.isLocalFile())
+                {
+                    isLocalFile = true;
+                    fileName = fileURL.toLocalFile();
+                }
+                else
+                {
+                    CustomMessageBox::selectable(
+                        this,
+                        tr("Skin Upload"),
+                        tr("Using remote URLs for setting skins is not implemented yet."),
+                        QMessageBox::Warning
+                        )->exec();
+                    close();
+                    return;
+                }
             }
             else
             {
                 CustomMessageBox::selectable(
                     this,
                     tr("Skin Upload"),
-                    tr("Using remote URLs for setting skins is not implemented yet."),
+                    tr("You cannot use an invalid URL for uploading skins."),
                     QMessageBox::Warning
-                )->exec();
+                    )->exec();
                 close();
                 return;
             }
         }
         else
         {
-            CustomMessageBox::selectable(
-                this,
-                tr("Skin Upload"),
-                tr("You cannot use an invalid URL for uploading skins."),
-                QMessageBox::Warning
-            )->exec();
+            // just assume it's a path then
+            isLocalFile = true;
+            fileName = ui->skinPathTextBox->text();
+        }
+        if (isLocalFile && !QFile::exists(fileName))
+        {
+            CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Skin file does not exist!"), QMessageBox::Warning)->exec();
             close();
             return;
         }
+        SkinUpload::Model model = SkinUpload::STEVE;
+        if (ui->steveBtn->isChecked())
+        {
+            model = SkinUpload::STEVE;
+        }
+        else if (ui->alexBtn->isChecked())
+        {
+            model = SkinUpload::ALEX;
+        }
+        skinUpload.addTask(shared_qobject_ptr<SkinUpload>(new SkinUpload(this, m_acct->accessToken(), FS::read(fileName), model)));
     }
-    else
-    {
-        // just assume it's a path then
-        isLocalFile = true;
-        fileName = ui->skinPathTextBox->text();
-    }
-    if (isLocalFile && !QFile::exists(fileName))
-    {
-        CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Skin file does not exist!"), QMessageBox::Warning)->exec();
-        close();
-        return;
-    }
-    SkinUpload::Model model = SkinUpload::STEVE;
-    if (ui->steveBtn->isChecked())
-    {
-        model = SkinUpload::STEVE;
-    }
-    else if (ui->alexBtn->isChecked())
-    {
-        model = SkinUpload::ALEX;
-    }
-    ProgressDialog prog(this);
-    SequentialTask skinUpload;
-    skinUpload.addTask(shared_qobject_ptr<SkinUpload>(new SkinUpload(this, m_acct->accessToken(), FS::read(fileName), model)));
+
     auto selectedCape = ui->capeCombo->currentData().toString();
     if(selectedCape != m_acct->accountData()->minecraftProfile.currentCape) {
         skinUpload.addTask(shared_qobject_ptr<CapeChange>(new CapeChange(this, m_acct->accessToken(), selectedCape)));