From e456ef44a52ec8094b0b957f3ebd2815ed6deac7 Mon Sep 17 00:00:00 2001 From: glopesdev Date: Tue, 6 Aug 2024 12:10:12 +0100 Subject: [PATCH] Refactor definitions temp path away from main form --- Bonsai.Editor/EditorForm.cs | 5 ++--- Bonsai.Editor/Project.cs | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Bonsai.Editor/EditorForm.cs b/Bonsai.Editor/EditorForm.cs index e8af45f2..100f0509 100644 --- a/Bonsai.Editor/EditorForm.cs +++ b/Bonsai.Editor/EditorForm.cs @@ -32,7 +32,6 @@ public partial class EditorForm : Form const float DefaultEditorScale = 1.0f; const string EditorUid = "editor"; const string BonsaiPackageName = "Bonsai"; - const string DefinitionsDirectory = "Definitions"; const string WorkflowCategoryName = "Workflow"; const string SubjectCategoryName = "Subject"; static readonly AttributeCollection DesignTimeAttributes = new AttributeCollection(BrowsableAttribute.Yes, DesignTimeVisibleAttribute.Yes); @@ -162,7 +161,7 @@ public EditorForm( documentationProvider = (IDocumentationProvider)serviceProvider.GetService(typeof(IDocumentationProvider)); } - definitionsPath = Path.Combine(Path.GetTempPath(), DefinitionsDirectory + "." + GuidHelper.GetProcessGuid().ToString()); + definitionsPath = Project.GetDefinitionsTempPath(); editorControl = new WorkflowEditorControl(editorSite); editorControl.Enter += new EventHandler(editorControl_Enter); editorControl.Workflow = workflowBuilder.Workflow; @@ -2736,7 +2735,7 @@ public void ShowDefinition(object component) extension = provider.FileExtension; } - var directory = Directory.CreateDirectory(Path.Combine(siteForm.definitionsPath, DefinitionsDirectory)); + var directory = Directory.CreateDirectory(Path.Combine(siteForm.definitionsPath, Project.DefinitionsDirectory)); var sourceFile = Path.Combine(directory.FullName, type.FullName + "." + extension); File.WriteAllText(sourceFile, source); ScriptEditorLauncher.Launch(siteForm, siteForm.scriptEnvironment.ProjectFileName, sourceFile); diff --git a/Bonsai.Editor/Project.cs b/Bonsai.Editor/Project.cs index 2d82944c..90690d8d 100644 --- a/Bonsai.Editor/Project.cs +++ b/Bonsai.Editor/Project.cs @@ -13,6 +13,7 @@ static class Project internal const string BonsaiExtension = ".bonsai"; internal const string LayoutExtension = ".layout"; internal const string ExtensionsDirectory = "Extensions"; + internal const string DefinitionsDirectory = "Definitions"; public static string GetCurrentBaseDirectory() { @@ -57,6 +58,11 @@ internal static string GetLegacyLayoutConfigPath(string fileName) return Path.ChangeExtension(fileName, Path.GetExtension(fileName) + LayoutExtension); } + internal static string GetDefinitionsTempPath() + { + return Path.Combine(Path.GetTempPath(), DefinitionsDirectory + "." + GuidHelper.GetProcessGuid().ToString()); + } + public static IEnumerable EnumerateExtensionWorkflows(string basePath) { IEnumerable workflowFiles;