pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: adds condition to handle legacy and current portal URL structures and adds null check for getting list types in basic config helper methods

Browse Source
This commit is contained in:
Neil Dorin
2024-08-26 12:47:31 -06:00
parent 941e537d53
commit 90251d92df
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/PepperDash.Essentials.Core/Config/BasicConfig.cs
View File

@@ -55,7 +55,7 @@ namespace PepperDash.Essentials.Core.Config
/// </summary> /// </summary>
public Dictionary<string, SourceListItem> GetSourceListForKey(string key) public Dictionary<string, SourceListItem> GetSourceListForKey(string key)
{ {
if (string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key)) if (SourceLists == null || string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key))
return null; return null;
return SourceLists[key]; return SourceLists[key];
@@ -68,7 +68,7 @@ namespace PepperDash.Essentials.Core.Config
/// <returns>DestinationList if the key exists, null otherwise</returns> /// <returns>DestinationList if the key exists, null otherwise</returns>
public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key) public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
{ {
if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key)) if (DestinationLists == null || string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
{ {
return null; return null;
} }
@@ -83,7 +83,7 @@ namespace PepperDash.Essentials.Core.Config
/// <returns>AudioControlPointList if the key exists, null otherwise</returns> /// <returns>AudioControlPointList if the key exists, null otherwise</returns>
public AudioControlPointListItem GetAudioControlPointListForKey(string key) public AudioControlPointListItem GetAudioControlPointListForKey(string key)
{ {
if (string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key)) if (AudioControlPointLists == null || string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
return null; return null;
return AudioControlPointLists[key]; return AudioControlPointLists[key];
@@ -94,7 +94,7 @@ namespace PepperDash.Essentials.Core.Config
/// </summary> /// </summary>
public Dictionary<string, CameraListItem> GetCameraListForKey(string key) public Dictionary<string, CameraListItem> GetCameraListForKey(string key)
{ {
if (string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key)) if (CameraLists == null || string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
return null; return null;
return CameraLists[key]; return CameraLists[key];

30
src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
View File

@@ -31,9 +31,17 @@ namespace PepperDash.Essentials.Core.Config
if (string.IsNullOrEmpty(SystemUrl)) if (string.IsNullOrEmpty(SystemUrl))
return "missing url"; return "missing url";
var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*"); if (SystemUrl.Contains("#"))
string uuid = result.Groups[1].Value; {
return uuid; var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
string uuid = result.Groups[1].Value;
return uuid;
} else
{
var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
string uuid = result.Groups[1].Value;
return uuid;
}
} }
} }
@@ -44,10 +52,18 @@ namespace PepperDash.Essentials.Core.Config
{ {
if (string.IsNullOrEmpty(TemplateUrl)) if (string.IsNullOrEmpty(TemplateUrl))
return "missing template url"; return "missing template url";
var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*"); if (TemplateUrl.Contains("#"))
string uuid = result.Groups[1].Value; {
return uuid; var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
string uuid = result.Groups[1].Value;
return uuid;
} else
{
var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
string uuid = result.Groups[2].Value;
return uuid;
}
} }
} }