Merge pull request #10 from brminnick/Exclude-Code-Blocks

TheCodeTraveler · web-flow · commit 20838c7f3cbd · 2020-10-09T14:07:46.000-07:00
Exclude Markdown Code Blocks + Markdown Code Snippets
diff --git a/GitHubReadmeWebTrends.Console/GitHubReadmeWebTrends.Console.csproj b/GitHubReadmeWebTrends.Console/GitHubReadmeWebTrends.Console.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GitHubReadmeWebTrends.Functions\GitHubReadmeWebTrends.Functions.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
+  </ItemGroup>
+</Project>
diff --git a/GitHubReadmeWebTrends.Console/Program.cs b/GitHubReadmeWebTrends.Console/Program.cs
@@ -0,0 +1,14 @@
+﻿using Microsoft.Extensions.Logging;
+
+namespace GitHubReadmeWebTrends.Console
+{
+    class Program
+    {
+        readonly static ILogger _log = LoggerFactory.Create(builder => builder.AddConsole()).CreateLogger(nameof(Console));
+
+        static void Main(string[] args)
+        {
+
+        }
+    }
+}
diff --git a/GitHubReadmeWebTrends.Functions/Functions/GetAdvocatesForPowerBIDashboard.cs b/GitHubReadmeWebTrends.Functions/Functions/GetAdvocatesForPowerBIDashboard.cs
@@ -10,7 +10,7 @@
 
 namespace GitHubReadmeWebTrends.Functions
 {
-    class GetAdvocatesForPowerBIDashboard
+    public class GetAdvocatesForPowerBIDashboard
     {
         readonly YamlService _yamlService;
         readonly CloudAdvocateService _cloudAdvocateService;
diff --git a/GitHubReadmeWebTrends.Functions/Functions/GetAdvocatesFunction.cs b/GitHubReadmeWebTrends.Functions/Functions/GetAdvocatesFunction.cs
@@ -9,7 +9,7 @@
 
 namespace GitHubReadmeWebTrends.Functions
 {
-    class GetAdvocatesFunction
+    public class GetAdvocatesFunction
     {
         const string _runOncePerMonth = "0 0 0 5 * *";
 
diff --git a/GitHubReadmeWebTrends.Functions/Functions/GetGitHubReposFunction.cs b/GitHubReadmeWebTrends.Functions/Functions/GetGitHubReposFunction.cs
@@ -5,7 +5,7 @@
 
 namespace GitHubReadmeWebTrends.Functions
 {
-    class GetGitHubReposFunction
+    public class GetGitHubReposFunction
     {
         readonly GitHubGraphQLApiService _gitHubGraphQLApiService;
 
diff --git a/GitHubReadmeWebTrends.Functions/Functions/GetReadmeFunction.cs b/GitHubReadmeWebTrends.Functions/Functions/GetReadmeFunction.cs
@@ -9,7 +9,7 @@
 
 namespace GitHubReadmeWebTrends.Functions
 {
-    class GetReadmeFunction
+    public class GetReadmeFunction
     {
         const string _runEveryHour = "0 0 * * * *";
 
diff --git a/GitHubReadmeWebTrends.Functions/Functions/OpenPullRequestFunction.cs b/GitHubReadmeWebTrends.Functions/Functions/OpenPullRequestFunction.cs
@@ -8,7 +8,7 @@
 
 namespace GitHubReadmeWebTrends.Functions
 {
-    class OpenPullRequestFunction
+    public class OpenPullRequestFunction
     {
         readonly static string _backupEmailAddress = Environment.GetEnvironmentVariable("BackupEmailAddress") ?? string.Empty;
 
diff --git a/GitHubReadmeWebTrends.Functions/Functions/VerifyWebTrendsFunction.cs b/GitHubReadmeWebTrends.Functions/Functions/VerifyWebTrendsFunction.cs
@@ -11,7 +11,7 @@
 namespace GitHubReadmeWebTrends.Functions
 {
     //Inspired by https://github.com/spboyer/ca-readme-tracking-links-action/
-    static class VerifyWebTrendsFunction
+    public static class VerifyWebTrendsFunction
     {
         const string _webTrendsQueryKey = "WT.mc_id";
 
@@ -23,7 +23,8 @@ static class VerifyWebTrendsFunction
             "azure.com"
         };
 
-        static readonly Regex _urlRegex = new Regex(@"(((http|ftp|https):\/\/)+[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:\/~\+#]*[\w\-\@?^=%&amp;\/~\+#])?)");
+        //https://stackoverflow.com/a/64286141/5953643
+        static readonly Regex _urlRegex = new Regex(@"(?<!`)(`(?:`{2})?)(?:(?!\1).)*?\1|((?:ht|f)tps?:\/\/[\w-]+(?>\.[\w-]+)+(?:[\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?)");
         static readonly Regex _localeRegex = new Regex("^/\\w{2}-\\w{2}");
 
         [FunctionName(nameof(VerifyWebTrendsFunction))]
@@ -34,7 +35,10 @@ public static void Run([QueueTrigger(QueueConstants.VerifyWebTrendsQueue)] (Repo
 
             var (repository, gitHubUser) = data;
 
-            var updatedReadme = _urlRegex.Replace(repository.ReadmeText, x => AppendTrackingInfo(x.Groups[0].Value, repository.Name.Replace(".", "").Replace("-", "").ToLower(), "github", gitHubUser.MicrosoftAlias));
+            var updatedReadme = _urlRegex.Replace(repository.ReadmeText,
+                                                    x => x.Groups[2].Success
+                                                        ? UpdateUrl(x.Groups[0].Value, repository.Name.Replace(".", "").Replace("-", "").ToLower(), "github", gitHubUser.MicrosoftAlias)
+                                                        : x.Value);
 
             if (!updatedReadme.Equals(repository.ReadmeText))
             {
@@ -45,7 +49,7 @@ public static void Run([QueueTrigger(QueueConstants.VerifyWebTrendsQueue)] (Repo
             log.LogInformation($"{nameof(VerifyWebTrendsFunction)} Completed");
         }
 
-        static string AppendTrackingInfo(in string link, in string eventName, in string channel, in string alias)
+        static string UpdateUrl(in string link, in string eventName, in string channel, in string alias)
         {
             foreach (var domain in _microsoftDomainsList)
             {
diff --git a/GitHubReadmeWebTrends.Functions/Models/CloudAdvocatePowerBIModel.cs b/GitHubReadmeWebTrends.Functions/Models/CloudAdvocatePowerBIModel.cs
@@ -2,7 +2,7 @@
 
 namespace GitHubReadmeWebTrends.Functions
 {
-    class CloudAdvocatePowerBIModel
+    public class CloudAdvocatePowerBIModel
     {
         public CloudAdvocatePowerBIModel(string name, string alias, Uri gitHub, Uri twitter, Uri linkedIn)
         {
diff --git a/GitHubReadmeWebTrends.sln b/GitHubReadmeWebTrends.sln
@@ -8,6 +8,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubReadmeWebTrends.Commo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHubReadmeWebTrends.Website", "GitHubReadmeWebTrends.Website\GitHubReadmeWebTrends.Website.csproj", "{67710356-35FB-48E8-BF21-073F2796589F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHubReadmeWebTrends.Console", "GitHubReadmeWebTrends.Console\GitHubReadmeWebTrends.Console.csproj", "{0FCD9913-E1D5-4843-B258-E2FAE2C4E9B2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -26,6 +28,10 @@ Global
 		{67710356-35FB-48E8-BF21-073F2796589F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67710356-35FB-48E8-BF21-073F2796589F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67710356-35FB-48E8-BF21-073F2796589F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FCD9913-E1D5-4843-B258-E2FAE2C4E9B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FCD9913-E1D5-4843-B258-E2FAE2C4E9B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FCD9913-E1D5-4843-B258-E2FAE2C4E9B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FCD9913-E1D5-4843-B258-E2FAE2C4E9B2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace GitHubReadmeWebTrends.Functions`
`12`	`12`	`{`
`13`		`- class GetAdvocatesForPowerBIDashboard`
	`13`	`+ public class GetAdvocatesForPowerBIDashboard`
`14`	`14`	`{`
`15`	`15`	`readonly YamlService _yamlService;`
`16`	`16`	`readonly CloudAdvocateService _cloudAdvocateService;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace GitHubReadmeWebTrends.Functions`
`11`	`11`	`{`
`12`		`- class GetAdvocatesFunction`
	`12`	`+ public class GetAdvocatesFunction`
`13`	`13`	`{`
`14`	`14`	`const string _runOncePerMonth = "0 0 0 5 * *";`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace GitHubReadmeWebTrends.Functions`
`7`	`7`	`{`
`8`		`- class GetGitHubReposFunction`
	`8`	`+ public class GetGitHubReposFunction`
`9`	`9`	`{`
`10`	`10`	`readonly GitHubGraphQLApiService _gitHubGraphQLApiService;`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace GitHubReadmeWebTrends.Functions`
`10`	`10`	`{`
`11`		`- class OpenPullRequestFunction`
	`11`	`+ public class OpenPullRequestFunction`
`12`	`12`	`{`
`13`	`13`	`readonly static string _backupEmailAddress = Environment.GetEnvironmentVariable("BackupEmailAddress") ?? string.Empty;`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`namespace GitHubReadmeWebTrends.Functions`
`12`	`12`	`{`
`13`	`13`	`//Inspired by https://github.com/spboyer/ca-readme-tracking-links-action/`
`14`		`- static class VerifyWebTrendsFunction`
	`14`	`+ public static class VerifyWebTrendsFunction`
`15`	`15`	`{`
`16`	`16`	`const string _webTrendsQueryKey = "WT.mc_id";`
`17`	`17`
`@@ -23,7 +23,8 @@ static class VerifyWebTrendsFunction`
`23`	`23`	`"azure.com"`
`24`	`24`	`};`
`25`	`25`
`26`		`- static readonly Regex _urlRegex = new Regex(@"(((http\|ftp\|https):\/\/)+[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?)");`
	`26`	`+ //https://stackoverflow.com/a/64286141/5953643`
	`27`	+ static readonly Regex _urlRegex = new Regex(@"(?<!`)(`(?:`{2})?)(?:(?!\1).)?\1\|((?:ht\|f)tps?:\/\/[\w-]+(?>\.[\w-]+)+(?:[\w.,@?^=%&:/~+#-][\w@?^=%&/~+#-])?)");
`27`	`28`	`static readonly Regex _localeRegex = new Regex("^/\\w{2}-\\w{2}");`
`28`	`29`
`29`	`30`	`[FunctionName(nameof(VerifyWebTrendsFunction))]`
`@@ -34,7 +35,10 @@ public static void Run([QueueTrigger(QueueConstants.VerifyWebTrendsQueue)] (Repo`
`34`	`35`
`35`	`36`	`var (repository, gitHubUser) = data;`
`36`	`37`
`37`		`- var updatedReadme = _urlRegex.Replace(repository.ReadmeText, x => AppendTrackingInfo(x.Groups[0].Value, repository.Name.Replace(".", "").Replace("-", "").ToLower(), "github", gitHubUser.MicrosoftAlias));`
	`38`	`+ var updatedReadme = _urlRegex.Replace(repository.ReadmeText,`
	`39`	`+ x => x.Groups[2].Success`
	`40`	`+ ? UpdateUrl(x.Groups[0].Value, repository.Name.Replace(".", "").Replace("-", "").ToLower(), "github", gitHubUser.MicrosoftAlias)`
	`41`	`+ : x.Value);`
`38`	`42`
`39`	`43`	`if (!updatedReadme.Equals(repository.ReadmeText))`
`40`	`44`	`{`
`@@ -45,7 +49,7 @@ public static void Run([QueueTrigger(QueueConstants.VerifyWebTrendsQueue)] (Repo`
`45`	`49`	`log.LogInformation($"{nameof(VerifyWebTrendsFunction)} Completed");`
`46`	`50`	`}`
`47`	`51`
`48`		`- static string AppendTrackingInfo(in string link, in string eventName, in string channel, in string alias)`
	`52`	`+ static string UpdateUrl(in string link, in string eventName, in string channel, in string alias)`
`49`	`53`	`{`
`50`	`54`	`foreach (var domain in _microsoftDomainsList)`
`51`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GitHubReadmeWebTrends.Functions`
`4`	`4`	`{`
`5`		`- class CloudAdvocatePowerBIModel`
	`5`	`+ public class CloudAdvocatePowerBIModel`
`6`	`6`	`{`
`7`	`7`	`public CloudAdvocatePowerBIModel(string name, string alias, Uri gitHub, Uri twitter, Uri linkedIn)`
`8`	`8`	`{`