Fix enumerable save

bigbang1112-cz · Jul 12, 2023 · 8eafa53 · 8eafa53
1 parent 2e27112
commit 8eafa53
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Src/GbxToolAPI.CLI/GbxToolAPI.CLI.csproj b/Src/GbxToolAPI.CLI/GbxToolAPI.CLI.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>1.0.7</Version>
+		<Version>1.0.8</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
 

diff --git a/Src/GbxToolAPI.CLI/OutputSaver.cs b/Src/GbxToolAPI.CLI/OutputSaver.cs
@@ -20,17 +20,15 @@ public void Save()
     {
         var outputType = output.GetType();
 
-        if (outputType.IsGenericType)
+        if (output is System.Collections.IEnumerable enumerable)
         {
-            if (output is System.Collections.IEnumerable enumerable)
-            {
-                SaveMultiple(enumerable);
-            }
-            else
-            {
-                SaveGeneric();
-            }
+            SaveMultiple(enumerable);
+            return;
+        }
 
+        if (outputType.IsGenericType)
+        {
+            SaveGeneric();
             return;
         }
 

diff --git a/Src/GbxToolAPI.CLI/ToolConsole.cs b/Src/GbxToolAPI.CLI/ToolConsole.cs
@@ -753,10 +753,16 @@ private static string GetTypeName(Type type)
         }
         else
         {
-            if (type.GetGenericTypeDefinition() == typeof(NodeFile<>))
+            var genericType = type.GetGenericTypeDefinition();
+
+            if (genericType == typeof(NodeFile<>))
             {
                 return type.GetGenericArguments()[0].Name;
             }
+            else if (genericType == typeof(IEnumerable<>))
+            {
+                return "multiple";
+            }
         }
 
         return "[unknown]";