Enhanced Post.FirstImgSrc method to really find the first image in the content using regular expressions.

jmalarcon · jmalarcon · commit bdbe49edfa31 · 2017-12-06T13:08:08.000+01:00
The previous code didn't find images with styls or other attributes and that was a problem.
Bumped minor version to reflect change.
diff --git a/BlogEngine/BlogEngine.Core/Post.cs b/BlogEngine/BlogEngine.Core/Post.cs
@@ -8,6 +8,7 @@
     using System.Linq;
     using System.Net.Mail;
     using System.Text;
+    using System.Text.RegularExpressions;
     using System.Web;
 
     using BlogEngine.Core.Data.Models;
@@ -694,28 +695,27 @@ public bool IsVisibleToPublic
         }
 
         /// <summary>
-        /// URL of the first image in the post, if any
+        /// URL of the first image in the post, if any.
+        /// If there's no first image, returns the URL to "images/defaultImg.jpg" in the current theme used in the blog
         /// </summary>
         public string FirstImgSrc
         {
             get
             {
-                int idx = Content.IndexOf("<img src=");
-                if (idx > 0)
+                string srcValue = null;
+                if (!string.IsNullOrEmpty(content))
                 {
-                    try
+                    Match match = Regex.Match(content, @"<img\s+?.*?src=('|"")(.*?)\1.*?>", RegexOptions.Multiline | RegexOptions.IgnoreCase);
+                    if (match.Success)
                     {
-                        idx = idx + 10;
-                        var idxEnd = Content.IndexOf("\"", idx);
-                        if (idxEnd > idx)
-                        {
-                            var len = idxEnd - idx;
-                            return Content.Substring(idx, len);
-                        }
+                        srcValue = match.Groups[2].Value;
                     }
-                    catch (Exception) { }
                 }
-                return "";
+                if (string.IsNullOrEmpty(srcValue))
+                {
+                    srcValue = Utils.RelativeWebRoot + "Custom/Themes/" + BlogSettings.Instance.Theme + "/images/defaultImg.jpg";
+                }
+                return srcValue;
             }
         }
 
diff --git a/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs b/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs
@@ -13,11 +13,11 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BlogEngine.NET")]
-[assembly: AssemblyCopyright("Copyright @ 2007-2016")]
+[assembly: AssemblyCopyright("Copyright @ 2007-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 [assembly: AllowPartiallyTrustedCallers]
-[assembly: AssemblyVersion("3.3.5.0")]
+[assembly: AssemblyVersion("3.3.6.0")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Linq;`
`9`	`9`	`using System.Net.Mail;`
`10`	`10`	`using System.Text;`
	`11`	`+ using System.Text.RegularExpressions;`
`11`	`12`	`using System.Web;`
`12`	`13`
`13`	`14`	`using BlogEngine.Core.Data.Models;`
`@@ -694,28 +695,27 @@ public bool IsVisibleToPublic`
`694`	`695`	`}`
`695`	`696`
`696`	`697`	`/// <summary>`
`697`		`- /// URL of the first image in the post, if any`
	`698`	`+ /// URL of the first image in the post, if any.`
	`699`	`+ /// If there's no first image, returns the URL to "images/defaultImg.jpg" in the current theme used in the blog`
`698`	`700`	`/// </summary>`
`699`	`701`	`public string FirstImgSrc`
`700`	`702`	`{`
`701`	`703`	`get`
`702`	`704`	`{`
`703`		`- int idx = Content.IndexOf("<img src="proxy.php?url=https%3A%2F%2Fgithub.com%2Ftestingkaspro%2FBlogEngine.NET%2Fcommit%2F%3C%2Fspan%3E%3Cspan+class%3D"pl-kos x x-last">);`
`704`		`- if (idx > 0)`
	`705`	`+ string srcValue = null;`
	`706`	`+ if (!string.IsNullOrEmpty(content))`
`705`	`707`	`{`
`706`		`- try`
	`708`	`+ Match match = Regex.Match(content, @"<img\s+?.?src=('\|"")(.?)\1.*?>", RegexOptions.Multiline \| RegexOptions.IgnoreCase);`
	`709`	`+ if (match.Success)`
`707`	`710`	`{`
`708`		`- idx = idx + 10;`
`709`		`- var idxEnd = Content.IndexOf("\"", idx);`
`710`		`- if (idxEnd > idx)`
`711`		`- {`
`712`		`- var len = idxEnd - idx;`
`713`		`- return Content.Substring(idx, len);`
`714`		`- }`
	`711`	`+ srcValue = match.Groups[2].Value;`
`715`	`712`	`}`
`716`		`- catch (Exception) { }`
`717`	`713`	`}`
`718`		`- return "";`
	`714`	`+ if (string.IsNullOrEmpty(srcValue))`
	`715`	`+ {`
	`716`	`+ srcValue = Utils.RelativeWebRoot + "Custom/Themes/" + BlogSettings.Instance.Theme + "/images/defaultImg.jpg";`
	`717`	`+ }`
	`718`	`+ return srcValue;`
`719`	`719`	`}`
`720`	`720`	`}`
`721`	`721`