set new patch unsaved, handle rename and save

cables-gl · Nov 12, 2024 · 636002e · 636002e
1 parent 8e00381
commit 636002e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/src/electron/electron_api.js b/src/electron/electron_api.js
@@ -110,9 +110,9 @@ class ElectronApi
             if (topicConfig.needsProjectFile)
             {
                 const projectFile = settings.getCurrentProjectFile();
-                if (!projectFile || !projectFile.endsWith(projectsUtil.CABLES_PROJECT_FILE_EXTENSION))
+                if (!projectFile)
                 {
-                    const newProjectFile = await electronApp.saveProjectFileDialog();
+                    const newProjectFile = await electronApp.saveProjectFileDialog(data.name);
                     if (newProjectFile)
                     {
                         let patchData = null;
@@ -126,7 +126,7 @@ class ElectronApi
                     }
                     else
                     {
-                        return this.error("no directory chosen", null, "info");
+                        return this.error("CANCELLED", null, "info");
                     }
                 }
             }
@@ -1262,9 +1262,9 @@ class ElectronApi
         return this.success("OK", { "assets": [], "countPatches": 0, "countOps": 0 }, true);
     }
 
-    async saveProjectAs()
+    async saveProjectAs(data)
     {
-        const projectFile = await electronApp.saveProjectFileDialog();
+        const projectFile = await electronApp.saveProjectFileDialog(data.name);
         if (!projectFile)
         {
             return this.error("no project dir chosen", null, "info");
@@ -1386,12 +1386,8 @@ class ElectronApi
         {
             currentProject = projectsUtil.addOpDir(currentProject, opDir, true);
             projectsUtil.writeProjectToFile(settings.getCurrentProjectFile(), currentProject);
-            return this.success("OK", projectsUtil.getProjectOpDirs(currentProject, true));
-        }
-        else
-        {
-            return this.error("no directory chosen", [], "info");
         }
+        return this.success("OK", projectsUtil.getProjectOpDirs(currentProject, true));
     }
 
     async removeProjectOpDir(dirName)

diff --git a/src/electron/electron_settings.js b/src/electron/electron_settings.js
@@ -170,7 +170,9 @@ class ElectronSettings
 
     getCurrentProjectFile()
     {
-        return this.get(this.PROJECTFILE_FIELD);
+        const projectFile = this.get(this.PROJECTFILE_FIELD);
+        if (projectFile && projectFile.endsWith(projectsUtil.CABLES_PROJECT_FILE_EXTENSION)) return projectFile;
+        return null;
     }
 
     getBuildInfo()

diff --git a/src/electron/main.js b/src/electron/main.js
@@ -329,7 +329,7 @@ class ElectronApp
         });
     }
 
-    async saveProjectFileDialog()
+    async saveProjectFileDialog(defaultPath)
     {
         const extensions = [];
         extensions.push(projectsUtil.CABLES_PROJECT_FILE_EXTENSION);
@@ -339,6 +339,7 @@ class ElectronApp
         return dialog.showSaveDialog(this.editorWindow, {
             "title": title,
             "properties": properties,
+            "defaultPath": defaultPath,
             "filters": [{
                 "name": "cables project",
                 "extensions": extensions,

diff --git a/src/utils/projects_util.js b/src/utils/projects_util.js
@@ -73,6 +73,11 @@ class ProjectsUtil extends SharedProjectsUtil
         };
     }
 
+    getNewProjectName(randomize = false)
+    {
+        return "untitled";
+    }
+
     getProjectOpDirs(project, includeOsDir = true, reverse = false, addLocalCoreIfPackaged = true)
     {
         let opsDirs = [];

diff --git a/src_client/cmd_electron.js b/src_client/cmd_electron.js
@@ -242,9 +242,10 @@ CABLES_CMD_STANDALONE.addOpPackage = (options, next) =>
 };
 
 CABLES_CMD_STANDALONE_OVERRIDES.PATCH = {};
-CABLES_CMD_STANDALONE_OVERRIDES.PATCH.saveAs = () =>
+CABLES_CMD_STANDALONE_OVERRIDES.PATCH.saveAs = (data) =>
 {
-    standalone.editor.api("saveProjectAs", { }, (_err, r) => {});
+    let patchName = standalone.gui.project() ? standalone.gui.project().name : null;
+    standalone.editor.api("saveProjectAs", { "name": patchName }, (_err, r) => {});
 };
 CABLES_CMD_STANDALONE_OVERRIDES.PATCH.uploadFileDialog = () =>
 {

diff --git a/src_client/electron_editor.js b/src_client/electron_editor.js
@@ -198,7 +198,7 @@ export default class ElectronEditor
             "opSaveLayout": { },
             "opSetSummary": { },
             "checkNumAssetPatches": {},
-            "saveProjectAs": {},
+            "saveProjectAs": { },
             "gotoPatch": {},
             "getProjectOpDirs": {},
             "openDir": {},

diff --git a/src_client/standalone.js b/src_client/standalone.js
@@ -87,6 +87,13 @@ export default class CablesStandalone
                             });
                         }
                         waitForAce();
+                        if (this.gui)
+                        {
+                            this.gui.on("uiloaded", () =>
+                            {
+                                if (this.editor && this.editor.config && !this.editor.config.patchFile) this.gui.setStateUnsaved();
+                            });
+                        }
                     });
                 };
                 if (this._settings.uiLoadStart) this.editorWindow.CABLESUILOADER.uiLoadStart -= this._settings.uiLoadStart;