Added --project command-line parameter for use when exporting

This allows the --export-map and --export-tileset parameters to use file formats defined by extensions in the project, and also enables handling of custom types. Closes #3797
mapeditor · Aug 3, 2023 · 3c1f76b · 3c1f76b
1 parent 99e0599
commit 3c1f76b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/src/tiled/project.h b/src/tiled/project.h
@@ -23,6 +23,7 @@
 #include "command.h"
 #include "object.h"
 #include "tiled.h"
+#include "tilededitor_global.h"
 
 #include <QDateTime>
 #include <QStringList>
@@ -32,7 +33,7 @@
 
 namespace Tiled {
 
-class Project : public Object
+class TILED_EDITOR_EXPORT Project : public Object
 {
 public:
     Project();

diff --git a/src/tiled/projectmanager.h b/src/tiled/projectmanager.h
@@ -22,6 +22,8 @@
 
 #include "project.h"
 
+#include "tilededitor_global.h"
+
 #include <QObject>
 
 namespace Tiled {
@@ -34,7 +36,7 @@ class ProjectModel;
  *
  * No dependencies.
  */
-class ProjectManager : public QObject
+class TILED_EDITOR_EXPORT ProjectManager : public QObject
 {
     Q_OBJECT
 

diff --git a/src/tiledapp/main.cpp b/src/tiledapp/main.cpp
@@ -92,6 +92,7 @@ class CommandLineHandler : public CommandLineParser
     void showVersion();
     void justQuit();
     void setDisableOpenGL();
+    void setProject();
     void setExportMap();
     void setExportTileset();
     void setExportEmbedTilesets();
@@ -118,6 +119,16 @@ class CommandLineHandler : public CommandLineParser
 
 static void initializePluginsAndExtensions()
 {
+    // Load the project without restoring the session
+    if (!Preferences::startupProject().isEmpty()) {
+        if (auto project = Project::load(Preferences::startupProject())) {
+            ProjectManager::instance()->setProject(std::move(project));
+        } else {
+            qWarning().noquote() << QCoreApplication::translate("Command line", "Failed to load project '%1'.")
+                                    .arg(Preferences::startupProject());
+        }
+    }
+
     PluginManager::instance()->loadPlugins();
     ScriptManager::instance().ensureInitialized();
 }
@@ -193,6 +204,11 @@ CommandLineHandler::CommandLineHandler()
                 QLatin1String("--disable-opengl"),
                 tr("Disable hardware accelerated rendering"));
 
+    option<&CommandLineHandler::setProject>(
+                QChar(),
+                QLatin1String("--project"),
+                tr("Project file to load"));
+
     option<&CommandLineHandler::setExportMap>(
                 QChar(),
                 QLatin1String("--export-map"),
@@ -264,6 +280,22 @@ void CommandLineHandler::setDisableOpenGL()
     disableOpenGL = true;
 }
 
+void CommandLineHandler::setProject()
+{
+    const QString projectFile = nextArgument();
+    const QFileInfo fileInfo(projectFile);
+
+    if (fileInfo.suffix() != QLatin1String("tiled-project")) {
+        qWarning().noquote() << QCoreApplication::translate("Command line", "Project file expected: --project <.tiled-project file>");
+        justQuit();
+    } else if (!fileInfo.exists()) {
+        qWarning().noquote() << QCoreApplication::translate("Command line", "Project file '%1' not found.").arg(projectFile);
+        justQuit();
+    } else {
+        Preferences::setStartupProject(QDir::cleanPath(fileInfo.absoluteFilePath()));
+    }
+}
+
 void CommandLineHandler::setExportMap()
 {
     exportMap = true;