From fb6da004c78170a3672875ab81e2b03252ff29ab Mon Sep 17 00:00:00 2001 From: "phares@iscn5cg20977xq" Date: Sun, 23 Nov 2025 11:02:04 -0700 Subject: [PATCH] Refactor file handlers and add new log file processing classes - Added DFUniqueLog and EAFUniqueLog file handlers to support unique log file processing. - Introduced Error, Info, Notification, Unit, and Warn file handlers for enhanced logging capabilities. - Updated project file to include new file handler classes. - Ensured all new classes implement IFileRead interface for consistency. - Improved file moving logic to handle unique naming conventions and directory structures. --- .../CellInstanceConnectionName.cs | 10 +- .../FileHandlers/DFUniqueLog/FileRead.cs | 177 ++++++++++++++++++ Adaptation/FileHandlers/Dummy/FileRead.cs | 4 +- .../FileHandlers/EAFUniqueLog/FileRead.cs | 177 ++++++++++++++++++ .../FileHandlers/{Log => Error}/FileRead.cs | 20 +- .../FileHandlers/{EAFLog => Info}/FileRead.cs | 4 +- Adaptation/FileHandlers/LogFile/FileRead.cs | 2 +- .../FileHandlers/Notification/FileRead.cs | 114 +++++++++++ Adaptation/FileHandlers/Source/FileRead.cs | 2 +- .../{EAFLog20 => Unit}/FileRead.cs | 4 +- Adaptation/FileHandlers/Warn/FileRead.cs | 114 +++++++++++ Adaptation/Shared/Logistics.cs | 27 +++ DEP08CEPIEPSILON.csproj | 10 +- 13 files changed, 633 insertions(+), 32 deletions(-) create mode 100644 Adaptation/FileHandlers/DFUniqueLog/FileRead.cs create mode 100644 Adaptation/FileHandlers/EAFUniqueLog/FileRead.cs rename Adaptation/FileHandlers/{Log => Error}/FileRead.cs (84%) rename Adaptation/FileHandlers/{EAFLog => Info}/FileRead.cs (97%) create mode 100644 Adaptation/FileHandlers/Notification/FileRead.cs rename Adaptation/FileHandlers/{EAFLog20 => Unit}/FileRead.cs (97%) create mode 100644 Adaptation/FileHandlers/Warn/FileRead.cs diff --git a/Adaptation/FileHandlers/CellInstanceConnectionName.cs b/Adaptation/FileHandlers/CellInstanceConnectionName.cs index 18d1665..84256c6 100644 --- a/Adaptation/FileHandlers/CellInstanceConnectionName.cs +++ b/Adaptation/FileHandlers/CellInstanceConnectionName.cs @@ -14,12 +14,14 @@ public class CellInstanceConnectionName IFileRead result = cellInstanceConnectionName switch { nameof(Aggregation) => new Aggregation.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(DFUniqueLog) => new DFUniqueLog.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(Dummy) => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), - nameof(EAFLog) => new EAFLog.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), - nameof(EAFLog20) => new EAFLog20.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(EAFUniqueLog) => new EAFUniqueLog.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(Error) => new Error.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(InfinityQS) => new InfinityQS.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), - nameof(Log) => new Log.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(Info) => new Info.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(LogFile) => new LogFile.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(Notification) => new Notification.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(R2) => new R2.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(R3) => new R3.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(R4) => new R4.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), @@ -28,6 +30,8 @@ public class CellInstanceConnectionName nameof(R7) => new R7.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(Source) => new Source.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), nameof(StatusQueryV2InstanceStatuses) => new StatusQueryV2InstanceStatuses.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(Unit) => new Unit.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), + nameof(Warn) => new Warn.FileRead(smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null), _ => throw new Exception($"\"{cellInstanceConnectionName}\" not mapped") }; return result; diff --git a/Adaptation/FileHandlers/DFUniqueLog/FileRead.cs b/Adaptation/FileHandlers/DFUniqueLog/FileRead.cs new file mode 100644 index 0000000..2dbf6d0 --- /dev/null +++ b/Adaptation/FileHandlers/DFUniqueLog/FileRead.cs @@ -0,0 +1,177 @@ +using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; +using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; +using Adaptation.Shared; +using Adaptation.Shared.Duplicator; +using Adaptation.Shared.Methods; +using log4net; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Text.Json; + +namespace Adaptation.FileHandlers.DFUniqueLog; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + } + + void IFileRead.Move(Tuple> extractResults, Exception exception) + { + bool isErrorFile = exception is not null; + if (!isErrorFile && !string.IsNullOrEmpty(_Logistics.ReportFullPath)) + { + FileInfo fileInfo = new(_Logistics.ReportFullPath); + if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) + File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime); + } + Move(extractResults); + } + + void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); + + string IFileRead.GetEventDescription() + { + string result = _Description.GetEventDescription(); + return result; + } + + List IFileRead.GetHeaderNames() + { + List results = _Description.GetHeaderNames(); + return results; + } + + string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) + { + string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); + return results; + } + + JsonProperty[] IFileRead.GetDefault() + { + JsonProperty[] results = _Description.GetDefault(this, _Logistics); + return results; + } + + Dictionary IFileRead.GetDisplayNamesJsonElement() + { + Dictionary results = _Description.GetDisplayNamesJsonElement(this); + return results; + } + + List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) + { + List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); + return results; + } + + Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) + { + Tuple> results; + if (string.IsNullOrEmpty(eventName)) + throw new Exception(); + _ReportFullPath = reportFullPath; + DateTime dateTime = DateTime.Now; + results = GetExtractResult(reportFullPath, dateTime); + if (results.Item3 is null) + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); + if (results.Item3.Length > 0 && _IsEAFHosted) + WritePDSF(this, results.Item3); + UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); + return results; + } + + Tuple> IFileRead.ReExtract() + { + Tuple> results; + List headerNames = _Description.GetHeaderNames(); + Dictionary keyValuePairs = _Description.GetDisplayNamesJsonElement(this); + results = ReExtract(this, headerNames, keyValuePairs); + return results; + } + + private static void Move(ILog log, string targetFileLocation, FileInfo fileInfo) + { + string check; + string checkFile; + string checkPath; + bool found = false; + DateTime lastDate = DateTime.MinValue; + DateTime firstDate = DateTime.MinValue; + const string searchString = "S1F4 W-Bit"; + string[] segments = fileInfo.Name.Split('_'); + string key = searchString.ToLower().Split(' ')[0]; + string[] lines = File.ReadAllLines(fileInfo.FullName); + const string dateTimeFormat = "yyyy-MM-dd HH:mm:ss,fff"; + string directoryName = fileInfo.Directory?.Name ?? throw new Exception("Directory name not found"); + string destinationDirectory = Path.Combine(targetFileLocation, directoryName); + string destinationDirectoryB = Path.Combine(destinationDirectory, "DUP"); + if (segments.Length < 2) + throw new Exception($"File name '{fileInfo.Name}' is not in the expected format."); + string app = segments[0]; + string level = segments[1].Split('.')[0].ToLower(); + if (!Directory.Exists(destinationDirectory)) + _ = Directory.CreateDirectory(destinationDirectory); + foreach (string line in lines) + { + if (!found && line.Contains(searchString)) + found = true; + if (line.Length < dateTimeFormat.Length) + continue; + check = line.Substring(0, dateTimeFormat.Length); + if (!DateTime.TryParseExact(check, dateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime logDate)) + continue; + if (firstDate == DateTime.MinValue) + firstDate = logDate; + lastDate = logDate; + } + if (!found) + checkFile = $"{app}_{directoryName}_{firstDate:yyyy-MM-dd_HH-mm-ss}---{lastDate:yyyy-MM-dd_HH-mm-ss}.{level}"; + else + checkFile = $"{app}_{directoryName}_{firstDate:yyyy-MM-dd_HH-mm-ss}---{lastDate:yyyy-MM-dd_HH-mm-ss}~~~{key}.{level}"; + checkPath = Path.Combine(destinationDirectory, checkFile); + if (!File.Exists(checkPath)) + { + log.Info($"rename to '{checkPath}'"); + File.Move(fileInfo.FullName, checkPath); + File.SetLastWriteTime(checkPath, lastDate); + } + else + { + if (!Directory.Exists(destinationDirectoryB)) + _ = Directory.CreateDirectory(destinationDirectoryB); + checkPath = Path.Combine(destinationDirectoryB, checkFile); + if (File.Exists(checkPath)) + throw new Exception($"Both '{fileInfo.FullName}' and '{checkPath}' exist."); + log.Info($"rename to '{checkPath}'"); + File.Move(fileInfo.FullName, checkPath); + File.SetLastWriteTime(checkPath, lastDate); + } + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime _) + { + Tuple> results = new(string.Empty, null, null, new List()); + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; + ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); + _Logistics = new Logistics(reportFullPath, processDataStandardFormat); + SetFileParameterLotIDToLogisticsMID(); + if (_FileConnectorConfiguration.PostProcessingMode == FileConnectorConfiguration.PostProcessingModeEnum.Move) + Move(_Log, _FileConnectorConfiguration.TargetFileLocation, _Logistics.FileInfo); + results.Item4.Add(_Logistics.FileInfo); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/Dummy/FileRead.cs b/Adaptation/FileHandlers/Dummy/FileRead.cs index 3b777eb..e87c842 100644 --- a/Adaptation/FileHandlers/Dummy/FileRead.cs +++ b/Adaptation/FileHandlers/Dummy/FileRead.cs @@ -97,9 +97,9 @@ public class FileRead : Shared.FileRead, IFileRead private void CallbackInProcessCleared(string sourceArchiveFile, string traceDummyFile, string targetFileLocation, string monARessource, string inProcessDirectory, long sequence, bool warning) { - const string site = "sjc"; + const string site = "els"; string stateName = string.Concat("Dummy_", _EventName); - const string monInURL = "http://moninhttp.sjc.infineon.com/input/text"; + const string monInURL = $"http://moninhttp.{site}.infineon.com/input/text"; MonIn monIn = MonIn.GetInstance(monInURL); try { diff --git a/Adaptation/FileHandlers/EAFUniqueLog/FileRead.cs b/Adaptation/FileHandlers/EAFUniqueLog/FileRead.cs new file mode 100644 index 0000000..e54f82c --- /dev/null +++ b/Adaptation/FileHandlers/EAFUniqueLog/FileRead.cs @@ -0,0 +1,177 @@ +using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; +using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; +using Adaptation.Shared; +using Adaptation.Shared.Duplicator; +using Adaptation.Shared.Methods; +using log4net; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Text.Json; + +namespace Adaptation.FileHandlers.EAFUniqueLog; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + } + + void IFileRead.Move(Tuple> extractResults, Exception exception) + { + bool isErrorFile = exception is not null; + if (!isErrorFile && !string.IsNullOrEmpty(_Logistics.ReportFullPath)) + { + FileInfo fileInfo = new(_Logistics.ReportFullPath); + if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) + File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime); + } + Move(extractResults); + } + + void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); + + string IFileRead.GetEventDescription() + { + string result = _Description.GetEventDescription(); + return result; + } + + List IFileRead.GetHeaderNames() + { + List results = _Description.GetHeaderNames(); + return results; + } + + string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) + { + string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); + return results; + } + + JsonProperty[] IFileRead.GetDefault() + { + JsonProperty[] results = _Description.GetDefault(this, _Logistics); + return results; + } + + Dictionary IFileRead.GetDisplayNamesJsonElement() + { + Dictionary results = _Description.GetDisplayNamesJsonElement(this); + return results; + } + + List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) + { + List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); + return results; + } + + Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) + { + Tuple> results; + if (string.IsNullOrEmpty(eventName)) + throw new Exception(); + _ReportFullPath = reportFullPath; + DateTime dateTime = DateTime.Now; + results = GetExtractResult(reportFullPath, dateTime); + if (results.Item3 is null) + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); + if (results.Item3.Length > 0 && _IsEAFHosted) + WritePDSF(this, results.Item3); + UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); + return results; + } + + Tuple> IFileRead.ReExtract() + { + Tuple> results; + List headerNames = _Description.GetHeaderNames(); + Dictionary keyValuePairs = _Description.GetDisplayNamesJsonElement(this); + results = ReExtract(this, headerNames, keyValuePairs); + return results; + } + + private static void Move(ILog log, string targetFileLocation, FileInfo fileInfo) + { + string check; + string checkFile; + string checkPath; + bool found = false; + DateTime lastDate = DateTime.MinValue; + DateTime firstDate = DateTime.MinValue; + const string searchString = "S1F4 W-Bit"; + string[] segments = fileInfo.Name.Split('_'); + string key = searchString.ToLower().Split(' ')[0]; + string[] lines = File.ReadAllLines(fileInfo.FullName); + const string dateTimeFormat = "yyyy-MM-dd HH:mm:ss,fff"; + string directoryName = fileInfo.Directory?.Name ?? throw new Exception("Directory name not found"); + string destinationDirectory = Path.Combine(targetFileLocation, directoryName); + string destinationDirectoryB = Path.Combine(destinationDirectory, "DUP"); + if (segments.Length < 2) + throw new Exception($"File name '{fileInfo.Name}' is not in the expected format."); + string app = segments[0]; + string level = segments[1].Split('.')[0].ToLower(); + if (!Directory.Exists(destinationDirectory)) + _ = Directory.CreateDirectory(destinationDirectory); + foreach (string line in lines) + { + if (!found && line.Contains(searchString)) + found = true; + if (line.Length < dateTimeFormat.Length) + continue; + check = line.Substring(0, dateTimeFormat.Length); + if (!DateTime.TryParseExact(check, dateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime logDate)) + continue; + if (firstDate == DateTime.MinValue) + firstDate = logDate; + lastDate = logDate; + } + if (!found) + checkFile = $"{app}_{directoryName}_{firstDate:yyyy-MM-dd_HH-mm-ss}---{lastDate:yyyy-MM-dd_HH-mm-ss}.{level}"; + else + checkFile = $"{app}_{directoryName}_{firstDate:yyyy-MM-dd_HH-mm-ss}---{lastDate:yyyy-MM-dd_HH-mm-ss}~~~{key}.{level}"; + checkPath = Path.Combine(destinationDirectory, checkFile); + if (!File.Exists(checkPath)) + { + log.Info($"rename to '{checkPath}'"); + File.Move(fileInfo.FullName, checkPath); + File.SetLastWriteTime(checkPath, lastDate); + } + else + { + if (!Directory.Exists(destinationDirectoryB)) + _ = Directory.CreateDirectory(destinationDirectoryB); + checkPath = Path.Combine(destinationDirectoryB, checkFile); + if (File.Exists(checkPath)) + throw new Exception($"Both '{fileInfo.FullName}' and '{checkPath}' exist."); + log.Info($"rename to '{checkPath}'"); + File.Move(fileInfo.FullName, checkPath); + File.SetLastWriteTime(checkPath, lastDate); + } + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime _) + { + Tuple> results = new(string.Empty, null, null, new List()); + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; + ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); + _Logistics = new Logistics(reportFullPath, processDataStandardFormat); + SetFileParameterLotIDToLogisticsMID(); + if (_FileConnectorConfiguration.PostProcessingMode == FileConnectorConfiguration.PostProcessingModeEnum.Move) + Move(_Log, _FileConnectorConfiguration.TargetFileLocation, _Logistics.FileInfo); + results.Item4.Add(_Logistics.FileInfo); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/Log/FileRead.cs b/Adaptation/FileHandlers/Error/FileRead.cs similarity index 84% rename from Adaptation/FileHandlers/Log/FileRead.cs rename to Adaptation/FileHandlers/Error/FileRead.cs index bde06a8..6a9ca76 100644 --- a/Adaptation/FileHandlers/Log/FileRead.cs +++ b/Adaptation/FileHandlers/Error/FileRead.cs @@ -5,17 +5,14 @@ using Adaptation.Shared.Duplicator; using Adaptation.Shared.Methods; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.IO; using System.Text.Json; -namespace Adaptation.FileHandlers.Log; +namespace Adaptation.FileHandlers.Error; public class FileRead : Shared.FileRead, IFileRead { - private readonly ReadOnlyDictionary _SystemStateToNames; - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) { @@ -26,19 +23,6 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) throw new Exception(cellInstanceConnectionName); - if (!_IsDuplicator) - throw new Exception(cellInstanceConnectionName); - string[] segments; - Dictionary systemStateToNames = new(); - ModelObjectParameterDefinition[] systemStates = GetProperties(cellInstanceConnectionName, modelObjectParameters, "ProcessDataStandardFormat.SystemState"); - foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in systemStates) - { - segments = modelObjectParameterDefinition.Value.Split('|'); - if (segments.Length != 2) - continue; - systemStateToNames.Add(segments[0], segments[1]); - } - _SystemStateToNames = new(systemStateToNames); } void IFileRead.Move(Tuple> extractResults, Exception exception) @@ -119,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime _) { Tuple> results = new(string.Empty, null, null, new List()); - string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"BACKLOG"};A_MES_ENTITY={"BACKLOG"};" }; + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); _Logistics = new Logistics(reportFullPath, processDataStandardFormat); SetFileParameterLotIDToLogisticsMID(); diff --git a/Adaptation/FileHandlers/EAFLog/FileRead.cs b/Adaptation/FileHandlers/Info/FileRead.cs similarity index 97% rename from Adaptation/FileHandlers/EAFLog/FileRead.cs rename to Adaptation/FileHandlers/Info/FileRead.cs index 355dc84..b976679 100644 --- a/Adaptation/FileHandlers/EAFLog/FileRead.cs +++ b/Adaptation/FileHandlers/Info/FileRead.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Text.Json; -namespace Adaptation.FileHandlers.EAFLog; +namespace Adaptation.FileHandlers.Info; public class FileRead : Shared.FileRead, IFileRead { @@ -103,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime _) { Tuple> results = new(string.Empty, null, null, new List()); - string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"BACKLOG"};A_MES_ENTITY={"BACKLOG"};" }; + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); _Logistics = new Logistics(reportFullPath, processDataStandardFormat); SetFileParameterLotIDToLogisticsMID(); diff --git a/Adaptation/FileHandlers/LogFile/FileRead.cs b/Adaptation/FileHandlers/LogFile/FileRead.cs index cc31c04..9bdcf47 100644 --- a/Adaptation/FileHandlers/LogFile/FileRead.cs +++ b/Adaptation/FileHandlers/LogFile/FileRead.cs @@ -103,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime _) { Tuple> results = new(string.Empty, null, null, new List()); - string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"BACKLOG"};A_MES_ENTITY={"BACKLOG"};" }; + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); _Logistics = new Logistics(reportFullPath, processDataStandardFormat); SetFileParameterLotIDToLogisticsMID(); diff --git a/Adaptation/FileHandlers/Notification/FileRead.cs b/Adaptation/FileHandlers/Notification/FileRead.cs new file mode 100644 index 0000000..2fe6498 --- /dev/null +++ b/Adaptation/FileHandlers/Notification/FileRead.cs @@ -0,0 +1,114 @@ +using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; +using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; +using Adaptation.Shared; +using Adaptation.Shared.Duplicator; +using Adaptation.Shared.Methods; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; + +namespace Adaptation.FileHandlers.Notification; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + } + + void IFileRead.Move(Tuple> extractResults, Exception exception) + { + bool isErrorFile = exception is not null; + if (!isErrorFile && !string.IsNullOrEmpty(_Logistics.ReportFullPath)) + { + FileInfo fileInfo = new(_Logistics.ReportFullPath); + if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) + File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime); + } + Move(extractResults); + } + + void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); + + string IFileRead.GetEventDescription() + { + string result = _Description.GetEventDescription(); + return result; + } + + List IFileRead.GetHeaderNames() + { + List results = _Description.GetHeaderNames(); + return results; + } + + string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) + { + string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); + return results; + } + + JsonProperty[] IFileRead.GetDefault() + { + JsonProperty[] results = _Description.GetDefault(this, _Logistics); + return results; + } + + Dictionary IFileRead.GetDisplayNamesJsonElement() + { + Dictionary results = _Description.GetDisplayNamesJsonElement(this); + return results; + } + + List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) + { + List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); + return results; + } + + Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) + { + Tuple> results; + if (string.IsNullOrEmpty(eventName)) + throw new Exception(); + _ReportFullPath = reportFullPath; + DateTime dateTime = DateTime.Now; + results = GetExtractResult(reportFullPath, dateTime); + if (results.Item3 is null) + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); + if (results.Item3.Length > 0 && _IsEAFHosted) + WritePDSF(this, results.Item3); + UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); + return results; + } + + Tuple> IFileRead.ReExtract() + { + Tuple> results; + List headerNames = _Description.GetHeaderNames(); + Dictionary keyValuePairs = _Description.GetDisplayNamesJsonElement(this); + results = ReExtract(this, headerNames, keyValuePairs); + return results; + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime _) + { + Tuple> results = new(string.Empty, null, null, new List()); + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; + ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); + _Logistics = new Logistics(reportFullPath, processDataStandardFormat); + SetFileParameterLotIDToLogisticsMID(); + results.Item4.Add(_Logistics.FileInfo); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/Source/FileRead.cs b/Adaptation/FileHandlers/Source/FileRead.cs index 69e1d8b..7e135b8 100644 --- a/Adaptation/FileHandlers/Source/FileRead.cs +++ b/Adaptation/FileHandlers/Source/FileRead.cs @@ -103,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime _) { Tuple> results = new(string.Empty, null, null, new List()); - string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"BACKLOG"};A_MES_ENTITY={"BACKLOG"};" }; + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); _Logistics = new Logistics(reportFullPath, processDataStandardFormat); SetFileParameterLotIDToLogisticsMID(); diff --git a/Adaptation/FileHandlers/EAFLog20/FileRead.cs b/Adaptation/FileHandlers/Unit/FileRead.cs similarity index 97% rename from Adaptation/FileHandlers/EAFLog20/FileRead.cs rename to Adaptation/FileHandlers/Unit/FileRead.cs index 904294b..4e0e9ae 100644 --- a/Adaptation/FileHandlers/EAFLog20/FileRead.cs +++ b/Adaptation/FileHandlers/Unit/FileRead.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Text.Json; -namespace Adaptation.FileHandlers.EAFLog20; +namespace Adaptation.FileHandlers.Unit; public class FileRead : Shared.FileRead, IFileRead { @@ -103,7 +103,7 @@ public class FileRead : Shared.FileRead, IFileRead private Tuple> GetExtractResult(string reportFullPath, DateTime _) { Tuple> results = new(string.Empty, null, null, new List()); - string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"BACKLOG"};A_MES_ENTITY={"BACKLOG"};" }; + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); _Logistics = new Logistics(reportFullPath, processDataStandardFormat); SetFileParameterLotIDToLogisticsMID(); diff --git a/Adaptation/FileHandlers/Warn/FileRead.cs b/Adaptation/FileHandlers/Warn/FileRead.cs new file mode 100644 index 0000000..1abaccd --- /dev/null +++ b/Adaptation/FileHandlers/Warn/FileRead.cs @@ -0,0 +1,114 @@ +using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; +using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; +using Adaptation.Shared; +using Adaptation.Shared.Duplicator; +using Adaptation.Shared.Methods; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; + +namespace Adaptation.FileHandlers.Warn; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + } + + void IFileRead.Move(Tuple> extractResults, Exception exception) + { + bool isErrorFile = exception is not null; + if (!isErrorFile && !string.IsNullOrEmpty(_Logistics.ReportFullPath)) + { + FileInfo fileInfo = new(_Logistics.ReportFullPath); + if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) + File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime); + } + Move(extractResults); + } + + void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); + + string IFileRead.GetEventDescription() + { + string result = _Description.GetEventDescription(); + return result; + } + + List IFileRead.GetHeaderNames() + { + List results = _Description.GetHeaderNames(); + return results; + } + + string[] IFileRead.Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) + { + string[] results = Move(extractResults, to, from, resolvedFileLocation, exception); + return results; + } + + JsonProperty[] IFileRead.GetDefault() + { + JsonProperty[] results = _Description.GetDefault(this, _Logistics); + return results; + } + + Dictionary IFileRead.GetDisplayNamesJsonElement() + { + Dictionary results = _Description.GetDisplayNamesJsonElement(this); + return results; + } + + List IFileRead.GetDescriptions(IFileRead fileRead, List tests, IProcessData processData) + { + List results = _Description.GetDescriptions(fileRead, _Logistics, tests, processData); + return results; + } + + Tuple> IFileRead.GetExtractResult(string reportFullPath, string eventName) + { + Tuple> results; + if (string.IsNullOrEmpty(eventName)) + throw new Exception(); + _ReportFullPath = reportFullPath; + DateTime dateTime = DateTime.Now; + results = GetExtractResult(reportFullPath, dateTime); + if (results.Item3 is null) + results = new Tuple>(results.Item1, Array.Empty(), JsonSerializer.Deserialize("[]"), results.Item4); + if (results.Item3.Length > 0 && _IsEAFHosted) + WritePDSF(this, results.Item3); + UpdateLastTicksDuration(DateTime.Now.Ticks - dateTime.Ticks); + return results; + } + + Tuple> IFileRead.ReExtract() + { + Tuple> results; + List headerNames = _Description.GetHeaderNames(); + Dictionary keyValuePairs = _Description.GetDisplayNamesJsonElement(this); + results = ReExtract(this, headerNames, keyValuePairs); + return results; + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime _) + { + Tuple> results = new(string.Empty, null, null, new List()); + string[] lines = new string[] { string.Empty, "NUM_DATA_ROWS", $"LOGISTICS_1{'\t'}A_JOBID={"DEP08CEPIEPSILON"};A_MES_ENTITY={"DEP08CEPIEPSILON"};" }; + ProcessDataStandardFormat processDataStandardFormat = ProcessDataStandardFormat.GetProcessDataStandardFormat(reportFullPath, lines); + _Logistics = new Logistics(reportFullPath, processDataStandardFormat); + SetFileParameterLotIDToLogisticsMID(); + results.Item4.Add(_Logistics.FileInfo); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/Shared/Logistics.cs b/Adaptation/Shared/Logistics.cs index 4f187f8..0575bf6 100644 --- a/Adaptation/Shared/Logistics.cs +++ b/Adaptation/Shared/Logistics.cs @@ -199,4 +199,31 @@ public class Logistics : ILogistics _ProcessJobID = processJobID; } + private static int GetCountFromFileName(Logistics logistics) + { + int result; + string[] segments = logistics.FileInfo.Name.Split('.'); + string[] segmentsB = segments[0].Split('_'); + string countFromFileName = segmentsB.Length < 3 ? "0" : segmentsB[2]; + if (!int.TryParse(countFromFileName, out result)) + result = 0; + return result; + } + + internal static long GetUniqueSequence(Logistics logistics) + { + long result; + int countFromFileName = GetCountFromFileName(logistics); + result = (logistics.Sequence * 10) + countFromFileName; + return result; + } + + internal static string GetUniqueId(Logistics logistics) + { + string result; + int countFromFileName = GetCountFromFileName(logistics); + result = $"{logistics.JobID}_{logistics.MID}_{logistics.DateTimeFromSequence:yyyyMMddHHmmssffff}_{countFromFileName}"; + return result; + } + } \ No newline at end of file diff --git a/DEP08CEPIEPSILON.csproj b/DEP08CEPIEPSILON.csproj index 2a11ad7..813a2be 100644 --- a/DEP08CEPIEPSILON.csproj +++ b/DEP08CEPIEPSILON.csproj @@ -105,13 +105,15 @@ + - - + + - + + @@ -124,6 +126,8 @@ + +