Add support for WhichJobsSupported and {Pdf|Jpeg}KOctetsSupported

Author: georg-jung

SharpIpp/Mapping/Profiles/GetPrinterAttributesProfile.cs

@@ -69,7 +69,9 @@ public void CreateMaps(IMapperConstructor mapper)
                     IppVersionsSupported =
                         map.MapFromDicSetNull<IppVersion[]?>(src, PrinterAttribute.IppVersionsSupported),
                     JobImpressionsSupported = map.MapFromDic<Range?>(src, PrinterAttribute.JobImpressionsSupported),
-                    JobKOctetsSupported = map.MapFromDic<Range?>(src, PrinterAttribute.JobKOctetsSupported),
+                    JobKOctetsSupported = map.MapFromDic<Range?>(src, PrinterAttribute.JobKOctetsSupported),
+                    JpegKOctetsSupported = map.MapFromDic<Range?>(src, PrinterAttribute.JpegKOctetsSupported),
+                    PdfKOctetsSupported = map.MapFromDic<Range?>(src, PrinterAttribute.PdfKOctetsSupported),
                     JobMediaSheetsSupported = map.MapFromDic<Range?>(src, PrinterAttribute.JobMediaSheetsSupported),
                     MultipleDocumentJobsSupported =
                         map.MapFromDic<bool?>(src, PrinterAttribute.MultipleDocumentJobsSupported),
@@ -133,7 +135,8 @@ public void CreateMaps(IMapperConstructor mapper)
                     OutputBinSupported = map.MapFromDicSetNull<string[]?>(src, PrinterAttribute.OutputBinSupported),
                     MediaColDefault = src.ContainsKey(PrinterAttribute.MediaColDefault) ? MediaCol.Create(src[PrinterAttribute.MediaColDefault].FromBegCollection().ToIppDictionary(), map) : null,
                     PrintColorModeDefault = map.MapFromDic<PrintColorMode?>(src, PrinterAttribute.PrintColorModeDefault),
-                    PrintColorModeSupported = map.MapFromDicSetNull<PrintColorMode[]?>(src, PrinterAttribute.PrintColorModeSupported),
+                    PrintColorModeSupported = map.MapFromDicSetNull<PrintColorMode[]?>(src, PrinterAttribute.PrintColorModeSupported),
+                    WhichJobsSupported = map.MapFromDicSetNull<WhichJobs[]?>(src, PrinterAttribute.WhichJobsSupported),
                 } );
 
             mapper.CreateMap<GetPrinterAttributesResponse, IDictionary<string, IppAttribute[]>>( ( src, map ) =>
@@ -159,6 +162,10 @@ public void CreateMaps(IMapperConstructor mapper)
                         dic.Add( PrinterAttribute.JobImpressionsSupported, new IppAttribute[] { new IppAttribute( Tag.RangeOfInteger, PrinterAttribute.JobImpressionsSupported, src.JobImpressionsSupported.Value ) } );
                     if ( src.JobKOctetsSupported != null )
                         dic.Add( PrinterAttribute.JobKOctetsSupported, new IppAttribute[] { new IppAttribute( Tag.RangeOfInteger, PrinterAttribute.JobKOctetsSupported, src.JobKOctetsSupported.Value ) } );
+                    if (src.JpegKOctetsSupported != null)
+                        dic.Add(PrinterAttribute.JpegKOctetsSupported, new IppAttribute[] { new IppAttribute(Tag.RangeOfInteger, PrinterAttribute.JpegKOctetsSupported, src.JpegKOctetsSupported.Value) });
+                    if (src.PdfKOctetsSupported != null)
+                        dic.Add(PrinterAttribute.PdfKOctetsSupported, new IppAttribute[] { new IppAttribute(Tag.RangeOfInteger, PrinterAttribute.PdfKOctetsSupported, src.PdfKOctetsSupported.Value) });
                     if ( src.JobMediaSheetsSupported != null )
                         dic.Add( PrinterAttribute.JobMediaSheetsSupported, new IppAttribute[] { new IppAttribute( Tag.RangeOfInteger, PrinterAttribute.JobMediaSheetsSupported, src.JobMediaSheetsSupported.Value ) } );
                     if ( src.MultipleDocumentJobsSupported != null )
@@ -265,6 +272,8 @@ public void CreateMaps(IMapperConstructor mapper)
                         dic.Add(PrinterAttribute.PrintColorModeDefault, new IppAttribute[] { new IppAttribute(Tag.Keyword, PrinterAttribute.PrintColorModeDefault, map.Map<string>(src.PrintColorModeDefault.Value)) });
                     if (src.PrintColorModeSupported?.Any() ?? false)
                         dic.Add(PrinterAttribute.PrintColorModeSupported, src.PrintColorModeSupported.Select(x => new IppAttribute(Tag.Keyword, PrinterAttribute.PrintColorModeSupported, map.Map<string>(x))).ToArray());
+                    if (src.WhichJobsSupported?.Any() ?? false)
+                        dic.Add(PrinterAttribute.WhichJobsSupported, src.WhichJobsSupported.Select(x => new IppAttribute(Tag.Keyword, PrinterAttribute.WhichJobsSupported, map.Map<string>(x))).ToArray());
                     return dic;
                 } );
         }

SharpIpp/Models/GetPrinterAttributesResponse.cs

@@ -172,6 +172,16 @@ public class GetPrinterAttributesResponse : IIppResponseMessage
         ///     job-k-octets-supported
         /// </summary>
         public Range? JobKOctetsSupported { get; set; }
+
+        /// <summary>
+        ///     jpeg-k-octets-supported
+        /// </summary>
+        public Range? JpegKOctetsSupported { get; set; }
+
+        /// <summary>
+        ///     pdf-k-octets-supported
+        /// </summary>
+        public Range? PdfKOctetsSupported { get; set; }
 
         /// <summary>
         ///     job-impressions-supported
@@ -247,6 +257,8 @@ public class GetPrinterAttributesResponse : IIppResponseMessage
         public MediaCol? MediaColDefault { get; set; }
 
         public PrintColorMode? PrintColorModeDefault { get; set; }
-        public PrintColorMode[]? PrintColorModeSupported { get; set; }
+        public PrintColorMode[]? PrintColorModeSupported { get; set; }
+
+        public WhichJobs[]? WhichJobsSupported { get; set; }
     }
 }

SharpIpp/Protocol/Models/PrinterAttribute.cs

@@ -36,7 +36,9 @@ public static class PrinterAttribute
         public const string PrinterCurrentTime = "printer-current-time";
         public const string MultipleOperationTimeOut = "multiple-operation-time-out";
         public const string CompressionSupported = "compression-supported";
-        public const string JobKOctetsSupported = "job-k-octets-supported";
+        public const string JobKOctetsSupported = "job-k-octets-supported";
+        public const string JpegKOctetsSupported = "jpeg-k-octets-supported";
+        public const string PdfKOctetsSupported = "pdf-k-octets-supported";
         public const string JobImpressionsSupported = "job-impressions-supported";
         public const string JobMediaSheetsSupported = "job-media-sheets-supported";
         public const string PagesPerMinute = "pages-per-minute";
@@ -66,7 +68,8 @@ public static class PrinterAttribute
         public const string OutputBinSupported = "output-bin-supported";
         public const string MediaColDefault = "media-col-default";
         public const string PrintColorModeDefault = "print-color-mode-default";
-        public const string PrintColorModeSupported = "print-color-mode-supported";
+        public const string PrintColorModeSupported = "print-color-mode-supported";
+        public const string WhichJobsSupported = "which-jobs-supported";
 
         public static IEnumerable<string> GetAttributes(IppVersion version)
         {
@@ -84,7 +87,7 @@ public static IEnumerable<string> GetAttributes(IppVersion version)
             yield return PrinterState;
             yield return PrinterStateReasons;
             yield return PrinterStateMessage;
-            yield return IppVersionsSupported ;
+            yield return IppVersionsSupported;
             yield return OperationsSupported;
             yield return MultipleDocumentJobsSupported;
             yield return CharsetConfigured;
@@ -102,7 +105,9 @@ public static IEnumerable<string> GetAttributes(IppVersion version)
             yield return PrinterCurrentTime;
             yield return MultipleOperationTimeOut;
             yield return CompressionSupported;
-            yield return JobKOctetsSupported;
+            yield return JobKOctetsSupported;
+            yield return JpegKOctetsSupported;
+            yield return PdfKOctetsSupported;
             yield return JobImpressionsSupported;
             yield return JobMediaSheetsSupported;
             yield return PagesPerMinute;
@@ -132,7 +137,8 @@ public static IEnumerable<string> GetAttributes(IppVersion version)
             yield return OutputBinSupported;
             yield return MediaColDefault;
             yield return PrintColorModeDefault;
-            yield return PrintColorModeSupported;
+            yield return PrintColorModeSupported;
+            yield return WhichJobsSupported;
         }
     }
 }