Add converter options that not to throw on exception in converters, Add json hex string to color conversion

Author: Suiram1701

API.Test/ExtensionsTests/DateTimeExtensionTests.cs

@@ -43,13 +43,13 @@ public static void FromWebUntisTimeFormatTest()
         // Example 1
         string E1_Date = "2023-05-31";
         string E1_Time = "2000";
-        DateTime E1_DateTime = new DateTime().FromWebUntisTimeFormat(E1_Date, E1_Time);
+        DateTime? E1_DateTime = new DateTime().FromWebUntisTimeFormat(E1_Date, E1_Time);
         Assert.That(new DateTime(2023, 5, 31, 20, 0, 0), Is.EqualTo(E1_DateTime));
 
         // Example 2
         string E2_Date = "2023-06-01";
         string E2_Time = "740";
-        DateTime E2_DateTime = new DateTime().FromWebUntisTimeFormat(E2_Date, E2_Time);
+        DateTime? E2_DateTime = new DateTime().FromWebUntisTimeFormat(E2_Date, E2_Time);
         Assert.That(new DateTime(2023, 6, 1, 7, 40, 0), Is.EqualTo(E2_DateTime));
     }
 }

WebUntisAPI.Client/Converter/ColorJsonConverter.cs

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using WebUntisAPI.Client.Extensions;
+
+namespace WebUntisAPI.Client.Converter
+{
+    /// <summary>
+    /// A json converter to convert a <see cref="Color"/> to the Hex color format (RRGGBB)
+    /// </summary>
+    public sealed class ColorJsonConverter : JsonConverter
+    {
+        /// <inheritdoc/>
+        public override bool CanConvert(Type objectType) => objectType == typeof(Color) || objectType == typeof(string);
+
+        /// <inheritdoc/>
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            // Get value
+            JToken jToken = JToken.Load(reader);
+            string value = jToken.Value<string>();
+
+            // Convert value
+            return new Color().FromHexColorFormat(value, false) ?? (object)value;
+        }
+
+        /// <inheritdoc/>
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => ((Color)value).ToHexColorFormat();
+    }
+}

WebUntisAPI.Client/Extensions/ColorExtensions.cs

@@ -27,13 +27,20 @@ public static string ToHexColorFormat(this Color color)
         /// Convert a color string to the Hexadecimal format: RRGGBB
         /// </summary>
         /// <param name="color"></param>
+        /// <param name="colorString">The string to convert</param>
+        /// <param name="throwOnException">Throw a exception on validation error. When not to throw on exception and an exception happened is the return value <see langword="null"/></param>
         /// <returns>The created color</returns>
         /// <exception cref="ArgumentException">Thrown when the <paramref name="colorString"/> isn't in the correct format</exception>
-        public static Color FromHexColorFormat(this Color color, string colorString)
+        public static Color? FromHexColorFormat(this Color color, string colorString, bool throwOnException = true)
         {
             if (!Regex.IsMatch(colorString, @"[\da-fA-F]{6}"))
-                throw new ArgumentException("The color string isn't in a correct format", nameof(colorString));
+            {
+                if (!throwOnException)
+                    return null;
 
+                throw new ArgumentException("The color string isn't in a correct format", nameof(colorString));
+            }
+                
             // Convert the hex string to the single color channels
             int red = Convert.ToByte(colorString.Substring(0, 2), 16);
             int green = Convert.ToByte(colorString.Substring(2, 2), 16);

WebUntisAPI.Client/Extensions/DateTimeExtensions.cs

@@ -42,9 +42,10 @@ public static void ToWebUntisTimeFormat(this DateTime dateTime, out string dateS
         /// <param name="dateTime">Instance</param>
         /// <param name="dateString">Date string</param>
         /// <param name="timeString">Time string</param>
-        /// <returns>The new instance that contains the given time</returns>
+        /// <param name="throwOnException">Throw a exception on validation error</param>
+        /// <returns>The new instance that contains the given time. When not to throw on exception and an exception happened is the return value <see langword="null"/></returns>
         /// <exception cref="FormatException">Thrown when one of the given strings isn't in the right format</exception>
-        public static DateTime FromWebUntisTimeFormat(this DateTime dateTime, string dateString, string timeString)
+        public static DateTime? FromWebUntisTimeFormat(this DateTime dateTime, string dateString, string timeString, bool throwOnException = true)
         {
             Regex dateRegex = new Regex(@"^\d{4}-(0\d|1[0-2])-(0[1-9]|[1-2]\d|3[0-1])$");     // Regex for the WebUntis date format
             Regex timeRegex = new Regex(@"^(\d|1\d|2[0-3])[0-5]\d$");     // Regex for the WebUntis time format
@@ -54,7 +55,13 @@ public static DateTime FromWebUntisTimeFormat(this DateTime dateTime, string dat
             bool isTimeValid = timeRegex.IsMatch(timeString);
 
             if (!isDateValid || !isTimeValid)
+            {
+                if (!throwOnException)
+                    return null;
+
                 throw new FormatException($"The string {(isDateValid ? timeString : dateString)} isn't in the valid format!");
+            }
+                
 
             // Parse the numbers in the string to value
             int year = int.Parse(dateString.Substring(0, 4));