extend configuration, change return value for datatime and time attributes

Author: danielklecha

Directory.Packages.props

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.13.0" />
-    <PackageVersion Include="SharpIppNext" Version="1.0.6" />
+    <PackageVersion Include="SharpIppNext" Version="1.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />

SharpIppNextServer/Models/PrinterOptions.cs

@@ -5,12 +5,12 @@ namespace SharpIppNextServer.Models;
 public class PrinterOptions
 {
     public string Name { get; set; } = "SharpIpp";
-    public Sides Sides { get; set; } = Sides.OneSided;
-    public PrintScaling PrintScaling { get; set; } = PrintScaling.Auto;
-    public string Media { get; set; } = "iso_a4_210x297mm";
-    public Resolution Resolution { get; set; } = new(600, 600, ResolutionUnit.DotsPerInch);
+    public Sides[] Sides { get; set; } = [SharpIpp.Protocol.Models.Sides.OneSided];
+    public PrintScaling[] PrintScaling { get; set; } = [SharpIpp.Protocol.Models.PrintScaling.Auto];
+    public string[] Media { get; set; } = ["iso_a4_210x297mm"];
+    public Resolution[] Resolution { get; set; } = [new(600, 600, ResolutionUnit.DotsPerInch)];
     public Finishings Finishings { get; set; } = Finishings.None;
-    public PrintQuality PrintQuality { get; set; } = PrintQuality.High;
+    public PrintQuality[] PrintQuality { get; set; } = [SharpIpp.Protocol.Models.PrintQuality.High];
     public int JobPriority { get; set; } = 1;
     public int Copies { get; set; } = 1;
     public Orientation Orientation { get; set; } = Orientation.Portrait;

SharpIppNextServer/Services/PrinterService.cs

@@ -334,24 +334,24 @@ private GetPrinterAttributesResponse GetGetPrinterAttributesResponse(GetPrinterA
             MultipleDocumentJobsSupported = !IsRequired(PrinterAttribute.MultipleDocumentJobsSupported) ? null : true,
             CompressionSupported = !IsRequired(PrinterAttribute.CompressionSupported) ? null : [Compression.None],
             PrinterLocation = !IsRequired(PrinterAttribute.PrinterLocation) ? null : "Internet",
-            PrintScalingDefault = !IsRequired(PrinterAttribute.PrintScalingDefault) ? null : options.PrintScaling,
-            PrintScalingSupported = !IsRequired(PrinterAttribute.PrintScalingSupported) ? null : [options.PrintScaling],
+            PrintScalingDefault = !IsRequired(PrinterAttribute.PrintScalingDefault) ? null : options.PrintScaling.FirstOrDefault(),
+            PrintScalingSupported = !IsRequired(PrinterAttribute.PrintScalingSupported) ? null : options.PrintScaling,
             PrinterUriSupported = !IsRequired(PrinterAttribute.PrinterUriSupported) ? null : [GetPrinterUrl()],
             UriAuthenticationSupported = !IsRequired(PrinterAttribute.UriAuthenticationSupported) ? null : [UriAuthentication.None],
             UriSecuritySupported = !IsRequired(PrinterAttribute.UriSecuritySupported) ? null : [GetUriSecuritySupported()],
             PrinterUpTime = !IsRequired(PrinterAttribute.PrinterUpTime) ? null : (int)(dateTimeOffsetProvider.UtcNow - _startTime).TotalSeconds,
-            MediaDefault = !IsRequired(PrinterAttribute.MediaDefault) ? null : options.Media,
-            MediaColDefault = !IsRequired(PrinterAttribute.MediaDefault) ? null : options.Media,
-            MediaSupported = !IsRequired(PrinterAttribute.MediaSupported) ? null : [options.Media],
-            SidesDefault = !IsRequired(PrinterAttribute.SidesDefault) ? null : options.Sides,
+            MediaDefault = !IsRequired(PrinterAttribute.MediaDefault) ? null : options.Media.FirstOrDefault(),
+            MediaColDefault = !IsRequired(PrinterAttribute.MediaDefault) ? null : options.Media.FirstOrDefault(),
+            MediaSupported = !IsRequired(PrinterAttribute.MediaSupported) ? null : options.Media,
+            SidesDefault = !IsRequired(PrinterAttribute.SidesDefault) ? null : options.Sides.FirstOrDefault(),
             SidesSupported = !IsRequired(PrinterAttribute.SidesSupported) ? null : Enum.GetValues(typeof(Sides)).Cast<Sides>().Where(x => x != Sides.Unsupported).ToArray(),
             PdlOverrideSupported = !IsRequired(PrinterAttribute.PdlOverrideSupported) ? null : "attempted",
             MultipleOperationTimeOut = !IsRequired(PrinterAttribute.MultipleOperationTimeOut) ? null : 120,
             FinishingsDefault = !IsRequired(PrinterAttribute.FinishingsDefault) ? null : options.Finishings,
-            PrinterResolutionDefault = !IsRequired(PrinterAttribute.PrinterResolutionDefault) ? null : options.Resolution,
-            PrinterResolutionSupported = !IsRequired(PrinterAttribute.PrinterResolutionSupported) ? null : [options.Resolution],
-            PrintQualityDefault = !IsRequired(PrinterAttribute.PrintQualityDefault) ? null : options.PrintQuality,
-            PrintQualitySupported = !IsRequired(PrinterAttribute.PrintQualitySupported) ? null : [options.PrintQuality],
+            PrinterResolutionDefault = !IsRequired(PrinterAttribute.PrinterResolutionDefault) ? null : options.Resolution.FirstOrDefault(),
+            PrinterResolutionSupported = !IsRequired(PrinterAttribute.PrinterResolutionSupported) ? null : [options.Resolution.FirstOrDefault()],
+            PrintQualityDefault = !IsRequired(PrinterAttribute.PrintQualityDefault) ? null : options.PrintQuality.FirstOrDefault(),
+            PrintQualitySupported = !IsRequired(PrinterAttribute.PrintQualitySupported) ? null : options.PrintQuality,
             JobPriorityDefault = !IsRequired(PrinterAttribute.JobPriorityDefault) ? null : options.JobPriority,
             JobPrioritySupported = !IsRequired(PrinterAttribute.JobPrioritySupported) ? null : options.JobPriority,
             CopiesDefault = !IsRequired(PrinterAttribute.CopiesDefault) ? null : options.Copies,
@@ -445,10 +445,10 @@ private JobAttributes GetJobAttributes(PrinterJob job, string[]? requestedAttrib
             JobStateReasons = !IsRequired(JobAttribute.JobState) ? null : [JobStateReason.None],
             DateTimeAtCreation = !IsRequired(JobAttribute.DateTimeAtCreation) ? null : job.CreatedDateTime,
             TimeAtCreation = !IsRequired(JobAttribute.TimeAtCreation) ? null : (int)(job.CreatedDateTime - _startTime).TotalSeconds,
-            DateTimeAtProcessing = !IsRequired(JobAttribute.DateTimeAtProcessing) ? null : job.ProcessingDateTime,
-            TimeAtProcessing = !IsRequired(JobAttribute.TimeAtProcessing) || !job.ProcessingDateTime.HasValue ? null : (int)(job.ProcessingDateTime.Value - _startTime).TotalSeconds,
-            DateTimeAtCompleted = !IsRequired(JobAttribute.DateTimeAtCompleted) ? null : job.CompletedDateTime,
-            TimeAtCompleted = !IsRequired(JobAttribute.TimeAtCompleted) || !job.CompletedDateTime.HasValue ? null : (int)(job.CompletedDateTime.Value - _startTime).TotalSeconds,
+            DateTimeAtProcessing = !IsRequired(JobAttribute.DateTimeAtProcessing) ? null : job.ProcessingDateTime ?? DateTimeOffset.MinValue,
+            TimeAtProcessing = !IsRequired(JobAttribute.TimeAtProcessing) ? null : job.ProcessingDateTime.HasValue ? (int)(job.ProcessingDateTime.Value - _startTime).TotalSeconds : -1,
+            DateTimeAtCompleted = !IsRequired(JobAttribute.DateTimeAtCompleted) ? null : job.CompletedDateTime ?? DateTimeOffset.MinValue,
+            TimeAtCompleted = !IsRequired(JobAttribute.TimeAtCompleted) ? null : job.CompletedDateTime.HasValue ? (int)(job.CompletedDateTime.Value - _startTime).TotalSeconds : -1,
             Compression = !IsRequired(JobAttribute.Compression) ? null : documentAttributes?.Compression,
             DocumentFormat = !IsRequired(JobAttribute.DocumentFormat) ? null : documentAttributes?.DocumentFormat,
             DocumentName = !IsRequired(JobAttribute.DocumentName) ? null : documentAttributes?.DocumentName,
@@ -614,12 +614,12 @@ private string GetPrinterMoreInfo()
     private void FillWithDefaultValues(int jobId, NewJobAttributes attributes)
     {
         var options = printerOptions.Value;
-        attributes.PrintScaling ??= options.PrintScaling;
-        attributes.Sides ??= options.Sides;
-        attributes.Media ??= options.Media;
-        attributes.PrinterResolution ??= options.Resolution;
+        attributes.PrintScaling ??= options.PrintScaling.FirstOrDefault();
+        attributes.Sides ??= options.Sides.FirstOrDefault();
+        attributes.Media ??= options.Media.FirstOrDefault();
+        attributes.PrinterResolution ??= options.Resolution.FirstOrDefault();
         attributes.Finishings ??= options.Finishings;
-        attributes.PrintQuality ??= options.PrintQuality;
+        attributes.PrintQuality ??= options.PrintQuality.FirstOrDefault();
         attributes.JobPriority ??= options.JobPriority;
         attributes.Copies ??= options.Copies;
         attributes.OrientationRequested ??= options.Orientation;

SharpIppNextServer/appsettings.json

@@ -2,7 +2,7 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.Hosting.Lifetime": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information",
       "Microsoft.AspNetCore": "Warning",
       "Quartz": "Warning"
     }