From c06b57a5f91047588f175fb4012356f6bf929500 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 18 Nov 2025 12:30:54 -0600 Subject: [PATCH] fix: check for multiple URL patterns for both template & system URLS --- .../Config/Essentials/EssentialsConfig.cs | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs index b08f458c7..6ffe07d2b 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs @@ -36,21 +36,29 @@ public string SystemUuid { get { - if (string.IsNullOrEmpty(SystemUrl)) - return "missing url"; + string uuid; - if (SystemUrl.Contains("#")) + if (string.IsNullOrEmpty(SystemUrl)) + { + uuid = "missing url"; + } + else if (SystemUrl.Contains("#")) { var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*"); - string uuid = result.Groups[1].Value; - return uuid; + uuid = result.Groups[1].Value; } - else + else if (SystemUrl.Contains("detail")) { var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/detail\/(.*)\/.*"); - string uuid = result.Groups[1].Value; - return uuid; + uuid = result.Groups[1].Value; } + else + { + var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*"); + uuid = result.Groups[1].Value; + } + + return uuid; } } @@ -62,21 +70,29 @@ public string TemplateUuid { get { - if (string.IsNullOrEmpty(TemplateUrl)) - return "missing template url"; + string uuid; - if (TemplateUrl.Contains("#")) + if (string.IsNullOrEmpty(TemplateUrl)) + { + uuid = "missing template url"; + } + else if (TemplateUrl.Contains("#")) { var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*"); - string uuid = result.Groups[1].Value; - return uuid; + uuid = result.Groups[1].Value; } - else + else if (TemplateUrl.Contains("detail")) { var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/detail\/(.*)\/system-template-versions\/detail\/(.*)\/.*"); - string uuid = result.Groups[2].Value; - return uuid; + uuid = result.Groups[2].Value; } + else + { + var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*"); + uuid = result.Groups[2].Value; + } + + return uuid; } }