V1.1

less abstract stuff.

CShocker/CShocker.csproj

@@ -7,7 +7,7 @@
         <Authors>Glax</Authors>
         <RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>1.0.5</Version>
+        <Version>1.1</Version>
     </PropertyGroup>
 
     <ItemGroup>

CShocker/Shockers/Abstract/HTTPShocker.cs

@@ -1,12 +0,0 @@
-using CShocker.Shockers.ShockerSettings;
-using Microsoft.Extensions.Logging;
-
-namespace CShocker.Shockers.Abstract;
-
-public abstract class HttpShocker : Shocker
-{
-    public HttpShocker(HttpShockerSettings settings, ILogger? logger = null) : base(settings, logger)
-    {
-        
-    }
-}

CShocker/Shockers/Abstract/HttpShocker.cs

@@ -0,0 +1,17 @@
+using CShocker.Ranges;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Shockers.Abstract;
+
+public abstract class HttpShocker : Shocker
+{
+    protected readonly HttpClient HttpClient = new();
+    protected string Endpoint { get; init; }
+    protected string ApiKey { get; init; }
+
+    protected HttpShocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string endpoint, string apiKey, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, logger)
+    {
+        Endpoint = endpoint;
+        ApiKey = apiKey;
+    }
+}

CShocker/Shockers/Abstract/SerialShocker.cs

@@ -1,12 +1,11 @@
-using CShocker.Shockers.ShockerSettings;
+using CShocker.Ranges;
 using Microsoft.Extensions.Logging;
 
 namespace CShocker.Shockers.Abstract;
 
 public abstract class SerialShocker : Shocker
 {
-    protected SerialShocker(SerialShockerSettings shockerSettings, ILogger? logger = null) : base(shockerSettings, logger)
+    protected SerialShocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, logger)
     {
-        throw new NotImplementedException();
     }
 }

CShocker/Shockers/Abstract/Shocker.cs

@@ -1,23 +1,24 @@
-using CShocker.Shockers.ShockerSettings.Abstract;
+using CShocker.Ranges;
 using Microsoft.Extensions.Logging;
 
-namespace CShocker.Shockers.Abstract
+namespace CShocker.Shockers.Abstract;
-;
 
 public abstract class Shocker
 {
-    protected readonly AShockerSettings ShockerSettings;
+    protected readonly List<string> ShockerIds;
+    protected readonly IntensityRange IntensityRange;
+    protected readonly DurationRange DurationRange;
     protected readonly ILogger? Logger;
     
     public void Control(ControlAction action, string? shockerId = null, int? intensity = null, int? duration = null)
     {
-        int i = intensity ?? ShockerSettings.Intensity.GetRandomRangeValue();
+        int i = intensity ?? IntensityRange.GetRandomRangeValue();
-        int d = duration ?? ShockerSettings.Duration.GetRandomRangeValue();
+        int d = duration ?? DurationRange.GetRandomRangeValue();
         this.Logger?.Log(LogLevel.Information, $"{action} {(intensity is not null ? $"Overwrite {i}" : $"{i}")} {(duration is not null ? $"Overwrite {d}" : $"{d}")}");
         if (action is ControlAction.Nothing)
             return;
         if(shockerId is null)
-            foreach (string shocker in ShockerSettings.ShockerIds)
+            foreach (string shocker in ShockerIds)
                 ControlInternal(action, shocker, i, d);
         else
             ControlInternal(action, shockerId, i, d);
@@ -25,9 +26,11 @@ public abstract class Shocker
     
     protected abstract void ControlInternal(ControlAction action, string shockerId, int intensity, int duration);
 
-    protected Shocker(AShockerSettings shockerSettings, ILogger? logger = null)
+    protected Shocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, ILogger? logger = null)
     {
-        this.ShockerSettings = shockerSettings;
+        this.ShockerIds = shockerIds;
+        this.IntensityRange = intensityRange;
+        this.DurationRange = durationRange;
         this.Logger = logger;
     }
 }

CShocker/Shockers/OpenShockHttp.cs

@@ -1,16 +1,17 @@
 using System.Net.Http.Headers;
 using System.Text;
+using CShocker.Ranges;
 using CShocker.Shockers.Abstract;
-using CShocker.Shockers.ShockerSettings;
 using Microsoft.Extensions.Logging;
 
 namespace CShocker.Shockers;
 
 public class OpenShockHttp : HttpShocker
 {
+    
     protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
     {
-        HttpRequestMessage request = new (HttpMethod.Post, $"{((HttpShockerSettings)ShockerSettings).Endpoint}/1/shockers/control")
+        HttpRequestMessage request = new (HttpMethod.Post, $"{Endpoint}/1/shockers/control")
         {
             Headers =
             {
@@ -24,8 +25,8 @@ public class OpenShockHttp : HttpShocker
                                         $"\"duration\": {duration}"+
                                         "}]", Encoding.UTF8, new MediaTypeHeaderValue("application/json"))
         };
-        request.Headers.Add("OpenShockToken", ((HttpShockerSettings)ShockerSettings).ApiKey);
+        request.Headers.Add("OpenShockToken", ApiKey);
-        HttpResponseMessage response = ((HttpShockerSettings)ShockerSettings).HttpClient.Send(request);
+        HttpResponseMessage response = (HttpClient.Send(request));
         this.Logger?.Log(LogLevel.Debug, $"{request.RequestUri} response: {response.StatusCode}");
     }
 
@@ -40,8 +41,7 @@ public class OpenShockHttp : HttpShocker
         };
     }
 
-    internal OpenShockHttp(HttpShockerSettings settings, ILogger? logger = null) : base(settings, logger)
+    public OpenShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string endpoint, string apiKey, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, endpoint, apiKey, logger)
     {
-        
     }
 }

CShocker/Shockers/OpenShockSerial.cs

@@ -1,12 +1,12 @@
-using CShocker.Shockers.Abstract;
+using CShocker.Ranges;
-using CShocker.Shockers.ShockerSettings;
+using CShocker.Shockers.Abstract;
 using Microsoft.Extensions.Logging;
 
 namespace CShocker.Shockers;
 
 public class OpenShockSerial : SerialShocker
 {
-    public OpenShockSerial(SerialShockerSettings shockerSettings, ILogger? logger = null) : base(shockerSettings, logger)
+    public OpenShockSerial(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, logger)
     {
         throw new NotImplementedException();
     }

CShocker/Shockers/PiShockHttp.cs

@@ -1,12 +1,12 @@
-using CShocker.Shockers.Abstract;
+using CShocker.Ranges;
-using CShocker.Shockers.ShockerSettings;
+using CShocker.Shockers.Abstract;
 using Microsoft.Extensions.Logging;
 
 namespace CShocker.Shockers;
 
 public class PiShockHttp : HttpShocker
 {
-    public PiShockHttp(HttpShockerSettings settings, ILogger? logger = null) : base(settings, logger)
+    public PiShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string endpoint, string apiKey, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, endpoint, apiKey, logger)
     {
         throw new NotImplementedException();
     }

CShocker/Shockers/PiShockSerial.cs

@@ -1,12 +1,12 @@
-using CShocker.Shockers.Abstract;
+using CShocker.Ranges;
-using CShocker.Shockers.ShockerSettings;
+using CShocker.Shockers.Abstract;
 using Microsoft.Extensions.Logging;
 
 namespace CShocker.Shockers;
 
 public class PiShockSerial : SerialShocker
 {
-    public PiShockSerial(SerialShockerSettings shockerSettings, ILogger? logger = null) : base(shockerSettings, logger)
+    public PiShockSerial(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, logger)
     {
         throw new NotImplementedException();
     }

CShocker/Shockers/ShockerSettings/Abstract/AShockerSettings.cs

@@ -1,10 +0,0 @@
-using CShocker.Ranges;
-
-namespace CShocker.Shockers.ShockerSettings.Abstract;
-
-public abstract record AShockerSettings(string[] ShockerIds, IntensityRange Intensity, DurationRange Duration)
-{
-    internal readonly string[] ShockerIds = ShockerIds;
-    internal readonly IntensityRange Intensity = Intensity;
-    internal readonly DurationRange Duration = Duration;
-}

CShocker/Shockers/ShockerSettings/HttpShockerSettings.cs

@@ -1,10 +0,0 @@
-using CShocker.Ranges;
-using CShocker.Shockers.ShockerSettings.Abstract;
-
-namespace CShocker.Shockers.ShockerSettings;
-
-public record HttpShockerSettings(string[] ShockerIds, IntensityRange Intensity, DurationRange Duration, string ApiKey, string Endpoint) : AShockerSettings(ShockerIds, Intensity, Duration)
-{
-    internal readonly HttpClient HttpClient = new ();
-    internal readonly string ApiKey = ApiKey, Endpoint = Endpoint;
-}

CShocker/Shockers/ShockerSettings/SerialShockerSettings.cs

@@ -1,9 +0,0 @@
-using CShocker.Ranges;
-using CShocker.Shockers.ShockerSettings.Abstract;
-
-namespace CShocker.Shockers.ShockerSettings;
-
-public record SerialShockerSettings(string[] ShockerIds, IntensityRange Intensity, DurationRange Duration) : AShockerSettings(ShockerIds, Intensity, Duration)
-{
-    
-}