Fixed ccusom model loading form the fix path to the current project directory
This commit is contained in:
@@ -276,7 +276,7 @@ namespace Nodify.Calculator
|
|||||||
if (string.IsNullOrEmpty(className)) return;
|
if (string.IsNullOrEmpty(className)) return;
|
||||||
|
|
||||||
// Read model .cs file and parse properties
|
// Read model .cs file and parse properties
|
||||||
var customModelDir = "CustomModels";
|
var customModelDir = Path.Combine(ProjectManager.ProjectDirectory, "CustomModels");
|
||||||
var filePath = Path.Combine(customModelDir, $"{className}.cs");
|
var filePath = Path.Combine(customModelDir, $"{className}.cs");
|
||||||
if (!File.Exists(filePath)) return;
|
if (!File.Exists(filePath)) return;
|
||||||
|
|
||||||
@@ -463,7 +463,7 @@ namespace Nodify.Calculator
|
|||||||
|
|
||||||
// Check if the element type is a model class (has a .cs file in CustomModels)
|
// Check if the element type is a model class (has a .cs file in CustomModels)
|
||||||
bool isModelType = false;
|
bool isModelType = false;
|
||||||
var modelFilePath = Path.Combine("CustomModels", $"{elementType}.cs");
|
var modelFilePath = Path.Combine(ProjectManager.ProjectDirectory, "CustomModels", $"{elementType}.cs");
|
||||||
if (File.Exists(modelFilePath))
|
if (File.Exists(modelFilePath))
|
||||||
isModelType = true;
|
isModelType = true;
|
||||||
|
|
||||||
|
|||||||
@@ -323,7 +323,7 @@ namespace Nodify.Calculator
|
|||||||
{
|
{
|
||||||
//Convert model here
|
//Convert model here
|
||||||
//CreateModelsFromString(outputValue);
|
//CreateModelsFromString(outputValue);
|
||||||
var customModelDir = "CustomModels";
|
var customModelDir = Path.Combine(ProjectManager.ProjectDirectory, "CustomModels");
|
||||||
Directory.CreateDirectory(customModelDir);
|
Directory.CreateDirectory(customModelDir);
|
||||||
string className = "Class 1";
|
string className = "Class 1";
|
||||||
className = className.Replace(" ", "");
|
className = className.Replace(" ", "");
|
||||||
|
|||||||
@@ -427,7 +427,7 @@ namespace Nodify.Calculator
|
|||||||
else if (info.Title == "SET")
|
else if (info.Title == "SET")
|
||||||
{
|
{
|
||||||
info.Input.Add("");
|
info.Input.Add("");
|
||||||
var customModelDir = "CustomModels";
|
var customModelDir = System.IO.Path.Combine(ProjectManager.ProjectDirectory, "CustomModels");
|
||||||
Directory.CreateDirectory(customModelDir);
|
Directory.CreateDirectory(customModelDir);
|
||||||
var flpath = System.IO.Path.Combine(customModelDir, info.ClassName + ".cs");
|
var flpath = System.IO.Path.Combine(customModelDir, info.ClassName + ".cs");
|
||||||
if (File.Exists(flpath))
|
if (File.Exists(flpath))
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ namespace Nodify.Calculator
|
|||||||
AvailableFunctions = new NodifyObservableCollection<OperationInfoViewModel>();
|
AvailableFunctions = new NodifyObservableCollection<OperationInfoViewModel>();
|
||||||
LoadVariablesFromDb();
|
LoadVariablesFromDb();
|
||||||
|
|
||||||
var customModelDir = "CustomModels";
|
var customModelDir = Path.Combine(ProjectManager.ProjectDirectory, "CustomModels");
|
||||||
Directory.CreateDirectory(customModelDir);
|
Directory.CreateDirectory(customModelDir);
|
||||||
var dirInfo = new DirectoryInfo(customModelDir);
|
var dirInfo = new DirectoryInfo(customModelDir);
|
||||||
var allFiles = dirInfo.GetFiles("*.cs");
|
var allFiles = dirInfo.GetFiles("*.cs");
|
||||||
@@ -214,7 +214,7 @@ namespace Nodify.Calculator
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Generate .cs file
|
// Generate .cs file
|
||||||
var customModelDir = "CustomModels";
|
var customModelDir = Path.Combine(ProjectManager.ProjectDirectory, "CustomModels");
|
||||||
Directory.CreateDirectory(customModelDir);
|
Directory.CreateDirectory(customModelDir);
|
||||||
var sb = new System.Text.StringBuilder();
|
var sb = new System.Text.StringBuilder();
|
||||||
sb.AppendLine($"public class {className}");
|
sb.AppendLine($"public class {className}");
|
||||||
@@ -495,7 +495,7 @@ namespace Nodify.Calculator
|
|||||||
|
|
||||||
private void GenerateModelFromSchema(string className, NJsonSchema.JsonSchema schema)
|
private void GenerateModelFromSchema(string className, NJsonSchema.JsonSchema schema)
|
||||||
{
|
{
|
||||||
var customModelDir = "CustomModels";
|
var customModelDir = Path.Combine(ProjectManager.ProjectDirectory, "CustomModels");
|
||||||
Directory.CreateDirectory(customModelDir);
|
Directory.CreateDirectory(customModelDir);
|
||||||
var sb = new System.Text.StringBuilder();
|
var sb = new System.Text.StringBuilder();
|
||||||
sb.AppendLine($"public class {className}");
|
sb.AppendLine($"public class {className}");
|
||||||
|
|||||||
Reference in New Issue
Block a user