Updated for Models.json

Jones-HM · Mar 19, 2023 · 8f7cb34 · 8f7cb34
1 parent e7601e6
commit 8f7cb34
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 20 deletions.
diff --git a/QVMEditor/QUtils.cs b/QVMEditor/QUtils.cs
@@ -8,6 +8,7 @@
 using FileSystem = Microsoft.VisualBasic.FileIO.FileSystem;
 using System.Collections.Generic;
 using System.Drawing;
+using Newtonsoft.Json;
 
 namespace QVM_Editor
 {
@@ -118,8 +119,7 @@ internal static bool InitEditorAppData()
             appdataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             qvmEditorQEdPath = appdataPath + Path.DirectorySeparatorChar + qEditor;
             qCompilerPath = qvmEditorQEdPath + @"\QCompiler";
-            objectsModelsFile = qvmEditorQEdPath + Path.DirectorySeparatorChar + "IGIModels.txt";
-            masterobjList = LoadFile(QUtils.objectsModelsFile);
+            objectsModelsFile = qvmEditorQEdPath + Path.DirectorySeparatorChar + "IGIModels.json";
             tempPathFile = qvmEditorQEdPath + "\\" + tempPathFileName;
 
             if (!Directory.Exists(qvmEditorQEdPath)) { initErrReason = "QEditor"; initStatus = false; }
@@ -274,6 +274,24 @@ internal static DialogResult ShowInputDialog(ref string input)
             return result;
         }
 
+
+        // Read models from JSON file
+        internal static dynamic ReadModels()
+        {
+            try
+            {
+                string jsonModels = LoadFile(QUtils.objectsModelsFile);
+                dynamic jsonModelsData = JsonConvert.DeserializeObject(jsonModels);
+                return jsonModelsData;
+            }
+            catch (Exception ex)
+            {
+                LogException(MethodBase.GetCurrentMethod().Name, ex);
+                return null;
+            }
+        }
+
+        // Find model name from ID
         internal static string FindModelName(string modelId, bool addLogs = false)
         {
             string modelName = "UNKNOWN_OBJECT";
@@ -282,37 +300,35 @@ internal static string FindModelName(string modelId, bool addLogs = false)
                 if (modelId.Contains("\""))
                     modelId = modelId.Replace("\"", String.Empty);
 
-                if (File.Exists(QUtils.objectsModelsFile))
-                {
-                    if (String.IsNullOrEmpty(masterobjList)) return String.Empty;
-
-                    var objList = masterobjList.Split('\n');
+                dynamic jsonModelsData = ReadModels();
 
-                    foreach (var obj in objList)
+                // Loop through the data to find the matching model ID
+                foreach (var data in jsonModelsData)
+                {
+                    if (data.ModelId.ToString().Equals(modelId))
                     {
-                        if (obj.Contains(modelId))
+                        modelName = data.ModelName.ToString();
+                        if (modelName.Length < 3 || String.IsNullOrEmpty(modelName))
                         {
-                            modelName = obj.Split('=')[0];
-                            if (modelName.Length < 3 || String.IsNullOrEmpty(modelName))
-                            {
-                                if (addLogs)
-                                    QUtils.AddLog(MethodBase.GetCurrentMethod().Name, "couldn't find model name for Model id : " + modelId);
-                                return modelName;
-                            }
+                            if (addLogs)
+                                QUtils.AddLog(MethodBase.GetCurrentMethod().Name, "couldn't find model name for Model id : " + modelId);
+                            return modelName;
                         }
                     }
-
-                    if (modelName.Length > 3 && !String.IsNullOrEmpty(modelName) && addLogs)
-                        QUtils.AddLog(MethodBase.GetCurrentMethod().Name, "Found model name '" + modelName + "' for id : " + modelId);
                 }
+
+                if (modelName.Length > 3 && !String.IsNullOrEmpty(modelName) && addLogs)
+                    QUtils.AddLog(MethodBase.GetCurrentMethod().Name, "Found model name '" + modelName + "' for id : " + modelId);
             }
             catch (Exception ex)
             {
                 QUtils.LogException(MethodBase.GetCurrentMethod().Name, ex);
             }
-            return modelName.Trim();
+
+            return modelName;
         }
 
+
         //Execute shell command and get std-output.
         internal static string ShellExec(string cmdArgs, bool runAsAdmin = false, bool waitForExit = true, string shell = "cmd.exe")
         {

diff --git a/QVMEditor/QVMEditor.csproj b/QVMEditor/QVMEditor.csproj
@@ -36,6 +36,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
     </Reference>

diff --git a/QVMEditor/packages.config b/QVMEditor/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
 </packages>