Merge pull request #42 from Biztactix-Ryan/main

Update to include the new JSON Structure with Explicit and TrustLevel and improving the test applications

Author: basicx-StrgV

src/WGet.NET/Data/WinGetSource.cs

@@ -3,8 +3,9 @@
 // https://github.com/basicx-StrgV/                 //
 //--------------------------------------------------//
 using System;
-using WGetNET.Models;
+using System.Collections.Generic;
 using WGetNET.Helper;
+using WGetNET.Models;
 
 namespace WGetNET
 {
@@ -82,6 +83,29 @@ public string Identifier
             }
         }
 
+        /// <summary>
+        /// Gets whether the source was explicitly added.
+        /// </summary>
+        public bool Explicit
+        {
+            get
+            {
+                return _explicit;
+            }
+        }
+
+        /// <summary>
+        /// Gets the trust level of the source.
+        /// </summary>
+        public List<string> TrustLevel
+        {
+            get
+            {
+                return _trustLevel;
+            }
+        }
+
+
         /// <inheritdoc/>
         public bool IsEmpty
         {
@@ -105,6 +129,8 @@ public bool IsEmpty
         private readonly string _type;
         private readonly string _data;
         private readonly string _identifier;
+        private readonly bool _explicit;
+        private readonly List<string> _trustLevel;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WGetNET.WinGetSource"/> class.
@@ -115,13 +141,25 @@ public bool IsEmpty
         /// <param name="type">Type identifier of the source.</param>
         /// <param name="data">Data of the source source. This field is only used by some sources.</param>
         /// <param name="identifier">The identifier of the package</param>
-        internal WinGetSource(string name, string arg, Uri? uri, string type, string identifier, string? data = null)
+        /// <param name="explicitSource">Indicates if the source was explicitly added.</param>
+        /// <param name="trustLevel">Trust level of the source.</param>
+        internal WinGetSource(string name, string arg, Uri? uri, string type, string identifier, bool explicitSource = false, List<string>? trustLevel = null, string? data = null)
         {
             _name = name;
             _arg = arg;
             _uri = uri;
             _type = type;
             _identifier = identifier;
+            _explicit = explicitSource;
+
+            if (trustLevel != null)
+            {
+                _trustLevel = trustLevel;
+            }
+            else
+            {
+                _trustLevel = new List<string>();
+            }
 
             if (data != null)
             {
@@ -188,7 +226,7 @@ public static WinGetSource Create(string name, string identifier, string arg, st
 
             Uri.TryCreate(arg, UriKind.Absolute, out Uri? uri);
 
-            return new WinGetSource(name, arg, uri, type, identifier, data);
+            return new WinGetSource(name, arg, uri, type, identifier, data: data);
         }
 
         /// <summary>
@@ -202,7 +240,7 @@ internal static WinGetSource FromSourceModel(SourceModel model)
         {
             Uri.TryCreate(model.Arg, UriKind.Absolute, out Uri? uri);
 
-            return new WinGetSource(model.Name, model.Arg, uri, model.Type, model.Identifier, model.Data);
+            return new WinGetSource(model.Name, model.Arg, uri, model.Type, model.Identifier, model.Explicit, model.TrustLevel, model.Data);
         }
 
         /// <inheritdoc/>
@@ -214,6 +252,8 @@ public object Clone()
                     _uri,
                     _type,
                     _identifier,
+                    _explicit,
+                    _trustLevel,
                     _data
                 );
         }

src/WGet.NET/Models/SourceModel.cs

@@ -2,10 +2,12 @@
 // Created by basicx-StrgV                          //
 // https://github.com/basicx-StrgV/                 //
 //--------------------------------------------------//
+using System.Collections.Generic;
+
 namespace WGetNET.Models
 {
     /// <summary>
-    /// Represents a winget source for json parsing.
+    /// Represents a winget source for JSON parsing.
     /// </summary>
     internal class SourceModel
     {
@@ -54,7 +56,7 @@ public string Arg
         }
 
         /// <summary>
-        /// Gets sets the type of the source.
+        /// Gets or sets the type of the source.
         /// </summary>
         public string Type
         {
@@ -119,18 +121,46 @@ public string Identifier
             }
         }
 
+        /// <summary>
+        /// Gets or sets whether the source was explicitly added.
+        /// </summary>
+        public bool Explicit { get; set; }
+
+        /// <summary>
+        /// Gets or sets the trust level of the source.
+        /// </summary>
+        public List<string> TrustLevel
+        {
+            get
+            {
+                return _trustLevel;
+            }
+            set
+            {
+                if (value != null)
+                {
+                    _trustLevel = value;
+                }
+                else
+                {
+                    _trustLevel = new List<string>();
+                }
+            }
+        }
+
         private string _name = string.Empty;
         private string _arg = string.Empty;
         private string _type = string.Empty;
         private string _data = string.Empty;
         private string _identifier = string.Empty;
+        private List<string> _trustLevel = new List<string>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WGetNET.Models.SourceModel"/> class.
         /// </summary>
         internal SourceModel()
         {
-            // Empty constructor for json parsing.
+            // Empty constructor for JSON parsing.
         }
 
         /// <summary>
@@ -148,7 +178,9 @@ public static SourceModel FromWinGetSource(WinGetSource source)
                 Arg = source.Arg,
                 Type = source.Type,
                 Data = source.Data,
-                Identifier = source.Identifier
+                Identifier = source.Identifier,
+                Explicit = source.Explicit,
+                TrustLevel = source.TrustLevel
             };
         }
     }