From ec98d1e275e5ed8effcaa934f9db1bd8c129168a Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 4 Dec 2024 10:13:32 -0700 Subject: [PATCH] Update to Nginx parse for default --- ADO2024/PI3/Helper-2024-09-16.cs | 43 +++++++++++--------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/ADO2024/PI3/Helper-2024-09-16.cs b/ADO2024/PI3/Helper-2024-09-16.cs index d1875fe..e689dae 100644 --- a/ADO2024/PI3/Helper-2024-09-16.cs +++ b/ADO2024/PI3/Helper-2024-09-16.cs @@ -1,57 +1,42 @@ using Microsoft.Extensions.Logging; -using System.Collections.ObjectModel; namespace File_Folder_Helper.ADO2024.PI3; internal static partial class Helper20240916 { - private static ReadOnlyCollection Get(string searchPattern, string[] configFileLines) - { - List results = []; - string[] segments; - foreach (string line in configFileLines) - { - if (line.Length < 2 || line[0] == '#') - continue; - segments = line.Split(searchPattern); - if (segments.Length < 2) - continue; - results.Add(segments[1].Split(';')[0]); - } - return results.AsReadOnly(); - } - internal static void DebugProxyPass(ILogger logger, List args) { string debug; - string enable; string[] lines; - string fileName; string[] segments; - string configFile = args[3]; + string domain = args[5]; + string includePath = args[3]; string searchPattern = args[2]; - string searchPatternB = args[4]; - string searchPatternC = args[5]; + string fileNameWithoutExtension; + string[] searchPatterns = args[4].Split('|'); string sourceDirectory = Path.GetFullPath(args[0]); - string[] configFileLines = File.ReadAllLines(configFile); - ReadOnlyCollection enabledSites = Get(searchPatternB, configFileLines); - logger.LogInformation("Found {files} file(s)", enabledSites.Count); string[] files = Directory.GetFiles(sourceDirectory, searchPattern, SearchOption.AllDirectories); logger.LogInformation("With search pattern '{SearchPattern}' found {files} file(s)", searchPattern, files.Length); foreach (string file in files) { debug = string.Empty; lines = File.ReadAllLines(file); - fileName = Path.GetFileName(file); + fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file); foreach (string line in lines) { - segments = line.Split(searchPatternC); + segments = line.Split(searchPatterns, StringSplitOptions.None); if (segments.Length < 2) continue; + if (segments[1][0] is not ' ' and not '\t') + continue; debug = segments[1].Trim(); } - enable = enabledSites.Contains(fileName) ? string.Empty : "# "; - logger.LogInformation("{enable}{searchPatternB}{fileName}; # https://{fileName}.phares.duckddns.org # {debug}", enable, searchPatternB, fileName, fileName, debug); + logger.LogInformation("{includePath}{fileNameWithoutExtension}; # https://{fileNameWithoutExtension}.{domain} # {debug}", + includePath, + fileNameWithoutExtension, + fileNameWithoutExtension, + domain, + debug); } }