Merge pull request #109 from SixLabors/js/code-quality

Code Quality

Author: JimBobSquarePants

src/ImageSharp.Web/Commands/CommandDescriptor.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -50,14 +50,13 @@ public static ICommandConverter GetConverter(Type type)
         /// </exception>
         public static void AddConverter(Type type, Type converter)
         {
-            Guard.IsTrue(typeof(ICommandConverter).IsAssignableFrom(converter), nameof(converter), "Converter does not implement ICommandConverter.");
+            const string Message = "Converter does not implement ICommandConverter.";
+            Guard.IsTrue(typeof(ICommandConverter).IsAssignableFrom(converter), nameof(converter), Message);
 
-            if (ConverterCache.ContainsKey(type))
+            if (!ConverterCache.ContainsKey(type))
             {
-                return;
+                ConverterCache[type] = (ICommandConverter)Activator.CreateInstance(converter);
             }
-
-            ConverterCache[type] = (ICommandConverter)Activator.CreateInstance(converter);
         }
     }
-}
+}

src/ImageSharp.Web/Commands/CommandParser.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -63,10 +63,7 @@ private CommandParser()
         /// <returns>The converted instance or the default.</returns>
         public T ParseValue<T>(string value, CultureInfo culture)
         {
-            if (culture == null)
-            {
-                culture = CultureInfo.InvariantCulture;
-            }
+            culture ??= CultureInfo.InvariantCulture;
 
             Type type = typeof(T);
             ICommandConverter converter = CommandDescriptor.GetConverter(type);

src/ImageSharp.Web/Commands/ComparableExtensions.cs

@@ -1,10 +1,9 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.Web.Commands.Converters
 {
@@ -16,11 +15,6 @@ internal sealed class ArrayConverter<T> : ListConverter<T>
     {
         /// <inheritdoc/>
         public override object ConvertFrom(CultureInfo culture, string value, Type propertyType)
-        {
-            object result = base.ConvertFrom(culture, value, propertyType);
-
-            var list = result as IList<T>;
-            return list?.ToArray() ?? result;
-        }
+            => ((List<T>)base.ConvertFrom(culture, value, propertyType)).ToArray();
     }
-}
+}

src/ImageSharp.Web/Commands/Converters/ArrayConverter{T}.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -38,13 +38,6 @@ public override object ConvertFrom(CultureInfo culture, string value, Type prope
                 return default(Color);
             }
 
-            // Special case. HTML requires LightGrey, but NamedColors has LightGray to conform with System.Drawing
-            // Check early on.
-            if (value.Equals("LightGrey", StringComparison.OrdinalIgnoreCase))
-            {
-                return Color.LightGray;
-            }
-
             // Numeric r,g,b - r,g,b,a
             char separator = culture.TextInfo.ListSeparator[0];
 

src/ImageSharp.Web/Commands/Converters/ColorConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -27,39 +27,39 @@ public override object ConvertFrom(CultureInfo culture, string value, Type prope
             // Now clamp it to the type ranges
             if (propertyType == TypeConstants.Sbyte)
             {
-                rounded = rounded.Clamp(sbyte.MinValue, sbyte.MaxValue);
+                rounded = Math.Clamp(rounded, sbyte.MinValue, sbyte.MaxValue);
             }
             else if (propertyType == TypeConstants.Byte)
             {
-                rounded = rounded.Clamp(byte.MinValue, byte.MaxValue);
+                rounded = Math.Clamp(rounded, byte.MinValue, byte.MaxValue);
             }
             else if (propertyType == TypeConstants.Short)
             {
-                rounded = rounded.Clamp(short.MinValue, short.MaxValue);
+                rounded = Math.Clamp(rounded, short.MinValue, short.MaxValue);
             }
             else if (propertyType == TypeConstants.UShort)
             {
-                rounded = rounded.Clamp(ushort.MinValue, ushort.MaxValue);
+                rounded = Math.Clamp(rounded, ushort.MinValue, ushort.MaxValue);
             }
             else if (propertyType == TypeConstants.Int)
             {
-                rounded = rounded.Clamp(int.MinValue, int.MaxValue);
+                rounded = Math.Clamp(rounded, int.MinValue, int.MaxValue);
             }
             else if (propertyType == TypeConstants.UInt)
             {
-                rounded = rounded.Clamp(uint.MinValue, uint.MaxValue);
+                rounded = Math.Clamp(rounded, uint.MinValue, uint.MaxValue);
             }
             else if (propertyType == TypeConstants.Long)
             {
-                rounded = rounded.Clamp(long.MinValue, long.MaxValue);
+                rounded = Math.Clamp(rounded, long.MinValue, long.MaxValue);
             }
             else if (propertyType == TypeConstants.ULong)
             {
-                rounded = rounded.Clamp(ulong.MinValue, ulong.MaxValue);
+                rounded = Math.Clamp(rounded, ulong.MinValue, ulong.MaxValue);
             }
 
             // Now it's rounded an clamped we should be able to correctly parse the string.
             return (T)Convert.ChangeType(rounded.ToString(CultureInfo.InvariantCulture), typeof(T), culture);
         }
     }
-}
+}

src/ImageSharp.Web/Commands/Converters/IntegralNumberConverter.cs

@@ -21,7 +21,7 @@ public sealed class FormattedImage : IDisposable
         /// </summary>
         /// <param name="image">The image.</param>
         /// <param name="format">The format.</param>
-        public FormattedImage(Image<Rgba32> image, IImageFormat format)
+        internal FormattedImage(Image<Rgba32> image, IImageFormat format)
         {
             this.format = format;
             this.Image = image;

src/ImageSharp.Web/FormattedImage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -18,25 +18,22 @@ internal static class WebProcessingExtensions
         /// <param name="logger">The type used for performing logging.</param>
         /// <param name="processors">The collection of available processors.</param>
         /// <param name="commands">The parsed collection of processing commands.</param>
-        /// <returns>The <see cref="Image{Rgba32}"/>.</returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image.</remarks>
+        /// <returns>The <see cref="FormattedImage"/>.</returns>
         public static FormattedImage Process(
             this FormattedImage source,
             ILogger logger,
             IEnumerable<IImageWebProcessor> processors,
             IDictionary<string, string> commands)
         {
-            if (commands.Count == 0)
+            if (commands.Count != 0)
             {
-                return source;
-            }
-
-            foreach (IImageWebProcessor processor in processors)
-            {
-                source = processor.Process(source, logger, commands);
+                foreach (IImageWebProcessor processor in processors)
+                {
+                    source = processor.Process(source, logger, commands);
+                }
             }
 
             return source;
         }
     }
-}
+}