Use GeneratedRegexAttribute

SeriaWei · Oct 9, 2023 · 9b07bd6 · 9b07bd6
1 parent 16a32e8
commit 9b07bd6
Show file tree

Hide file tree

Showing 24 changed files with 107 additions and 68 deletions.
diff --git a/src/EasyFrameWork/Version.cs b/src/EasyFrameWork/Version.cs
@@ -11,18 +11,16 @@
 
 namespace Easy
 {
-    public class Version
+    public partial class Version
     {
-        static Regex regex = new Regex(@"^(\d+\.)?(\d+\.)?(\d+\.)?(\d+)$", RegexOptions.Compiled);
-
         public int Major { get; set; }
         public int Minor { get; set; }
         public int Revision { get; set; }
         public int Build { get; set; }
 
         public static Version Parse(string version)
         {
-            if (!regex.IsMatch(version))
+            if (!RegexVersion().IsMatch(version))
             {
                 throw new Exception("Version format is not supported.");
             }
@@ -161,7 +159,7 @@ public override bool Equals(object obj)
                 return false;
             }
 
-            return this == (obj as Version);
+            return this == obj as Version;
         }
 
         public override int GetHashCode()
@@ -172,5 +170,8 @@ public override string ToString()
         {
             return $"{Major}.{Minor}.{Revision}.{Build}";
         }
+
+        [GeneratedRegex("^(\\d+\\.)?(\\d+\\.)?(\\d+\\.)?(\\d+)$", RegexOptions.Compiled)]
+        private static partial Regex RegexVersion();
     }
 }
diff --git a/src/ZKEACMS.EventAction/HttpParser/Helps/HttpBaseInfo.cs b/src/ZKEACMS.EventAction/HttpParser/Helps/HttpBaseInfo.cs
@@ -9,9 +9,8 @@
 
 namespace ZKEACMS.EventAction.HttpParser.Helps
 {
-    class HttpBaseInfo
+    partial class HttpBaseInfo
     {
-        private static Regex _httpVersionValidate = new Regex(@"HTTP/\d.\d", RegexOptions.Compiled);
         private static readonly HashSet<string> validHttpVerbs = new HashSet<string> { "GET", "POST", "HEAD", "PUT", "DELETE", "MOVE", "TRACE", "CONNECT", "OPTIONS" };
 
         public string Method { get; set; }
@@ -63,9 +62,12 @@ private static bool IsValidUri(string url)
 
         private void SetHttpVersion(string version)
         {
-            if (!_httpVersionValidate.IsMatch(version)) return;
+            if (!RegexHttpVersionValidate().IsMatch(version)) return;
 
             HttpVersion = version.Trim();
         }
+
+        [GeneratedRegex("HTTP/\\d.\\d", RegexOptions.Compiled)]
+        private static partial Regex RegexHttpVersionValidate();
     }
 }
diff --git a/src/ZKEACMS.EventAction/Service/EventActionService.cs b/src/ZKEACMS.EventAction/Service/EventActionService.cs
@@ -25,15 +25,14 @@
 
 namespace ZKEACMS.EventAction.Service
 {
-    public sealed class EventActionService : ServiceBase<Models.EventAction>, IEventActionService
+    public sealed partial class EventActionService : ServiceBase<Models.EventAction>, IEventActionService
     {
         private const string EventActionChanged = "EventActionChanged";
 
         private readonly ICacheManager<EventActionService> _cacheManager;
         private readonly ISignals _signals;
         private readonly ILogger<EventActionService> _logger;
         private readonly ILocalize _localize;
-        private static Regex _encoder = new Regex(@":( +)({{)([\w|\.| |\[|\]]+)(}})", RegexOptions.Compiled);
 
         public EventActionService(IApplicationContext applicationContext, CMSDbContext dbContext,
             ICacheManager<EventActionService> cacheManager, ILogger<EventActionService> logger, ILocalize localize, ISignals signals)
@@ -126,10 +125,13 @@ private ServiceResult<Models.EventAction> ValidateActions(Models.EventAction ite
         }
         private string Encode(string actions)
         {
-            return _encoder.Replace(actions, evaluator =>
+            return RegexEncoder().Replace(actions, evaluator =>
             {
                 return $":{ evaluator.Groups[1].Value }'{ evaluator.Groups[2].Value + evaluator.Groups[3].Value + evaluator.Groups[4].Value}'";
             });
         }
+
+        [GeneratedRegex(":( +)({{)([\\w|\\.| |\\[|\\]]+)(}})", RegexOptions.Compiled)]
+        private static partial Regex RegexEncoder();
     }
 }
diff --git a/src/ZKEACMS.FormGenerator/Service/FormDataService.cs b/src/ZKEACMS.FormGenerator/Service/FormDataService.cs
@@ -19,13 +19,12 @@
 
 namespace ZKEACMS.FormGenerator.Service
 {
-    public class FormDataService : ServiceBase<FormData, CMSDbContext>, IFormDataService
+    public partial class FormDataService : ServiceBase<FormData, CMSDbContext>, IFormDataService
     {
         private readonly IFormService _formService;
         private readonly IFormDataItemService _formDataItemService;
         private readonly IEnumerable<IFormDataValidator> _formDataValidators;
         private readonly IEventManager _eventManager;
-        private static Regex _nameRegex = new Regex(@"(\w+)\[(\d+)\]", RegexOptions.Compiled);
 
         public FormDataService(IApplicationContext applicationContext,
             CMSDbContext dbContext,
@@ -115,7 +114,7 @@ public ServiceResult<FormData> SaveForm(IFormCollection formCollection, string f
 
             foreach (var item in formCollection.Keys)
             {
-                string id = _nameRegex.Replace(item, evaluator =>
+                string id = RegexName().Replace(item, evaluator =>
                 {
                     return evaluator.Groups[1].Value;
                 });
@@ -216,5 +215,8 @@ public MemoryStream ExportByForm(string formId)
                 return excel.ToMemoryStream();
             }
         }
+
+        [GeneratedRegex("(\\w+)\\[(\\d+)\\]", RegexOptions.Compiled)]
+        private static partial Regex RegexName();
     }
 }
diff --git a/src/ZKEACMS.Product/Views/Widget.ProductDetail.cshtml b/src/ZKEACMS.Product/Views/Widget.ProductDetail.cshtml
@@ -59,12 +59,12 @@
                                     @Html.LabelFor(m => m.Price)
                                     @if (Model.RebatePrice.HasValue)
                                     {
-                                        <del class="text-muted"><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((Model.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</del>
-                                        <span class="price"><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((Model.RebatePrice ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</span>
+                                        <del class="text-muted"><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((Model.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</del>
+                                        <span class="price"><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((Model.RebatePrice ?? 0).ToString("F2"), "<small>.$1</small>"))</span>
                                     }
                                     else
                                     {
-                                        <span class="price"><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((Model.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</span>
+                                        <span class="price"><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((Model.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</span>
                                     }
                                 </p>
                             }

diff --git a/src/ZKEACMS.Product/Views/Widget.ProductGallery.cshtml b/src/ZKEACMS.Product/Views/Widget.ProductGallery.cshtml
@@ -28,12 +28,12 @@
                                 <div class="pull-left price">
                                     @if (item.RebatePrice.HasValue)
                                     {
-                                        <del class="text-muted"><small><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</small></del>
-                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.RebatePrice ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</strong>
+                                        <del class="text-muted"><small><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</small></del>
+                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.RebatePrice ?? 0).ToString("F2"), "<small>.$1</small>"))</strong>
                                     }
                                     else
                                     {
-                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</strong>
+                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</strong>
                                     }
                                 </div>
                             </div>

diff --git a/src/ZKEACMS.Product/Views/Widget.ProductList.A.cshtml b/src/ZKEACMS.Product/Views/Widget.ProductList.A.cshtml
@@ -37,12 +37,12 @@
                             <p class="price">
                                 @if (item.RebatePrice.HasValue)
                                 {
-                                    <del class="text-muted"><small><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</small></del>
-                                    <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.RebatePrice ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</strong>
+                                    <del class="text-muted"><small><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</small></del>
+                                    <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.RebatePrice ?? 0).ToString("F2"), "<small>.$1</small>"))</strong>
                                 }
                                 else
                                 {
-                                    <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</strong>
+                                    <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</strong>
                                 }
                             </p>
                         }

diff --git a/src/ZKEACMS.Product/Views/Widget.ProductList.cshtml b/src/ZKEACMS.Product/Views/Widget.ProductList.cshtml
@@ -28,12 +28,12 @@
                                 <div class="pull-left price">
                                     @if (item.RebatePrice.HasValue)
                                     {
-                                        <del class="text-muted"><small><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</small></del>
-                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.RebatePrice ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</strong>
+                                        <del class="text-muted"><small><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</small></del>
+                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.RebatePrice ?? 0).ToString("F2"), "<small>.$1</small>"))</strong>
                                     }
                                     else
                                     {
-                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(Regex.Replace((item.Price ?? 0).ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))</strong>
+                                        <strong><small>@Html.CurrencySymbol()</small>@Html.Raw(CustomRegex.DecimalPoint().Replace((item.Price ?? 0).ToString("F2"), "<small>.$1</small>"))</strong>
                                     }
                                 </div>
                             </div>

diff --git a/src/ZKEACMS.Redirection/Controllers/UrlRedirectionController.cs b/src/ZKEACMS.Redirection/Controllers/UrlRedirectionController.cs
@@ -93,7 +93,7 @@ public override IActionResult GetList(DataTableOption query)
         }
         public IActionResult RedirectTo(string path)
         {
-            if (path.IsNotNullAndWhiteSpace() && path.IndexOf(".html", StringComparison.OrdinalIgnoreCase) < 0 && CustomRegex.PostIdRegex.IsMatch(path))
+            if (path.IsNotNullAndWhiteSpace() && path.IndexOf(".html", StringComparison.OrdinalIgnoreCase) < 0 && CustomRegex.PostId().IsMatch(path))
             {
                 return RedirectPermanent($"~/{(path ?? "").Trim()}.html");
             }

diff --git a/src/ZKEACMS.Redirection/Models/UrlRedirect.cs b/src/ZKEACMS.Redirection/Models/UrlRedirect.cs
@@ -44,7 +44,7 @@ public void ParsePattern()
         {
             if (!string.IsNullOrEmpty(InComingUrl))
             {
-                _regex = new Regex(InComingUrl, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+                _regex = new Regex(InComingUrl, RegexOptions.IgnoreCase);
             }
         }
         public string GetDestinationURL(string inComingUrl)

diff --git a/src/ZKEACMS.Redirection/RedirectRouteConstraint.cs b/src/ZKEACMS.Redirection/RedirectRouteConstraint.cs
@@ -25,7 +25,7 @@ public bool Match(HttpContext httpContext, IRouter route, string routeKey, Route
             {
                 path = path.TrimEnd('/');
             }
-            if (path.IndexOf(".html", StringComparison.OrdinalIgnoreCase) < 0 && CustomRegex.PostIdRegex.IsMatch(path))
+            if (path.IndexOf(".html", StringComparison.OrdinalIgnoreCase) < 0 && CustomRegex.PostId().IsMatch(path))
             {
                 return true;
             }

diff --git a/src/ZKEACMS.SectionWidget/Controllers/SectionContentVideoController.cs b/src/ZKEACMS.SectionWidget/Controllers/SectionContentVideoController.cs
@@ -8,10 +8,11 @@
 using Microsoft.AspNetCore.Mvc;
 using Easy.Mvc.Authorize;
 using Easy.Extend;
+using System.Text.RegularExpressions;
 
 namespace ZKEACMS.SectionWidget.Controllers
 {
-    public class SectionContentVideoController : Controller
+    public partial class SectionContentVideoController : Controller
     {
         private readonly ISectionContentProviderService _sectionContentProviderService;
 
@@ -63,7 +64,28 @@ public JsonResult Delete(string Id)
 
         public ActionResult Play(string Id)
         {
-            return View(_sectionContentProviderService.GetContent(Id));
+            SectionContentVideo video = _sectionContentProviderService.GetContent(Id) as SectionContentVideo;
+            if (video == null) return NotFound();
+
+            if (video.Code.IsNotNullAndWhiteSpace())
+            {
+                video.Code = RegexVideoCodeWidth().Replace(video.Code, eva =>
+                {
+                    return $"{eva.Groups[1].Value}{eva.Groups[2].Value}{eva.Groups[3].Value}{eva.Groups[4].Value}{eva.Groups[5].Value}{video.Width}{eva.Groups[7].Value}";
+                });
+                video.Code = RegexVideoCodeHeight().Replace(video.Code, eva =>
+                {
+                    return $"{eva.Groups[1].Value}{eva.Groups[2].Value}{eva.Groups[3].Value}{eva.Groups[4].Value}{eva.Groups[5].Value}{video.Height}{eva.Groups[7].Value}";
+                });
+            }
+
+            return View(video);
         }
+
+        [GeneratedRegex("(\\s)?(width)(\\s)?([=:])(\\s)?(\\d+)(\\s)?", RegexOptions.IgnoreCase)]
+        private static partial Regex RegexVideoCodeWidth();
+
+        [GeneratedRegex("(\\s)?(height)(\\s)?([=:])(\\s)?(\\d+)(\\s)?", RegexOptions.IgnoreCase)]
+        private static partial Regex RegexVideoCodeHeight();
     }
 }
diff --git a/src/ZKEACMS.SectionWidget/Views/SectionContentVideo/Play.cshtml b/src/ZKEACMS.SectionWidget/Views/SectionContentVideo/Play.cshtml
@@ -24,12 +24,6 @@
     }
     else if (video.Code.IsNotNullAndWhiteSpace())
     {
-        video.Code = Regex.Replace(video.Code, @"("")?width("")?=("")?(\d+)("")?", "width=\"" + (video.Width ?? 798) + "\"");
-        video.Code = Regex.Replace(video.Code, @"("")?width("")?:("")?(\d+)("")?", "width:" + (video.Width ?? 798));
-
-        video.Code = Regex.Replace(video.Code, @"("")?height("")?=("")?(\d+)("")?", "height=" + (video.Height ?? 500));
-        video.Code = Regex.Replace(video.Code, @"("")?height("")?:("")?(\d+)("")?", "height:" + (video.Height ?? 500));
-
         @Html.Raw(video.Code)
     }
 </div>
diff --git a/src/ZKEACMS.Shop/Views/Basket/CheckOut.cshtml b/src/ZKEACMS.Shop/Views/Basket/CheckOut.cshtml
@@ -57,7 +57,7 @@
                                 <div class="clearfix">
                                     <div class="text-right">
                                         <span class="price">
-                                            @Html.CurrencySymbol() @Html.Raw(Regex.Replace(item.Price.ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))
+                                            @Html.CurrencySymbol() @Html.Raw(CustomRegex.DecimalPoint().Replace(item.Price.ToString("F2"), "<small>.$1</small>"))
                                             x <span class="quantity">@item.Quantity</span>
                                         </span>
                                     </div>

diff --git a/src/ZKEACMS.Shop/Views/Basket/Index.cshtml b/src/ZKEACMS.Shop/Views/Basket/Index.cshtml
@@ -39,7 +39,7 @@
                                 <div class="text-right">
                                     <span class="price">
                                         @Html.CurrencySymbol()
-                                        @Html.Raw(Regex.Replace(item.Price.ToString("F2"), @"\.(\d+)", "<small>.$1</small>"))
+                                        @Html.Raw(CustomRegex.DecimalPoint().Replace(item.Price.ToString("F2"), "<small>.$1</small>"))
                                         x <span class="quantity">@item.Quantity</span>
                                     </span>
                                     <a href="javascript:" class="remove glyphicon glyphicon-trash"></a>

diff --git a/src/ZKEACMS.SpiderLog/Models/SearchEngine.cs b/src/ZKEACMS.SpiderLog/Models/SearchEngine.cs
@@ -22,7 +22,7 @@ public bool IsMatch(string userAgent)
         {
             if (userAgent.IsNullOrEmpty()) return false;
 
-            if (_regex == null) _regex = new Regex(Regex, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            if (_regex == null) _regex = new Regex(Regex, RegexOptions.IgnoreCase);
 
             return _regex.IsMatch(userAgent);
         }