diff --git a/EpsonPrintService/ConfigurationPaths.cs b/EpsonPrintService/ConfigurationPaths.cs index 4a6d0db..2243a8d 100644 --- a/EpsonPrintService/ConfigurationPaths.cs +++ b/EpsonPrintService/ConfigurationPaths.cs @@ -5,7 +5,7 @@ namespace EpsonPrintService; public static class ConfigurationPaths { private const string LinuxConfigDir = "/root/epsonprintservice"; - private const string LocalConfigFileName = "config.json"; + private const string LocalConfigFileName = "config.txt"; public static string GetConfigPath() { diff --git a/EpsonPrintService/EpsonPrintService.csproj b/EpsonPrintService/EpsonPrintService.csproj index ebd7252..dd293cf 100644 --- a/EpsonPrintService/EpsonPrintService.csproj +++ b/EpsonPrintService/EpsonPrintService.csproj @@ -5,7 +5,7 @@ net8.0 enable enable - 1.0.6 + 1.0.7 @@ -25,6 +25,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/EpsonPrintService/Program.cs b/EpsonPrintService/Program.cs index c52c8b3..023d458 100644 --- a/EpsonPrintService/Program.cs +++ b/EpsonPrintService/Program.cs @@ -2,8 +2,6 @@ using Microsoft.AspNetCore.SignalR.Client; using Microsoft.Extensions.Logging; using Ninject; -using System.Text.Json; -using System.Text.Json.Serialization; using System.Threading.Channels; using Inspectron.Epson.PrintServer; using Inspectron.Epson.PrintServer.ConfigurationSources; @@ -19,8 +17,22 @@ StandardKernel kernel = new StandardKernel(); var configPath = ConfigurationPaths.GetConfigPath(); Console.WriteLine($"Loading configuration from: {configPath}"); -var config = JsonSerializer.Deserialize( - File.ReadAllText(configPath)); + +var base64Line = File.ReadAllText(configPath).Trim(); +var decodedConfig = System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(base64Line)); +var configParts = decodedConfig.Split(';'); +if (configParts.Length != 3) + throw new InvalidOperationException($"Invalid configuration format. Expected 'apiUrl;restaurantId;apiKey', got {configParts.Length} parts."); + +var config = new EpsonPrintServiceConfiguration +{ + ApiUrl = configParts[0], + RestaurantId = configParts[1], + ApiKey = configParts[2] +}; + +Console.WriteLine($"Restaurant: {config.RestaurantId}"); +Console.WriteLine($"API URL: {config.ApiUrl}"); kernel.Bind().To().InSingletonScope(); kernel.Bind().ToConstant(new HttpClient { Timeout = TimeSpan.FromSeconds(30) }).InSingletonScope(); diff --git a/EpsonPrintService/config.txt b/EpsonPrintService/config.txt new file mode 100644 index 0000000..751958f --- /dev/null +++ b/EpsonPrintService/config.txt @@ -0,0 +1 @@ +aHR0cDovL2xvY2FsaG9zdDo1MDAyOzY1YzM2MDYyZDM2ZTRjZmVlNmVjZjIyODtvWTVpcjViQi9pMXlSeFdpQ2FRTE1QdkFsS0dBaVVjNy8yK0IyczhXcUJzPQ== \ No newline at end of file diff --git a/Inspectron.Epson/PrintServer/PrintLoop.cs b/Inspectron.Epson/PrintServer/PrintLoop.cs index 483a7ed..38f7f05 100644 --- a/Inspectron.Epson/PrintServer/PrintLoop.cs +++ b/Inspectron.Epson/PrintServer/PrintLoop.cs @@ -8,17 +8,17 @@ public class PrintLoop private readonly global::PrintServer _printServer; private readonly IPrintService _printService; private readonly IPrintJobSource _jobSource; - private readonly IAssignedPrinterRepository _assignedPrinterRepository; + private readonly ILogger _logger; private CancellationTokenSource? _cancellationSource; private CancellationToken _cancellationToken; - public PrintLoop(global::PrintServer printServer,IPrintService printService, IPrintJobSource jobSource, IAssignedPrinterRepository assignedPrinterRepository, ILogger logger) + public PrintLoop(global::PrintServer printServer,IPrintService printService, IPrintJobSource jobSource, ILogger logger) { _printServer = printServer; _printService = printService; _jobSource = jobSource; - _assignedPrinterRepository = assignedPrinterRepository; + _logger = logger; }