glax/CShock
1
0
Fork 0
Code Releases Wiki Activity

V1.1

Browse Source 
less abstract stuff.
This commit is contained in:
glax 2024-01-17 17:59:10 +01:00
parent f89daca90d
commit 7f4232ef54
12 changed files with 47 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CShocker/CShocker.csproj
View File

@ -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>

12
CShocker/Shockers/Abstract/HTTPShocker.cs
View File

@ -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)
{
}
}

17
CShocker/Shockers/Abstract/HttpShocker.cs Normal file
View File

@ -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;
}
}

5
CShocker/Shockers/Abstract/SerialShocker.cs
View File

@ -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();
}
}

21
CShocker/Shockers/Abstract/Shocker.cs
View File

@ -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 d = duration ?? ShockerSettings.Duration.GetRandomRangeValue();
int i = intensity ?? IntensityRange.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;
}
}

12
CShocker/Shockers/OpenShockHttp.cs
View File

@ -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);
HttpResponseMessage response = ((HttpShockerSettings)ShockerSettings).HttpClient.Send(request);
request.Headers.Add("OpenShockToken", ApiKey);
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)
{
}
}

6
CShocker/Shockers/OpenShockSerial.cs
View File

@ -1,12 +1,12 @@
using CShocker.Shockers.Abstract;
using CShocker.Shockers.ShockerSettings;
using CShocker.Ranges;
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();
}

6
CShocker/Shockers/PiShockHttp.cs
View File

@ -1,12 +1,12 @@
using CShocker.Shockers.Abstract;
using CShocker.Shockers.ShockerSettings;
using CShocker.Ranges;
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();
}

6
CShocker/Shockers/PiShockSerial.cs
View File

@ -1,12 +1,12 @@
using CShocker.Shockers.Abstract;
using CShocker.Shockers.ShockerSettings;
using CShocker.Ranges;
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();
}

10
CShocker/Shockers/ShockerSettings/Abstract/AShockerSettings.cs
View File

@ -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;
}

10
CShocker/Shockers/ShockerSettings/HttpShockerSettings.cs
View File

@ -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;
}

9
CShocker/Shockers/ShockerSettings/SerialShockerSettings.cs
View File

@ -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)
{
}