prioritize json over xaml (#14477)

BogdanZavu · zavub · web-flow · commit 01ef5fc280b7 · 2023-10-10T15:28:28.000-04:00
Co-authored-by: Bogdan Zavu &lt;bogdan.zavu@autodesk.com&gt;
diff --git a/src/DynamoCore/Core/CustomNodeManager.cs b/src/DynamoCore/Core/CustomNodeManager.cs
@@ -684,18 +684,18 @@ internal bool TryGetInfoFromPath(string path, bool isTestMode, out CustomNodeInf
             Exception ex;
             try
             {
-                if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))
+                if (DynamoUtilities.PathHelper.isValidJson(path, out jsonDoc, out ex))
                 {
-                    if (!WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out header))
+                    if (!WorkspaceInfo.FromJsonDocument(jsonDoc, path, isTestMode, false, AsLogger(), out header))
                     {
                         Log(String.Format(Properties.Resources.FailedToLoadHeader, path));
                         info = null;
                         return false;
                     }
                 }
-                else if (DynamoUtilities.PathHelper.isValidJson(path, out jsonDoc, out ex))
+                else if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))
                 {
-                    if (!WorkspaceInfo.FromJsonDocument(jsonDoc, path, isTestMode, false, AsLogger(), out header))
+                    if (!WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out header))
                     {
                         Log(String.Format(Properties.Resources.FailedToLoadHeader, path));
                         info = null;
@@ -854,7 +854,14 @@ private bool InitializeCustomNode(
                 XmlDocument xmlDoc;
                 string strInput;
                 Exception ex;
-                if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))
+
+                if (DynamoUtilities.PathHelper.isValidJson(path, out strInput, out ex))
+                {
+                    WorkspaceInfo.FromJsonDocument(strInput, path, isTestMode, false, AsLogger(), out info);
+                    info.ID = functionId.ToString();
+                    return InitializeCustomNode(info, null, out workspace);
+                }
+                else if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))
                 {
                     if (WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out info))
                     {
@@ -865,13 +872,6 @@ private bool InitializeCustomNode(
                         }
                     }
                 }
-                else if (DynamoUtilities.PathHelper.isValidJson(path, out strInput, out ex))
-                {
-                    // TODO: Skip Json migration for now
-                    WorkspaceInfo.FromJsonDocument(strInput, path, isTestMode, false, AsLogger(), out info);
-                    info.ID = functionId.ToString();
-                    return InitializeCustomNode(info, null, out workspace);
-                }
                 else throw ex;
                 Log(string.Format(Properties.Resources.CustomNodeCouldNotBeInitialized, customNodeInfo.Name));
                 workspace = null;
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1941,11 +1941,12 @@ public void OpenFileFromJson(string fileContents, bool forceManualExecutionMode
         /// execution mode specified in the file and set manual mode</param>
         public void OpenFileFromPath(string filePath, bool forceManualExecutionMode = false)
         {
-            XmlDocument xmlDoc;
-            Exception ex;
-            if (DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex))
+            
+            Exception ex;            
+            string fileContents;
+            if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex))
             {
-                OpenXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode);
+                OpenJsonFileFromPath(fileContents, filePath, forceManualExecutionMode);
                 return;
             }
             else
@@ -1955,24 +1956,20 @@ public void OpenFileFromPath(string filePath, bool forceManualExecutionMode = fa
                 {
                     throw ex;
                 }
-                if (ex is System.Xml.XmlException)
-                {
-                    // XML opening failure can indicate that this file is corrupted XML or Json
-                    string fileContents;
 
-                    if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex))
-                    {
-                        OpenJsonFileFromPath(fileContents, filePath, forceManualExecutionMode);
-                        return;
-                    }
-                    else
-                    {
-                        // When Json opening also failed, either this file is corrupted or there
-                        // are other kind of failures related to Json de-serialization
-                        throw ex;
-                    }
+                XmlDocument xmlDoc;
+
+                // When Json opening failed, either this file is corrupted or file might be XML
+                if (ex is JsonReaderException && DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex))
+                {
+                    OpenXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode);
+                    return;
                 }
-            }
+                else
+                {
+                    throw ex;
+                }                
+            }            
         }
 
         /// <summary>
@@ -1982,11 +1979,12 @@ public void OpenFileFromPath(string filePath, bool forceManualExecutionMode = fa
         /// <param name="forceManualExecutionMode"></param>
         public void InsertFileFromPath(string filePath, bool forceManualExecutionMode = false)
         {
-            XmlDocument xmlDoc;
             Exception ex;
-            if (DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex))
+            string fileContents;
+
+            if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex))
             {
-                InsertXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode);
+                InsertJsonFileFromPath(fileContents, filePath, forceManualExecutionMode);
                 return;
             }
             else
@@ -1996,24 +1994,20 @@ public void InsertFileFromPath(string filePath, bool forceManualExecutionMode =
                 {
                     throw ex;
                 }
-                if (ex is System.Xml.XmlException)
-                {
-                    // XML opening failure can indicate that this file is corrupted XML or Json
-                    string fileContents;
 
-                    if (DynamoUtilities.PathHelper.isValidJson(filePath, out fileContents, out ex))
+                if (ex is JsonReaderException)
+                {
+                    XmlDocument xmlDoc;
+                    if (DynamoUtilities.PathHelper.isValidXML(filePath, out xmlDoc, out ex))
                     {
-                        InsertJsonFileFromPath(fileContents, filePath, forceManualExecutionMode);
+                        InsertXmlFileFromPath(xmlDoc, filePath, forceManualExecutionMode);
                         return;
                     }
-                    else
-                    {
-                        // When Json opening also failed, either this file is corrupted or there
-                        // are other kind of failures related to Json de-serialization
-                        throw ex;
-                    }
                 }
-
+                else
+                {
+                    throw ex;
+                }
             }
         }
 
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/MdFileInfo.cs b/src/Tools/NodeDocumentationMarkdownGenerator/MdFileInfo.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Xml;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Logging;
@@ -73,13 +73,13 @@ internal static MdFileInfo FromCustomNode(string path)
             WorkspaceInfo header = null;
             ILogger log = new DummyConsoleLogger();
 
-            if (DynamoUtilities.PathHelper.isValidXML(path, out XmlDocument xmlDoc, out Exception ex))
+            if (DynamoUtilities.PathHelper.isValidJson(path, out string jsonDoc, out Exception ex))
             {
-                WorkspaceInfo.FromXmlDocument(xmlDoc, path, true, false, log, out header);
+                WorkspaceInfo.FromJsonDocument(jsonDoc, path, true, false, log, out header);
             }
-            else if (DynamoUtilities.PathHelper.isValidJson(path, out string jsonDoc, out ex))
+            else if (DynamoUtilities.PathHelper.isValidXML(path, out XmlDocument xmlDoc, out ex))
             {
-                WorkspaceInfo.FromJsonDocument(jsonDoc, path, true, false, log, out header);
+                WorkspaceInfo.FromXmlDocument(xmlDoc, path, true, false, log, out header);
             }
             else throw ex;
 

Original file line number	Diff line number	Diff line change
`@@ -684,18 +684,18 @@ internal bool TryGetInfoFromPath(string path, bool isTestMode, out CustomNodeInf`
`684`	`684`	`Exception ex;`
`685`	`685`	`try`
`686`	`686`	`{`
`687`		`- if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))`
	`687`	`+ if (DynamoUtilities.PathHelper.isValidJson(path, out jsonDoc, out ex))`
`688`	`688`	`{`
`689`		`- if (!WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out header))`
	`689`	`+ if (!WorkspaceInfo.FromJsonDocument(jsonDoc, path, isTestMode, false, AsLogger(), out header))`
`690`	`690`	`{`
`691`	`691`	`Log(String.Format(Properties.Resources.FailedToLoadHeader, path));`
`692`	`692`	`info = null;`
`693`	`693`	`return false;`
`694`	`694`	`}`
`695`	`695`	`}`
`696`		`- else if (DynamoUtilities.PathHelper.isValidJson(path, out jsonDoc, out ex))`
	`696`	`+ else if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))`
`697`	`697`	`{`
`698`		`- if (!WorkspaceInfo.FromJsonDocument(jsonDoc, path, isTestMode, false, AsLogger(), out header))`
	`698`	`+ if (!WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out header))`
`699`	`699`	`{`
`700`	`700`	`Log(String.Format(Properties.Resources.FailedToLoadHeader, path));`
`701`	`701`	`info = null;`
`@@ -854,7 +854,14 @@ private bool InitializeCustomNode(`
`854`	`854`	`XmlDocument xmlDoc;`
`855`	`855`	`string strInput;`
`856`	`856`	`Exception ex;`
`857`		`- if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))`
	`857`	`+`
	`858`	`+ if (DynamoUtilities.PathHelper.isValidJson(path, out strInput, out ex))`
	`859`	`+ {`
	`860`	`+ WorkspaceInfo.FromJsonDocument(strInput, path, isTestMode, false, AsLogger(), out info);`
	`861`	`+ info.ID = functionId.ToString();`
	`862`	`+ return InitializeCustomNode(info, null, out workspace);`
	`863`	`+ }`
	`864`	`+ else if (DynamoUtilities.PathHelper.isValidXML(path, out xmlDoc, out ex))`
`858`	`865`	`{`
`859`	`866`	`if (WorkspaceInfo.FromXmlDocument(xmlDoc, path, isTestMode, false, AsLogger(), out info))`
`860`	`867`	`{`
`@@ -865,13 +872,6 @@ private bool InitializeCustomNode(`
`865`	`872`	`}`
`866`	`873`	`}`
`867`	`874`	`}`
`868`		`- else if (DynamoUtilities.PathHelper.isValidJson(path, out strInput, out ex))`
`869`		`- {`
`870`		`- // TODO: Skip Json migration for now`
`871`		`- WorkspaceInfo.FromJsonDocument(strInput, path, isTestMode, false, AsLogger(), out info);`
`872`		`- info.ID = functionId.ToString();`
`873`		`- return InitializeCustomNode(info, null, out workspace);`
`874`		`- }`
`875`	`875`	`else throw ex;`
`876`	`876`	`Log(string.Format(Properties.Resources.CustomNodeCouldNotBeInitialized, customNodeInfo.Name));`
`877`	`877`	`workspace = null;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Xml;`
`3`	`3`	`using Dynamo.Graph.Workspaces;`
`4`	`4`	`using Dynamo.Logging;`
`@@ -73,13 +73,13 @@ internal static MdFileInfo FromCustomNode(string path)`
`73`	`73`	`WorkspaceInfo header = null;`
`74`	`74`	`ILogger log = new DummyConsoleLogger();`
`75`	`75`
`76`		`- if (DynamoUtilities.PathHelper.isValidXML(path, out XmlDocument xmlDoc, out Exception ex))`
	`76`	`+ if (DynamoUtilities.PathHelper.isValidJson(path, out string jsonDoc, out Exception ex))`
`77`	`77`	`{`
`78`		`- WorkspaceInfo.FromXmlDocument(xmlDoc, path, true, false, log, out header);`
	`78`	`+ WorkspaceInfo.FromJsonDocument(jsonDoc, path, true, false, log, out header);`
`79`	`79`	`}`
`80`		`- else if (DynamoUtilities.PathHelper.isValidJson(path, out string jsonDoc, out ex))`
	`80`	`+ else if (DynamoUtilities.PathHelper.isValidXML(path, out XmlDocument xmlDoc, out ex))`
`81`	`81`	`{`
`82`		`- WorkspaceInfo.FromJsonDocument(jsonDoc, path, true, false, log, out header);`
	`82`	`+ WorkspaceInfo.FromXmlDocument(xmlDoc, path, true, false, log, out header);`
`83`	`83`	`}`
`84`	`84`	`else throw ex;`
`85`	`85`