WIP: Disable project extensions by default

mapeditor · May 21, 2021 · a27862e · a27862e
1 parent a794403
commit a27862e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/src/tiled/scriptmanager.cpp b/src/tiled/scriptmanager.cpp
@@ -65,6 +65,8 @@
 
 namespace Tiled {
 
+static Preference<QStringList> scriptingEnabledProjects { "Scripting/EnabledProjects" };
+
 ScriptManager *ScriptManager::mInstance;
 
 ScriptManager &ScriptManager::instance()
@@ -351,13 +353,21 @@ void ScriptManager::refreshExtensionsPaths()
         extensionsPaths.append(mExtensionsPath);
 
     // Add extensions path from project
-    auto &projectExtensionsPath = ProjectManager::instance()->project().mExtensionsPath;
-    if (!projectExtensionsPath.isEmpty()) {
-        const QFileInfo info(projectExtensionsPath);
-        if (info.exists() && info.isDir())
-            extensionsPaths.append(projectExtensionsPath);
+    bool projectExtensionsSuppressed = false;
+    const Project &project = ProjectManager::instance()->project();
+    if (!project.mExtensionsPath.isEmpty()) {
+        const QFileInfo info(project.mExtensionsPath);
+        if (info.exists() && info.isDir()) {
+            if (scriptingEnabledProjects.get().contains(project.fileName(), Qt::CaseInsensitive))
+                extensionsPaths.append(project.mExtensionsPath);
+            else
+                projectExtensionsSuppressed = true;
+        }
     }
 
+    if (mProjectExtensionsSuppressed != projectExtensionsSuppressed)
+        emit projectExtensionsSuppressedChanged(projectExtensionsSuppressed);
+
     extensionsPaths.sort();
     extensionsPaths.removeDuplicates();
 
@@ -372,6 +382,19 @@ void ScriptManager::refreshExtensionsPaths()
     }
 }
 
+void ScriptManager::enableProjectExtensions()
+{
+    const Project &project = ProjectManager::instance()->project();
+    const QString &fileName = project.fileName();
+    if (!fileName.isEmpty()) {
+        QStringList projects = scriptingEnabledProjects;
+        if (!projects.contains(fileName, Qt::CaseInsensitive)) {
+            projects.append(fileName);
+            scriptingEnabledProjects = projects;
+        }
+    }
+}
+
 } // namespace Tiled
 
 #include "moc_scriptmanager.cpp"
diff --git a/src/tiled/scriptmanager.h b/src/tiled/scriptmanager.h
@@ -41,6 +41,8 @@ class ScriptManager : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(bool projectExtensionsSuppressed READ projectExtensionsSuppressed NOTIFY projectExtensionsSuppressedChanged)
+
 public:
     static ScriptManager &instance();
     static void deleteInstance();
@@ -69,6 +71,11 @@ class ScriptManager : public QObject
 
     void refreshExtensionsPaths();
 
+    bool projectExtensionsSuppressed() const;
+
+signals:
+    void projectExtensionsSuppressedChanged(bool);
+
 private:
     explicit ScriptManager(QObject *parent = nullptr);
     ~ScriptManager() = default;
@@ -87,6 +94,7 @@ class ScriptManager : public QObject
     QString mExtensionsPath;
     QStringList mExtensionsPaths;
     int mTempCount = 0;
+    bool mProjectExtensionsSuppressed = false;
 
     static ScriptManager *mInstance;
 };
@@ -107,4 +115,9 @@ inline QJSEngine *ScriptManager::engine() const
     return mEngine;
 }
 
+inline bool ScriptManager::projectExtensionsSuppressed() const
+{
+    return mProjectExtensionsSuppressed;
+}
+
 } // namespace Tiled