Fix FBX-to-GR2 obtaining incorrect folder, fix FBX-to-GR2 throwing ex…

…ceptions when optional folders not found
num0005 · Aug 6, 2024 · ee05552 · ee05552
1 parent eb0f037
commit ee05552
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/Launcher/ToolkitInterface/HRToolkit.cs b/Launcher/ToolkitInterface/HRToolkit.cs
@@ -223,23 +223,30 @@ string getFilepath(string file)
 
             void ConvertAllInFolder(string folder)
             {
-                IEnumerable<string> files = Directory.EnumerateFiles(folder, "*.fbx");
+                try
+                {
+                    IEnumerable<string> files = Directory.EnumerateFiles(folder, "*.fbx");
 
-                foreach (var f in files)
+                    foreach (var f in files)
+                    {
+                        Task toolTask = GR2FromFBX(
+                            f,
+                            getFilepath(f) + ".json",
+                            getFilepath(f) + ".gr2",
+                            json_rebuild,
+                            show_output);
+                        dispatchedTasks.Add(toolTask);
+                    }
+                }
+                catch (DirectoryNotFoundException)
                 {
-                    Task toolTask = GR2FromFBX(
-                        f,
-                        getFilepath(f) + ".json",
-                        getFilepath(f) + ".gr2",
-                        json_rebuild,
-                        show_output);
-                    dispatchedTasks.Add(toolTask);
+                    Trace.WriteLine($"{folder} does not exist");
                 }
             }
 
             foreach (var folder in Directory.EnumerateDirectories(fbx_search_path))
             {
-                string folderName = Path.GetDirectoryName(folder);
+                string folderName = Path.GetFileName(folder);
 
                 string[] assetFolders = new[] { "animations", "collision", "markers", "physics", "render", "skeleton" };