From 238bd9cc60aa4989671ba503f669ee5c50f9e975 Mon Sep 17 00:00:00 2001 From: pcjones Date: Wed, 4 Sep 2024 19:30:31 +0200 Subject: [PATCH] Code cleanup --- UmlautAdaptarr/Program.cs | 5 +--- UmlautAdaptarr/Services/HttpProxyService.cs | 8 ++--- .../Services/TitleMatchingService.cs | 6 ++-- UmlautAdaptarr/UmlautAdaptarr.csproj | 6 ++-- UmlautAdaptarr/Utilities/Helper.cs | 30 ------------------- build_linux.bat | 4 +++ 6 files changed, 15 insertions(+), 44 deletions(-) create mode 100644 build_linux.bat diff --git a/UmlautAdaptarr/Program.cs b/UmlautAdaptarr/Program.cs index 58c29b6..8123225 100644 --- a/UmlautAdaptarr/Program.cs +++ b/UmlautAdaptarr/Program.cs @@ -11,8 +11,6 @@ internal class Program { private static void Main(string[] args) { - - Helper.ShowLogo(); Helper.ShowInformation(); // TODO: @@ -26,11 +24,10 @@ internal class Program .WriteTo.Console(outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}") .Filter.ByExcluding(Matching.FromSource("System.Net.Http.HttpClient")) .Filter.ByExcluding(Matching.FromSource("Microsoft.Extensions.Http.DefaultHttpClientFactory")) - //.Enrich.With(new ApiKeyMaskingEnricher("appsettings.json")) // Not Work currently + //.Enrich.With(new ApiKeyMaskingEnricher("appsettings.json")) // TODO - Not working currently .CreateLogger(); - builder.Services.AddSerilog(); // Add services to the container. diff --git a/UmlautAdaptarr/Services/HttpProxyService.cs b/UmlautAdaptarr/Services/HttpProxyService.cs index 074a58a..0444883 100644 --- a/UmlautAdaptarr/Services/HttpProxyService.cs +++ b/UmlautAdaptarr/Services/HttpProxyService.cs @@ -10,7 +10,7 @@ namespace UmlautAdaptarr.Services private readonly ILogger _logger; private readonly int _proxyPort = 5006; // TODO move to appsettings.json private readonly IHttpClientFactory _clientFactory; - private HashSet _knownHosts = []; + private readonly HashSet _knownHosts = []; private readonly object _hostsLock = new object(); @@ -34,7 +34,7 @@ namespace UmlautAdaptarr.Services { using var clientStream = new NetworkStream(clientSocket, ownsSocket: true); var buffer = new byte[8192]; - var bytesRead = await clientStream.ReadAsync(buffer, 0, buffer.Length); + var bytesRead = await clientStream.ReadAsync(buffer); var requestString = Encoding.ASCII.GetString(buffer, 0, bytesRead); if (requestString.StartsWith("CONNECT")) @@ -129,8 +129,8 @@ namespace UmlautAdaptarr.Services var colonIndex = line.IndexOf(':'); if (colonIndex > 0) { - var key = line.Substring(0, colonIndex).Trim(); - var value = line.Substring(colonIndex + 1).Trim(); + var key = line[..colonIndex].Trim(); + var value = line[(colonIndex + 1)..].Trim(); headers[key] = value; } } diff --git a/UmlautAdaptarr/Services/TitleMatchingService.cs b/UmlautAdaptarr/Services/TitleMatchingService.cs index bd43337..60f4d21 100644 --- a/UmlautAdaptarr/Services/TitleMatchingService.cs +++ b/UmlautAdaptarr/Services/TitleMatchingService.cs @@ -225,9 +225,9 @@ namespace UmlautAdaptarr.Services } } - private static string[] MissingGermanTagReleaseGroups = ["tvr"]; - private static string[] HEVCInsteadOfx265TagReleaseGroups = ["eisbaer"]; - private static string[] WrongTagsReleaseGroups = ["eisbaer"]; + private static readonly string[] MissingGermanTagReleaseGroups = ["tvr"]; + private static readonly string[] HEVCInsteadOfx265TagReleaseGroups = ["eisbaer"]; + private static readonly string[] WrongTagsReleaseGroups = ["eisbaer"]; private static string FixBadReleaseNaming(string title, string seperator, ILogger logger) { var releaseGroup = GetReleaseGroup(title); diff --git a/UmlautAdaptarr/UmlautAdaptarr.csproj b/UmlautAdaptarr/UmlautAdaptarr.csproj index b03a7e2..1969466 100644 --- a/UmlautAdaptarr/UmlautAdaptarr.csproj +++ b/UmlautAdaptarr/UmlautAdaptarr.csproj @@ -9,13 +9,13 @@ - + - - + + diff --git a/UmlautAdaptarr/Utilities/Helper.cs b/UmlautAdaptarr/Utilities/Helper.cs index 9a796bd..ebd867a 100644 --- a/UmlautAdaptarr/Utilities/Helper.cs +++ b/UmlautAdaptarr/Utilities/Helper.cs @@ -56,33 +56,3 @@ public static class Helper } } } - -public class IpInfo -{ - [JsonPropertyName("ip")] - public string Ip { get; set; } - - [JsonPropertyName("hostname")] - public string Hostname { get; set; } - - [JsonPropertyName("city")] - public string City { get; set; } - - [JsonPropertyName("region")] - public string Region { get; set; } - - [JsonPropertyName("country")] - public string Country { get; set; } - - [JsonPropertyName("loc")] - public string Loc { get; set; } - - [JsonPropertyName("org")] - public string Org { get; set; } - - [JsonPropertyName("postal")] - public string Postal { get; set; } - - [JsonPropertyName("timezone")] - public string Timezone { get; set; } -} \ No newline at end of file diff --git a/build_linux.bat b/build_linux.bat new file mode 100644 index 0000000..7b6e41c --- /dev/null +++ b/build_linux.bat @@ -0,0 +1,4 @@ +@echo off +dotnet publish -c Release -r linux-x64 --self-contained +'dotnet publish -c Release -r linux-x64 --self-contained -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true +pause \ No newline at end of file