1 files changed, 31 insertions, 28 deletions

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index e89b7659..fc435369 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -196,9 +196,12 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         {{"s", "server"}, "Join the specified server on launch (only valid in combination with --launch)", "address"},
         {{"a", "profile"}, "Use the account specified by its profile name (only valid in combination with --launch)", "profile"},
         {"alive", "Write a small '" + liveCheckFile + "' file after the launcher starts"},
-        {{"I", "import"}, "Import instance from specified zip (local path or URL)", "file"},
+        {{"I", "import"}, "Import instance or resource from specified local path or URL", "url"},
         {"show", "Opens the window for the specified instance (by instance ID)", "show"}
     });
+    // Has to be positional for some OS to handle that properly
+    parser.addPositionalArgument("URL", "Import the resource(s) at the given URL(s) (same as -I / --import)", "[URL...]");
+    
     parser.addHelpOption();
     parser.addVersionOption();
 
@@ -211,16 +214,15 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
     m_instanceIdToShowWindowOf = parser.value("show");
 
-    for (auto zip_path : parser.values("import")){
-        m_zipsToImport.append(QUrl::fromLocalFile(QFileInfo(zip_path).absoluteFilePath()));
+    for (auto url : parser.values("import")){
+        m_urlsToImport.append(normalizeImportUrl(url));
     }
 
     // treat unspecified positional arguments as import urls
-    for (auto zip_path : parser.positionalArguments()) {
-        m_zipsToImport.append(QUrl::fromLocalFile(QFileInfo(zip_path).absoluteFilePath()));
+    for (auto url : parser.positionalArguments()) {
+        m_urlsToImport.append(normalizeImportUrl(url));
     }
 
-
     // error if --launch is missing with --server or --profile
     if((!m_serverToJoin.isEmpty() || !m_profileToUse.isEmpty()) && m_instanceIdToLaunch.isEmpty())
     {
@@ -332,12 +334,11 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                 activate.command = "activate";
                 m_peerInstance->sendMessage(activate.serialize(), timeout);
 
-                if(!m_zipsToImport.isEmpty())
-                {
-                    for (auto zip_url : m_zipsToImport) {
+                if (!m_urlsToImport.isEmpty()) {
+                    for (auto url : m_urlsToImport) {
                         ApplicationMessage import;
                         import.command = "import";
-                        import.args.insert("path", zip_url.toString());
+                        import.args.insert("url", url.toString());
                         m_peerInstance->sendMessage(import.serialize(), timeout);
                     }
                 }
@@ -1023,10 +1024,10 @@ void Application::performMainStartupAction()
         showMainWindow(false);
         qDebug() << "<> Main window shown.";
     }
-    if(!m_zipsToImport.isEmpty())
+    if(!m_urlsToImport.isEmpty())
     {
-        qDebug() << "<> Importing from zip:" << m_zipsToImport;
-        m_mainWindow->processURLs( m_zipsToImport );
+        qDebug() << "<> Importing from url:" << m_urlsToImport;
+        m_mainWindow->processURLs( m_urlsToImport );
     }
 }
 
@@ -1067,22 +1068,16 @@ void Application::messageReceived(const QByteArray& message)
 
     auto & command = received.command;
 
-    if(command == "activate")
-    {
+    if (command == "activate") {
         showMainWindow();
-    }
-    else if(command == "import")
-    {
-        QString path = received.args["path"];
-        if(path.isEmpty())
-        {
+    } else if (command == "import") {
+        QString url = received.args["url"];
+        if (url.isEmpty()) {
             qWarning() << "Received" << command << "message without a zip path/URL.";
             return;
         }
-        m_mainWindow->processURLs({ QUrl::fromLocalFile(QFileInfo(path).absoluteFilePath()) });
-    }
-    else if(command == "launch")
-    {
+        m_mainWindow->processURLs({ normalizeImportUrl(url) });
+    } else if (command == "launch") {
         QString id = received.args["id"];
         QString server = received.args["server"];
         QString profile = received.args["profile"];
@@ -1122,9 +1117,7 @@ void Application::messageReceived(const QByteArray& message)
             serverObject,
             accountObject
         );
-    }
-    else
-    {
+    } else {
         qWarning() << "Received invalid message" << message;
     }
 }
@@ -1742,3 +1735,13 @@ void Application::triggerUpdateCheck()
         qDebug() << "Updater not available.";
     }
 }
+
+QUrl Application::normalizeImportUrl(QString const& url)
+{
+    auto local_file = QFileInfo(url);
+    if (local_file.exists()) {
+        return QUrl::fromLocalFile(local_file.absoluteFilePath());
+    } else {
+        return QUrl::fromUserInput(url);
+    }
+}