From fd7fad62fbf247aa5a1ad5dc82697bea3aaa1f3c Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Tue, 17 May 2022 08:29:19 -0700 Subject: [PATCH] EDA - StoragePaths --- EDA Viewer/Singleton/Background.cs | 28 +++++-------------- .../Singleton/Helper/BackgroundEDA - A.cs | 8 +++--- .../Singleton/Helper/BackgroundEdaDCP.cs | 2 +- EDA Viewer/Singleton/Helper/Common.cs | 8 +++--- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/EDA Viewer/Singleton/Background.cs b/EDA Viewer/Singleton/Background.cs index 2cebcdb..14e4680 100644 --- a/EDA Viewer/Singleton/Background.cs +++ b/EDA Viewer/Singleton/Background.cs @@ -675,7 +675,6 @@ public class Background : Models.Properties.IBackground, IBackground, IDisposabl string? modifiedDate; string edaObjectFile; string goldDirectory; - string unitDirectory; string replace = "$$$"; string edaObjectDirectory; DateTime lastModifiedDate; @@ -791,28 +790,15 @@ public class Background : Models.Properties.IBackground, IBackground, IDisposabl { File.SetCreationTime(fileName, lastModifiedDate); File.SetLastWriteTime(fileName, lastModifiedDate); } catch (Exception) { } } - if (string.IsNullOrEmpty(configuration.Settings.StoragePath) || !Directory.Exists(Path.GetPathRoot(configuration.Settings.StoragePath))) + if (!common.StoragePaths.Any()) continue; - if (!Directory.Exists(common.StoragePath)) - _ = Directory.CreateDirectory(common.StoragePath); - if (!common.StoragePath.Contains(common.UnitName) && (common.StoragePath.Contains(@"01EquipmentIntegration") || common.StoragePath.Contains(@"02BusinessIntegration"))) + foreach (string? storagePath in common.StoragePaths) { - common.StoragePath = common.StoragePath.Replace("Traces", "Empty"); - if (!Directory.Exists(common.StoragePath)) - _ = Directory.CreateDirectory(common.StoragePath); - if (common.UnitName != "PRF01") - { - unitDirectory = string.Concat(Path.GetDirectoryName(common.StoragePath), @"\", common.UnitName); - common.StoragePath = string.Concat(unitDirectory, @"\BadPath"); - if (!Directory.Exists(common.StoragePath)) - _ = Directory.CreateDirectory(common.StoragePath); - common.StoragePath = string.Concat(unitDirectory, @"\LogFile"); - if (!Directory.Exists(common.StoragePath)) - _ = Directory.CreateDirectory(common.StoragePath); - common.StoragePath = string.Concat(unitDirectory, @"\PollPath"); - if (!Directory.Exists(common.StoragePath)) - _ = Directory.CreateDirectory(common.StoragePath); - } + if (string.IsNullOrEmpty(storagePath) || !Directory.Exists(Path.GetPathRoot(storagePath))) + continue; + if (Directory.Exists(storagePath)) + continue; + _ = Directory.CreateDirectory(storagePath); } } } diff --git a/EDA Viewer/Singleton/Helper/BackgroundEDA - A.cs b/EDA Viewer/Singleton/Helper/BackgroundEDA - A.cs index 0bb4878..2de0b53 100644 --- a/EDA Viewer/Singleton/Helper/BackgroundEDA - A.cs +++ b/EDA Viewer/Singleton/Helper/BackgroundEDA - A.cs @@ -52,7 +52,7 @@ public partial class PDSFConfigurationSettings private PDSFConfigurationSettingsTimePrevDiffSettings timePrevDiffSettingsField; - private string storagePathField; + private string[] storagePathsField; private string filenameField; @@ -122,10 +122,10 @@ public partial class PDSFConfigurationSettings } /// - public string StoragePath + public string[] StoragePaths { - get => this.storagePathField; - set => this.storagePathField = value; + get => this.storagePathsField; + set => this.storagePathsField = value; } /// diff --git a/EDA Viewer/Singleton/Helper/BackgroundEdaDCP.cs b/EDA Viewer/Singleton/Helper/BackgroundEdaDCP.cs index 3eb3a25..f89c5dd 100644 --- a/EDA Viewer/Singleton/Helper/BackgroundEdaDCP.cs +++ b/EDA Viewer/Singleton/Helper/BackgroundEdaDCP.cs @@ -40,7 +40,7 @@ public partial class Background _ = result.Append("").Append(common.ConfigurationProductiveState).AppendLine(""); _ = result.Append("").Append(common.LogisticsEquipmentAlias).AppendLine(""); _ = result.Append("").Append(common.Source).AppendLine(""); - _ = result.Append("").Append(common.StoragePath).AppendLine(""); + _ = result.Append("").Append(string.Join("
", common.StoragePaths)).AppendLine(""); _ = result.Append("").Append(common.StartTimeFormat).AppendLine(""); _ = result.Append("").Append(common.Filename).AppendLine(""); _ = result.AppendLine(""); diff --git a/EDA Viewer/Singleton/Helper/Common.cs b/EDA Viewer/Singleton/Helper/Common.cs index 0cfc99b..ead545f 100644 --- a/EDA Viewer/Singleton/Helper/Common.cs +++ b/EDA Viewer/Singleton/Helper/Common.cs @@ -14,7 +14,7 @@ public class Common // public string Filename { get; set; } public string StartTimeFormat { get; set; } - public string StoragePath { get; set; } + public string[] StoragePaths { get; set; } // public List GeneralTriggers { get; set; } public List LogisticsAttributes { get; set; } @@ -42,12 +42,12 @@ public class Common LogisticsColumns = new(); StartTriggersDCP = new(); LogisticsTriggers = new(); - StoragePath = string.Empty; LogisticsAttributes = new(); ContainerName = string.Empty; ParametersAsCsv = string.Empty; StartTimeFormat = string.Empty; ConfigurationState = string.Empty; + StoragePaths = Array.Empty(); LogisticsEquipmentAlias = string.Empty; ConfigurationProductiveState = string.Empty; LogisticsTriggersKeysKeyMapping = new Dictionary(); @@ -65,11 +65,11 @@ public class Common LogisticsColumns = new(); StartTriggersDCP = new(); LogisticsTriggers = new(); - StoragePath = string.Empty; LogisticsAttributes = new(); ParametersAsCsv = string.Empty; StartTimeFormat = string.Empty; UnitName = unitName.ToString(); + StoragePaths = Array.Empty(); LogisticsEquipmentAlias = string.Empty; ContainerName = containerName.ToString(); ConfigurationState = configurationState.ToString(); @@ -80,7 +80,7 @@ public class Common public void Update(PDSFConfiguration configuration) { - StoragePath = configuration.Settings.StoragePath; + StoragePaths = configuration.Settings.StoragePaths; StartTimeFormat = configuration.Settings.StartTimeFormat; Filename = configuration.Settings.Filename; //