Fix ToString method in extensions

Blusutils · Dec 2, 2022 · 63f70dd · 63f70dd
1 parent 4506046
commit 63f70dd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,3 +71,4 @@ DESCEnd/
 /DES-Core/outs-win
 /DES-Core/outs-linux
 DES-Core/DESrv.Config/obj/
+/DES-Core/DESrv.PDK/obj/Debug/net6.0
diff --git a/DES-Core/DESrv.Core/DESrv.Core.csproj.user b/DES-Core/DESrv.Core/DESrv.Core.csproj.user
@@ -5,6 +5,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <ActiveDebugProfile>DESCore</ActiveDebugProfile>
-    <_LastSelectedProfileId>C:\Users\EgorBron\projects\DES\DES-Core\DESrv.Core\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>C:\Users\EgorBron\projects\DES\DES-Core\DESrv.Core\Properties\PublishProfiles\PublishBuildWindows.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>
diff --git a/DES-Core/DESrv.PDK/AbstractPDKExtension.cs b/DES-Core/DESrv.PDK/AbstractPDKExtension.cs
@@ -9,39 +9,39 @@ public class ExtensionMetadata {
         /// <summary>
         /// ID of extension. It mustn't contain spaces and special symbols (for example dots)
         /// </summary>
-        public string ID { get; internal set; } = "";
+        public string ID { get; set; } = "";
         /// <summary>
         /// Type of extension: 1 - plugin, 2 - addon
         /// </summary>
-        public int ExtType { get; internal set; } = 0;
+        public int ExtType { get; set; } = 0;
         /// <summary>
         /// Readable name of extension
         /// </summary>
-        public string Name { get; internal set; } = "";
+        public string Name { get; set; } = "";
         /// <summary>
         /// Description for extension
         /// </summary>
-        public string Description { get; internal set; } = "";
+        public string Description { get; set; } = "";
         /// <summary>
         /// Version of extension
         /// </summary>
-        public string Version { get; internal set; } = "-0.0.0";
+        public string Version { get; set; } = "-0.0.0";
         /// <summary>
         /// Version of DESrv what this extension supports
         /// </summary>
-        public string DESVersion { get; internal set; } = "-0.0.0";
+        public string DESVersion { get; set; } = "-0.0.0";
         /// <summary>
         /// Author of extension
         /// </summary>
-        public string Author { get; internal set; } = "";
+        public string Author { get; set; } = "";
         /// <summary>
         /// Array of dependencies for extension
         /// </summary>
-        public string[] Dependencies { get; internal set; } = Array.Empty<string>();
+        public string[] Dependencies { get; set; } = Array.Empty<string>();
         /// <summary>
         /// ID of extension to which this extension refers (for addons)
         /// </summary>
-        public string Reference { get; internal set; } = "";
+        public string Reference { get; set; } = "";
     }
     /// <summary>
     /// An abstract class that provides an interface to implement the information and functionality of an extension
@@ -71,8 +71,13 @@ public abstract class AbstractPDKExtension : AbstractFPReaderInClass {
         public virtual void Unload() { }
 
         public sealed override string ToString() {
-            var extype = (int)GetFieldValue("ExtType");
-            var whatisthis = extype == 1 || extype == 2 ? (extype == 1 ? "plugin" : "addon") : "unknown";
+            var metadata = GetPropertyValue("Metadata") as ExtensionMetadata;
+            var whatisthis = metadata.ExtType switch {
+                1 => "plugin",
+                2 => "addon",
+                3 => "random",
+                _ => "unknown",
+            };
             return $"Extension {{type={whatisthis} id={GetFieldValue("ID") as string} version={GetFieldValue("Version")}}}";
         }