Merge pull request #259 from aspriddell/update-data-api

Update data api
dragonfruitnetwork · Sep 10, 2021 · be78083 · be78083
2 parents 1c03718 + 0bfcf56
commit be78083
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/DragonFruit.Six.Api/Dragon6Client.cs b/DragonFruit.Six.Api/Dragon6Client.cs
@@ -16,38 +16,18 @@
 
 namespace DragonFruit.Six.Api
 {
-    public abstract class Dragon6Client : ApiClient
+    public abstract class Dragon6Client : ApiClient<ApiJsonSerializer>
     {
         private readonly object _lock = new();
         public static readonly CultureInfo Culture = new("en-US", false);
 
-        #region Constructors
-
-        protected Dragon6Client(string userAgent)
-            : this()
-        {
-            UserAgent = userAgent;
-        }
-
-        protected Dragon6Client(string userAgent, UbisoftService app)
-            : this(userAgent)
+        protected Dragon6Client(string userAgent = null, UbisoftService app = UbisoftService.RainbowSix)
         {
             AppId = app.AppId();
+            UserAgent = userAgent ?? "Dragon6-API";
+            Serializer.Configure<ApiJsonSerializer>(o => o.Serializer.Culture = Culture);
         }
 
-        protected Dragon6Client()
-        {
-            Serializer = new ApiJsonSerializer(Culture);
-            AppId = UbisoftService.RainbowSix.AppId();
-
-            if (string.IsNullOrEmpty(UserAgent))
-            {
-                UserAgent = "Dragon6 API";
-            }
-        }
-
-        #endregion
-
         private TokenBase Token { get; set; }
 
         /// <summary>

diff --git a/DragonFruit.Six.Api/DragonFruit.Six.Api.csproj b/DragonFruit.Six.Api/DragonFruit.Six.Api.csproj
@@ -29,7 +29,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DragonFruit.Common.Data" Version="2021.828.42" />
+        <PackageReference Include="DragonFruit.Common.Data" Version="2021.910.47" />
     </ItemGroup>
 
 </Project>
diff --git a/DragonFruit.Six.Api/Utils/OperatorData.cs b/DragonFruit.Six.Api/Utils/OperatorData.cs
@@ -14,8 +14,6 @@ public static class OperatorData
         /// <summary>
         /// Loads the operator info datasheet from a local file
         /// </summary>
-        /// <param name="location"></param>
-        /// <returns></returns>
         public static IEnumerable<OperatorStats> FromFile(string location)
         {
             return FileServices.ReadFile<IEnumerable<OperatorStats>>(location);