add DrawLines option

EdiWang · Dec 15, 2023 · fd88c90 · fd88c90
1 parent f8adcee
commit fd88c90
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/src/Edi.Captcha.SampleApp/Startup.cs b/src/Edi.Captcha.SampleApp/Startup.cs
@@ -31,6 +31,7 @@ public void ConfigureServices(IServiceCollection services)
             option.FontStyle = FontStyle.Bold;
             //option.FontName = "Arial";
             option.CodeLength = 4;
+            //option.DrawLines = false;
         });
     }
 

diff --git a/src/Edi.Captcha/CaptchaImageGenerator.cs b/src/Edi.Captcha/CaptchaImageGenerator.cs
@@ -12,7 +12,8 @@ namespace Edi.Captcha;
 
 public static class CaptchaImageGenerator
 {
-    public static CaptchaResult GetImage(int width, int height, string captchaCode, string fontName, FontStyle fontStyle = FontStyle.Regular)
+    public static CaptchaResult GetImage(
+        int width, int height, string captchaCode, string fontName, FontStyle fontStyle = FontStyle.Regular, bool drawLines = true)
     {
         using var ms = new MemoryStream();
         var rand = new Random();
@@ -27,7 +28,7 @@ public static CaptchaResult GetImage(int width, int height, string captchaCode,
             Font font = SystemFonts.CreateFont(fontName, fontSize, fontStyle);
 
             Random random = new Random();
-            
+
             foreach (char c in captchaCode)
             {
                 var x = rand.Next(5, 10);
@@ -36,7 +37,7 @@ public static CaptchaResult GetImage(int width, int height, string captchaCode,
                 var degrees = random.Next(0, 10) * (random.Next(-10, 10) > 0 ? 1 : -1);
 
                 var location = new PointF(x + position, y);
-                imgText.Mutate(ctx => 
+                imgText.Mutate(ctx =>
                     ctx.SetDrawingTransform(Matrix3x2Extensions.CreateRotationDegrees(degrees, new(0, 0)))
                         .DrawText(c.ToString(), font, GetRandomDeepColor(), location));
                 position += TextMeasurer.MeasureBounds(c.ToString(), new(font)).Width;
@@ -51,13 +52,16 @@ public static CaptchaResult GetImage(int width, int height, string captchaCode,
             var img = new Image<Rgba32>(width, height);
             img.Mutate(ctx => ctx.BackgroundColor(backColor));
 
-            // lines
-            for (var i = 0; i < rand.Next(3, 7); i++)
+            if (drawLines)
             {
-                var color = GetRandomDeepColor();
-                var startPoint = new PointF(rand.Next(0, width), rand.Next(0, height));
-                var endPoint = new PointF(rand.Next(0, width), rand.Next(0, height));
-                img.Mutate(ctx => ctx.DrawLine(color, 1, startPoint, endPoint));
+                // lines
+                for (var i = 0; i < rand.Next(3, 7); i++)
+                {
+                    var color = GetRandomDeepColor();
+                    var startPoint = new PointF(rand.Next(0, width), rand.Next(0, height));
+                    var endPoint = new PointF(rand.Next(0, width), rand.Next(0, height));
+                    img.Mutate(ctx => ctx.DrawLine(color, 1, startPoint, endPoint));
+                }
             }
 
             // merge layers

diff --git a/src/Edi.Captcha/Edi.Captcha.csproj b/src/Edi.Captcha/Edi.Captcha.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>3.20.0</Version>
+    <Version>3.21.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>edi.wang</Company>
     <Authors>Edi Wang</Authors>

diff --git a/src/Edi.Captcha/SessionBasedCaptcha.cs b/src/Edi.Captcha/SessionBasedCaptcha.cs
@@ -9,13 +9,9 @@ namespace Edi.Captcha;
 public class SessionBasedCaptchaOptions
 {
     public string SessionName { get; set; }
-    public FontStyle FontStyle { get; set; }
+    public FontStyle FontStyle { get; set; } = FontStyle.Regular;
     public string FontName { get; set; }
-
-    public SessionBasedCaptchaOptions()
-    {
-        FontStyle = FontStyle.Regular;
-    }
+    public bool DrawLines { get; set; } = true;
 }
 
 public abstract class SessionBasedCaptcha : ISessionBasedCaptcha
@@ -29,7 +25,7 @@ public byte[] GenerateCaptchaImageBytes(ISession httpSession, int width = 100, i
         EnsureHttpSession(httpSession);
 
         var captchaCode = GenerateCaptchaCode();
-        var result = CaptchaImageGenerator.GetImage(width, height, captchaCode, Options.FontName, Options.FontStyle);
+        var result = CaptchaImageGenerator.GetImage(width, height, captchaCode, Options.FontName, Options.FontStyle, Options.DrawLines);
         httpSession.SetString(sessionKeyName ?? Options.SessionName, result.CaptchaCode);
         return result.CaptchaByteData;
     }
@@ -39,7 +35,7 @@ public FileStreamResult GenerateCaptchaImageFileStream(ISession httpSession, int
         EnsureHttpSession(httpSession);
 
         var captchaCode = GenerateCaptchaCode();
-        var result = CaptchaImageGenerator.GetImage(width, height, captchaCode, Options.FontName, Options.FontStyle);
+        var result = CaptchaImageGenerator.GetImage(width, height, captchaCode, Options.FontName, Options.FontStyle, Options.DrawLines);
         httpSession.SetString(sessionKeyName ?? Options.SessionName, result.CaptchaCode);
         Stream s = new MemoryStream(result.CaptchaByteData);
         return new(s, "image/png");