Fixed CropWhitespacesAssetAction

Author: usercode

src/DragonFly.Assets.FFMpeg/VideoProcessing.cs

@@ -24,7 +24,7 @@ public bool CanUse(string mimeType)
 
     public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
     {
-        using Stream stream = await context.OpenAssetStreamAsync();
+        using Stream stream = await context.OpenAssetStreamAsync().ConfigureAwait(false);
 
         IMediaAnalysis mediaInfo = FFProbe.Analyse(stream);
 
@@ -56,7 +56,7 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
             };
         }
 
-        await context.SetMetadataAsync(metadata);
+        await context.SetMetadataAsync(metadata).ConfigureAwait(false);
 
         return true;
     }

src/DragonFly.Assets.ImageSharp/Actions/CropWhitespacesAssetAction.cs

@@ -25,8 +25,8 @@ public async Task<bool> ProcessAsync(IAssetActionContext context)
         }
 
         int top = 0;
-        int bottom = image.Height - 1;
-        int left = image.Width - 1;
+        int bottom = 0;
+        int left = 0;
         int right = 0;
 
         image.ProcessPixelRows(p =>
@@ -49,7 +49,7 @@ public async Task<bool> ProcessAsync(IAssetActionContext context)
             }
 
             //bottom
-            for (int i = image.Height - 1; i >= 0; i--)
+            for (int i = image.Height - 1; i > top; i--)
             {
                 Span<Rgb24> row = p.GetRowSpan(i);
 
@@ -62,39 +62,61 @@ public async Task<bool> ProcessAsync(IAssetActionContext context)
                 }
             }
 
+            bool foundSide = false;
+
             //sides
-            for (int i = top; i <= bottom; i++)
+            for (int i = top; i < image.Height - bottom; i++)
             {
                 Span<Rgb24> row = p.GetRowSpan(i);
 
                 //left
                 int found = row.IndexOfAnyExcept(whitePixel);
 
-                if (found != -1)
+                if (found == -1)
+                {
+                    continue;
+                }
+
+                if (foundSide)
                 {
                     left = Math.Min(left, found);
+                }
+                else
+                {
+                    left = found;
+                }
 
-                    //right
-                    found = row.LastIndexOfAnyExcept(whitePixel);
+                //right
+                found = row.LastIndexOfAnyExcept(whitePixel);
 
-                    if (found != -1)
-                    {
-                        found = image.Width - found - 1;
+                if (found == -1)
+                {
+                    throw new Exception();
+                }
 
-                        right = Math.Max(right, found);
-                    }
+                found = image.Width - found - 1;
+
+                if (foundSide)
+                {
+                    right = Math.Min(right, found);
                 }
+                else
+                {
+                    right = found;
+                }
+
+                foundSide = true;
             }
         });
 
-        if (top == 0 && bottom == image.Height - 1 && left == image.Width -1 && right == 0)
+        if (top == 0 && bottom == 0 && left == 0 && right == 0)
         {
-            return false; //no whitespace found
+            return false; //no whitespaces found
         }
 
-        if (top > bottom)
+        if (top == image.Height)
         {
-            return false; //white image
+            return false;
         }
 
         image.Mutate(x => x.Crop(new Rectangle(left, top, image.Width - left - right, image.Height - bottom - top)));

src/DragonFly.Assets.ImageSharp/Extensions/DragonFlyBuilderExtensions.cs

@@ -17,7 +17,6 @@ public static class DragonFlyBuilderExtensions
     public static IDragonFlyBuilder AddImageMetadata(this IDragonFlyBuilder builder)
     {
         builder.Services.AddTransient<IAssetProcessing, ImageProcessing>();
-
         builder.Services.AddTransient<CropWhitespacesAssetAction>();
 
         AssetActionManager.Default.Add<CropWhitespacesAssetAction>("CropWhiteSpaces", MimeTypes.Images);

src/DragonFly.Assets.ImageSharp/ImageProcessing.cs

@@ -26,9 +26,9 @@ public bool CanUse(string mimeType)
 
     public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
     {
-        using Stream stream = await context.OpenAssetStreamAsync();
+        using Stream stream = await context.OpenAssetStreamAsync().ConfigureAwait(false);
 
-        ImageInfo imageInfo = await Image.IdentifyAsync(stream);
+        ImageInfo imageInfo = await Image.IdentifyAsync(stream).ConfigureAwait(false);
 
         if (imageInfo != null)
         {
@@ -37,7 +37,7 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
                                                     Height = imageInfo.Height, 
                                                     BitsPerPixel = imageInfo.PixelType.BitsPerPixel };
 
-            await context.SetMetadataAsync(metadata);
+            await context.SetMetadataAsync(metadata).ConfigureAwait(false);
 
             return true;
         }

src/DragonFly.Assets.Pdf/PdfProcessing.cs

@@ -21,7 +21,7 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
     {
         MemoryStream mem = new MemoryStream();
 
-        using (Stream stream = await context.OpenAssetStreamAsync())
+        using (Stream stream = await context.OpenAssetStreamAsync().ConfigureAwait(false))
         {   
             await stream.CopyToAsync(mem);
         }
@@ -37,7 +37,7 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
             metadata.PdfVersion = document.Version.ToString(CultureInfo.InvariantCulture);
         }
 
-        await context.SetMetadataAsync(metadata);
+        await context.SetMetadataAsync(metadata).ConfigureAwait(false);
 
         return true;
     }