diff --git a/.groovy b/.groovy index 4da0682..b2117fc 100644 --- a/.groovy +++ b/.groovy @@ -1,27 +1,33 @@ #!/usr/bin/env groovy +/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */ import groovy.transform.Field -@Field def _DDrive = 'D:/' -@Field def _AssemblyName = '...' -@Field def _NetVersion = 'net6.0' -@Field def _TargetLocation = '...' -@Field def _GitCommitSeven = '...' -@Field def _TestProjectDirectory = 'Adaptation' -@Field def _DDriveNet = "${_DDrive}${_NetVersion}" -@Field def _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe' -@Field def _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe' +@Field String _DDrive = 'D:/' +@Field String _AssemblyName = '...' +@Field String _TargetLocation = '...' +@Field String _GitCommitSeven = '...' +@Field String _GitName = 'MET08RESIMAPCDE' +@Field String _TestProjectDirectory = 'Adaptation' +@Field String _AgentStaging = 'mestsa07ec-ecmeseaf' +@Field String _DDriveNet = "${_DDrive}Framework4.8" +@Field String _AgentProduction = 'messa08ec-ecmeseaf' +@Field String _AgentDevelopment = 'mestsa003-mesedasvc' +@Field String _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe' +@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe' pipeline { - agent any + agent { + label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else' + } parameters { - string(name: 'EAF_ENVIRONMENT', defaultValue: 'Staging', description: 'Environment for file-share') - string(name: 'DEFAULT_FILE_SERVER', defaultValue: 'messv02ecc1.ec.local', description: 'Default file server...') + string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server') + string(name: 'DEFAULT_FILE_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'messv02ecc1_ec_local' : 'messv02ecc1.ec.local', description: 'Default file server...') } stages { stage('Git') { steps { bat(returnStatus: true, script: 'git init') - bat(returnStatus: true, script: 'git remote add origin \\\\mestsa07ec.ec.local\\Git\\MET08RESIMAPCDE.git') + bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git') bat(returnStatus: true, script: 'git pull origin master') } } @@ -30,6 +36,7 @@ pipeline { script { _AssemblyName = "${env.JOB_NAME}" _GitCommitSeven = '1234567' + // _GitCommitSeven = env.GIT_COMMIT.substring(0, 7) def files = findFiles(glob: '*.csproj') if (files.length != 1) { error("Build failed because couldn't find a *.csproj file") @@ -42,24 +49,49 @@ pipeline { ${files[0].lastModified} """ _AssemblyName = files[0].name.split('[.]csproj')[0] - _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${params.EAF_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}" + _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${env.JENKINS_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}" } } } stage('Info') { steps { + echo "_AssemblyName ${_AssemblyName}" // ... echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11 - echo "JOB_NAME ${env.JOB_NAME}" // MET08RESIMAPCDE - echo "_AssemblyName ${_AssemblyName}" // YODA Viewer - echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\MET08RESIMAPCDE + echo "DEFAULT_FILE_SERVER ${params.DEFAULT_FILE_SERVER}" // 11 + echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master + echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41 + echo "GIT_SERVER ${params.GIT_SERVER}" // ... + echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git + echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11 echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/ + echo "JOB_NAME ${env.JOB_NAME}" // ... + echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\... + } + } + // stage('Restore') { + // steps { + // bat(returnStatus: true, script: 'dotnet --info') + // } + // } + stage('Safe storage of app secrets') { + steps { + dir(_TestProjectDirectory) { + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets init') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "BuildNumber" "' + env.BUILD_NUMBER + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "GitCommitSeven" "' + _GitCommitSeven + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "Server" "' + params.DEFAULT_FILE_SERVER + '"') + } } } stage('Core Build') { steps { echo "Build number is ${currentBuild.number}" dir(_TestProjectDirectory) { - bat(returnStatus: true, script: '"' + "${_ProgramFilesDotnet}" + '" ' + + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + 'build --runtime win-x64 --self-contained --verbosity quiet') } } @@ -77,13 +109,13 @@ pipeline { stage('Framework Build') { steps { echo "Build number is ${currentBuild.number}" - bat(returnStatus: true, script: '"' + "${_ProgramFilesMSBuild}" + '" ' + + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + '/target:Restore ' + '/detailedsummary ' + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' + _AssemblyName + '.csproj') - bat(returnStatus: true, script: '"' + "${_ProgramFilesMSBuild}" + '" ' + + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + '/target:Build ' + '/detailedsummary ' + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + @@ -104,16 +136,6 @@ pipeline { fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*", renameFiles: false, sourceCaptureExpression: '', targetLocation: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug", targetNameExpression: '')]) } } - // stage('Publish') { - // steps { - // bat(returnStatus: true, script: '"' + "${_ProgramFilesDotnet}" + '" ' + - // 'remove reference "../Client/' + "${env.JOB_NAME}" + '.Client.csproj"') - // bat(returnStatus: true, script: '"' + "${_ProgramFilesDotnet}" + '" ' + - // 'publish --configuration Release --runtime win-x64 --verbosity quiet ' + - // "--self-contained true --p:Version=6.0.202-${_GitCommitSeven}-${env.BUILD_NUMBER} -o " + - // '"' + "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}" + '"') - // } - // } // stage('Force Fail') { // steps { // error("Build failed because of this and that..") @@ -144,6 +166,7 @@ pipeline { dir(_TestProjectDirectory + '/obj') { deleteDir() } + // cleanWs() } } } diff --git a/Adaptation/.editorconfig b/Adaptation/.editorconfig index d155153..2220133 100644 --- a/Adaptation/.editorconfig +++ b/Adaptation/.editorconfig @@ -80,8 +80,9 @@ dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array al dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name -dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) System.Version.Equals("1", "2"); Version.Equals("1", "2"); -dotnet_diagnostic.IDE0005.severity = suggestion # Using directive is unnecessary using System.Text; +dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2"); +dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary +dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index f7b0ca1..4aafc48 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -10,6 +10,7 @@ "ISMTP", "JOBID", "messa", + "messv", "pdsf", "pdsfc", "PPID", @@ -39,5 +40,6 @@ "titleBar.inactiveBackground": "#7e669d99", "titleBar.inactiveForeground": "#e7e7e799" }, - "peacock.color": "#7e669d" + "peacock.color": "#7e669d", + "cSpell.enabled": false } \ No newline at end of file diff --git a/Adaptation/FileHandlers/APC/FileRead.cs b/Adaptation/FileHandlers/APC/FileRead.cs new file mode 100644 index 0000000..d1d78aa --- /dev/null +++ b/Adaptation/FileHandlers/APC/FileRead.cs @@ -0,0 +1,139 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.APC; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + 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 void FileCopy(string reportFullPath, DateTime dateTime) + { + bool isDummyRun = false; + List<(Shared.Properties.IScopeInfo, string)> tuples = new(); + string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_'); + string duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", segments[0]); + if (segments.Length > 2) + duplicateDirectory = string.Concat(duplicateDirectory, @"-", segments[2]); + if (!Directory.Exists(duplicateDirectory)) + _ = Directory.CreateDirectory(duplicateDirectory); + string duplicateFile = string.Concat(duplicateDirectory, @"\", Path.GetFileName(reportFullPath)); + string successDirectory = string.Concat(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation), @"\ViewerPath"); + if (!Directory.Exists(successDirectory)) + _ = Directory.CreateDirectory(successDirectory); + File.Copy(reportFullPath, duplicateFile, overwrite: true); + WaitForFileConsumption(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile); + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) + { + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = GetDuplicatorDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + FileCopy(reportFullPath, dateTime); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/Archive/FileRead.cs b/Adaptation/FileHandlers/Archive/FileRead.cs index a502d10..5f13ada 100644 --- a/Adaptation/FileHandlers/Archive/FileRead.cs +++ b/Adaptation/FileHandlers/Archive/FileRead.cs @@ -15,21 +15,26 @@ namespace Adaptation.FileHandlers.Archive; public class FileRead : Shared.FileRead, IFileRead { - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + private readonly string _JobIdParentDirectory; + private readonly string _JobIdArchiveParentDirectory; + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); + _JobIdParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.SourceFileLocation); + _JobIdArchiveParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.TargetFileLocation); } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -94,10 +99,20 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) + private static IEnumerable GetDirectoriesRecursively(string path, string directoryNameSegment = null) { - if (_Description is not Description) - throw new Exception(); + Queue queue = new(); + queue.Enqueue(path); + while (queue.Count > 0) + { + path = queue.Dequeue(); + foreach (string subDirectory in Directory.GetDirectories(path)) + { + queue.Enqueue(subDirectory); + if (string.IsNullOrEmpty(directoryNameSegment) || Path.GetFileName(subDirectory).Contains(directoryNameSegment)) + yield return subDirectory; + } + } } private void MoveArchive(DateTime dateTime) @@ -106,19 +121,18 @@ public class FileRead : Shared.FileRead, IFileRead { } string logisticsSequence = _Logistics.Sequence.ToString(); string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string weekDirectory = string.Concat(_Logistics.DateTimeFromSequence.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd")); - string jobIdDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", _Logistics.JobID); - if (!Directory.Exists(jobIdDirectory)) - _ = Directory.CreateDirectory(jobIdDirectory); - //string destinationArchiveDirectory = string.Concat(jobIdDirectory, @"\!Archive\", weekDirectory); - string destinationArchiveDirectory = string.Concat(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation), @"\Archive\", _Logistics.JobID, @"\", weekDirectory); + string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; + string destinationArchiveDirectory = Path.Combine(_JobIdArchiveParentDirectory, _Logistics.JobID, weekDirectory); if (!Directory.Exists(destinationArchiveDirectory)) _ = Directory.CreateDirectory(destinationArchiveDirectory); + string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID); + if (!Directory.Exists(jobIdDirectory)) + _ = Directory.CreateDirectory(jobIdDirectory); string[] matchDirectories = new string[] { GetDirectoriesRecursively(jobIdDirectory, logisticsSequence).FirstOrDefault() }; if ((matchDirectories is null) || matchDirectories.Length != 1) throw new Exception("Didn't find directory by logistics sequence"); string sourceDirectory = Path.GetDirectoryName(matchDirectories[0]); - destinationArchiveDirectory = string.Concat(destinationArchiveDirectory, @"\", Path.GetFileName(sourceDirectory)); + destinationArchiveDirectory = Path.Combine(destinationArchiveDirectory, Path.GetFileName(sourceDirectory)); Directory.Move(sourceDirectory, destinationArchiveDirectory); } @@ -130,9 +144,9 @@ public class FileRead : Shared.FileRead, IFileRead SetFileParameterLotIDToLogisticsMID(); JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); List descriptions = GetDuplicatorDescriptions(jsonElements); - Tuple>> tuple = GetTuple(this, descriptions, extra: false); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); MoveArchive(dateTime); - results = new Tuple>(pdsf.Item1, tuple.Item1, jsonElements, new List()); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/CellInstanceConnectionName.cs b/Adaptation/FileHandlers/CellInstanceConnectionName.cs index 82ee75c..d80d933 100644 --- a/Adaptation/FileHandlers/CellInstanceConnectionName.cs +++ b/Adaptation/FileHandlers/CellInstanceConnectionName.cs @@ -9,31 +9,24 @@ namespace Adaptation.FileHandlers; public class CellInstanceConnectionName { - internal static IFileRead Get(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) + internal static IFileRead Get(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) { - IFileRead result; - bool isDuplicator = cellInstanceConnectionName.StartsWith(cellInstanceName); - if (isDuplicator) + IFileRead result = cellInstanceConnectionName switch { - string cellInstanceConnectionNameBase = cellInstanceConnectionName.Replace("-", string.Empty); - int hyphens = cellInstanceConnectionName.Length - cellInstanceConnectionNameBase.Length; - result = hyphens switch - { - (int)MET08RESIMAPCDE.Hyphen.IsArchive => new Archive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - (int)MET08RESIMAPCDE.Hyphen.IsDummy => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - (int)MET08RESIMAPCDE.Hyphen.IsXToArchive => new ToArchive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - _ => new MET08RESIMAPCDE.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) - }; - } - else - { - result = cellInstanceConnectionName switch - { - nameof(DownloadRsMFile) => new DownloadRsMFile.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - nameof(RsM) => new RsM.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted), - _ => throw new Exception(), - }; - } + nameof(APC) => new APC.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(Archive) => new Archive.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(DownloadRsMFile) => new DownloadRsMFile.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(Dummy) => new Dummy.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(IQSSi) => new IQSSi.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(MoveMatchingFiles) => new MoveMatchingFiles.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(OpenInsight) => new OpenInsight.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(OpenInsightMetrologyViewer) => new OpenInsightMetrologyViewer.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(OpenInsightMetrologyViewerAttachments) => new OpenInsightMetrologyViewerAttachments.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(Processed) => new Processed.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(RsM) => new RsM.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + nameof(SPaCe) => new SPaCe.FileRead(smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted), + _ => throw new Exception($"\"{cellInstanceConnectionName}\" not mapped") + }; return result; } diff --git a/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs b/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs index f6e5331..d09172b 100644 --- a/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs +++ b/Adaptation/FileHandlers/DownloadRsMFile/FileRead.cs @@ -9,7 +9,6 @@ using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; -using System.Net; using System.Net.Http; using System.Text.Json; using System.Threading; @@ -24,12 +23,12 @@ public class FileRead : Shared.FileRead, IFileRead private readonly HttpClient _HttpClient; private readonly string _StaticFileServer; - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -47,7 +46,7 @@ public class FileRead : Shared.FileRead, IFileRead } } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -112,8 +111,6 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) => throw new Exception(string.Concat("Not ", nameof(_IsDuplicator))); - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { if (reportFullPath is null) diff --git a/Adaptation/FileHandlers/Dummy/FileRead.cs b/Adaptation/FileHandlers/Dummy/FileRead.cs index 6ef5f81..993a12c 100644 --- a/Adaptation/FileHandlers/Dummy/FileRead.cs +++ b/Adaptation/FileHandlers/Dummy/FileRead.cs @@ -23,12 +23,12 @@ public class FileRead : Shared.FileRead, IFileRead private int _LastDummyRunIndex; private readonly string[] _CellNames; - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -51,7 +51,7 @@ public class FileRead : Shared.FileRead, IFileRead } } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -95,12 +95,6 @@ public class FileRead : Shared.FileRead, IFileRead Tuple> IFileRead.ReExtract() => throw new Exception(string.Concat("See ", nameof(CallbackFileExists))); - void IFileRead.CheckTests(Test[] tests, bool extra) - { - if (_Description is not Description) - throw new Exception(); - } - private void CallbackInProcessCleared(string sourceArchiveFile, string traceDummyFile, string targetFileLocation, string monARessource, string inProcessDirectory, long sequence, bool warning) { const string site = "sjc"; @@ -159,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead if (!_DummyRuns[monARessource].Contains(sequence)) _DummyRuns[monARessource].Add(sequence); File.AppendAllLines(traceDummyFile, new string[] { sourceArchiveFile }); - string inProcessDirectory = Path.Combine(_ProgressPath, "Dummy In-Process", sequence.ToString()); + string inProcessDirectory = Path.Combine("_ProgressPath", "Dummy In-Process", sequence.ToString()); if (!Directory.Exists(inProcessDirectory)) _ = Directory.CreateDirectory(inProcessDirectory); files = Directory.GetFiles(inProcessDirectory, "*", SearchOption.AllDirectories); diff --git a/Adaptation/FileHandlers/IQSSi/FileRead.cs b/Adaptation/FileHandlers/IQSSi/FileRead.cs new file mode 100644 index 0000000..7048f14 --- /dev/null +++ b/Adaptation/FileHandlers/IQSSi/FileRead.cs @@ -0,0 +1,121 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.IQSSi; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + 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 dateTime) + { + if (dateTime == DateTime.MinValue) + { } + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = GetDuplicatorDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs deleted file mode 100644 index 59ce7c1..0000000 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs +++ /dev/null @@ -1,286 +0,0 @@ -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 Adaptation.Shared.Metrology; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.Threading; - -namespace Adaptation.FileHandlers.MET08RESIMAPCDE; - -public class FileRead : Shared.FileRead, IFileRead -{ - - private readonly bool _IsNaEDA; - private readonly bool _IsXToAPC; - private readonly string _IqsFile; - private readonly bool _IsXToIQSSi; - private readonly bool _IsXToSPaCe; - private readonly string _MemoryPath; - private readonly bool _IsXToOpenInsight; - private readonly string _OpenInsightFilePattern; - private readonly bool _IsXToOpenInsightMetrologyViewer; - private readonly Dictionary _CellNames; - private readonly string _OpenInsightMetrologyViewerAPI; - private readonly bool _IsXToOpenInsightMetrologyViewerAttachments; - - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) - { - _MinFileLength = 10; - _NullData = string.Empty; - _Logistics = new Logistics(this); - if (_FileParameter is null) - throw new Exception(cellInstanceConnectionName); - if (_ModelObjectParameterDefinitions is null) - throw new Exception(cellInstanceConnectionName); - if (!_IsDuplicator) - throw new Exception(cellInstanceConnectionName); - _IsNaEDA = _Hyphens == (int)Hyphen.IsNaEDA; - _IsXToAPC = _Hyphens == (int)Hyphen.IsXToAPC; - _CellNames = new Dictionary(); - _IsXToIQSSi = _Hyphens == (int)Hyphen.IsXToIQSSi; - _IsXToSPaCe = _Hyphens == (int)Hyphen.IsXToSPaCe; - _IsXToOpenInsight = _Hyphens == (int)Hyphen.IsXToOpenInsight; - _IqsFile = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.File"); - _MemoryPath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Memory"); - _IsXToOpenInsightMetrologyViewer = _Hyphens == (int)Hyphen.IsXToOpenInsightMetrologyViewer; - _IsXToOpenInsightMetrologyViewerAttachments = _Hyphens == (int)Hyphen.IsXToOpenInsightMetrologyViewerAttachments; - _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern"); - _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); - ModelObjectParameterDefinition[] cellInstanceCollection = GetProperties(cellInstanceConnectionName, modelObjectParameters, "CellInstance.", ".Path"); - foreach (ModelObjectParameterDefinition modelObjectParameterDefinition in cellInstanceCollection) - _CellNames.Add(modelObjectParameterDefinition.Name.Split('.')[1], modelObjectParameterDefinition.Value); - } - - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); - - 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; - } - - void IFileRead.CheckTests(Test[] tests, bool extra) - { - if (_Description is not Description) - throw new Exception(); - } - - protected static List GetDescriptions(JsonElement[] jsonElements) - { - List results = new(); - pcl.Description description; - JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString }; - foreach (JsonElement jsonElement in jsonElements) - { - if (jsonElement.ValueKind != JsonValueKind.Object) - throw new Exception(); - description = JsonSerializer.Deserialize(jsonElement.ToString(), jsonSerializerOptions); - results.Add(description); - } - return results; - } - - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) - { - Tuple> results; - string duplicateDirectory; - Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); - _Logistics = new Logistics(reportFullPath, pdsf.Item1); - SetFileParameterLotIDToLogisticsMID(); - JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); - List descriptions = GetDescriptions(jsonElements); - Tuple>> tuple = GetTuple(this, from l in descriptions select (Shared.Properties.IDescription)l, extra: false); - results = new Tuple>(pdsf.Item1, tuple.Item1, jsonElements, new List()); - bool isNotUsedInsightMetrologyViewerAttachments = !(_FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) && _IsXToOpenInsightMetrologyViewerAttachments; - bool isDummyRun = _DummyRuns.Any() && _DummyRuns.ContainsKey(_Logistics.JobID) && _DummyRuns[_Logistics.JobID].Any() && (from l in _DummyRuns[_Logistics.JobID] where l == _Logistics.Sequence select 1).Any(); - if (isDummyRun) - { - try - { File.SetLastWriteTime(reportFullPath, dateTime); } - catch (Exception) { } - } - string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_'); - if (_IsXToIQSSi) - duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\All"); - else if (!_IsXToOpenInsight) - duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", segments[0]); - else - duplicateDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\Data"); - if (segments.Length > 2) - duplicateDirectory = string.Concat(duplicateDirectory, @"-", segments[2]); - if (!Directory.Exists(duplicateDirectory)) - _ = Directory.CreateDirectory(duplicateDirectory); - if (isDummyRun || isNotUsedInsightMetrologyViewerAttachments || _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - { - if (!Directory.Exists(duplicateDirectory)) - _ = Directory.CreateDirectory(duplicateDirectory); - string successDirectory; - if (!_IsXToAPC) - successDirectory = string.Empty; - else - { - successDirectory = string.Concat(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation), @"\ViewerPath"); - if (!Directory.Exists(successDirectory)) - _ = Directory.CreateDirectory(successDirectory); - } - List> tuples = new(); - string duplicateFile = string.Concat(duplicateDirectory, @"\", Path.GetFileName(reportFullPath)); - string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string weekDirectory = string.Concat(_Logistics.DateTimeFromSequence.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd")); - string logisticsSequenceMemoryDirectory = string.Concat(_MemoryPath, @"\", _EquipmentType, @"\Source\", weekDirectory, @"\", _Logistics.Sequence); - if (!Directory.Exists(logisticsSequenceMemoryDirectory)) - _ = Directory.CreateDirectory(logisticsSequenceMemoryDirectory); - if (_IsXToAPC) - { - if (!isDummyRun && _IsEAFHosted) - File.Copy(reportFullPath, duplicateFile, overwrite: true); - } - else - { - if (_IsXToOpenInsightMetrologyViewer) - { - WSRequest wsRequest = new(this, _Logistics, descriptions); - if (!isDummyRun && _IsEAFHosted) - { - Tuple wsResults = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest); - if (!wsResults.Item2.Success) - throw new Exception(wsResults.ToString()); - _Log.Debug(wsResults.Item2.HeaderID); - File.WriteAllText(string.Concat(logisticsSequenceMemoryDirectory, @"\", nameof(WS.Results), ".json"), wsResults.Item1); - } - } - else - { - Test test; - string lines; - Shared.Properties.IScopeInfo scopeInfo; - foreach (KeyValuePair> keyValuePair in tuple.Item2) - { - test = keyValuePair.Key; - //scopeInfo = new ScopeInfo(test); - if (!_IsXToOpenInsight) - scopeInfo = new ScopeInfo(test, _IqsFile); - else - scopeInfo = new ScopeInfo(test, _OpenInsightFilePattern); - lines = ProcessData.GetLines(this, _Logistics, descriptions); - tuples.Add(new Tuple(scopeInfo, lines)); - } - } - if (_IsXToOpenInsightMetrologyViewerAttachments) - { - string[] matchDirectories = Shared1567(reportFullPath, tuples); - if (!isDummyRun && _IsEAFHosted && !isNotUsedInsightMetrologyViewerAttachments) - ProcessData.PostOpenInsightMetrologyViewerAttachments(this, dateTime, logisticsSequenceMemoryDirectory, descriptions, matchDirectories[0]); - } - } - if (!_IsXToOpenInsightMetrologyViewer && !_IsXToOpenInsightMetrologyViewerAttachments) - Shared0413(dateTime, isDummyRun, successDirectory, duplicateDirectory, tuples, duplicateFile); - } - if (_IsXToOpenInsightMetrologyViewerAttachments) - { - string destinationDirectory; - //string destinationDirectory = WriteScopeInfo(_ProgressPath, _Logistics, dateTime, duplicateDirectory, tuples); - FileInfo fileInfo = new(reportFullPath); - string logisticsSequence = _Logistics.Sequence.ToString(); - if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) - File.SetLastWriteTime(reportFullPath, fileInfo.CreationTime); - string jobIdDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\", _Logistics.JobID); - if (!Directory.Exists(jobIdDirectory)) - _ = Directory.CreateDirectory(jobIdDirectory); - string[] matchDirectories; - if (!_IsEAFHosted) - matchDirectories = new string[] { Path.GetDirectoryName(Path.GetDirectoryName(reportFullPath)) }; - else - matchDirectories = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly); - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - destinationDirectory = matchDirectories[0]; - if (isDummyRun) - Shared0607(reportFullPath, duplicateDirectory, logisticsSequence, destinationDirectory); - else - { - WSRequest wsRequest = new(this, _Logistics, descriptions); - JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; - string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions); - if (_IsEAFHosted) - Shared1277(reportFullPath, destinationDirectory, logisticsSequence, jobIdDirectory, json); - else - { - string jsonFileName = Path.ChangeExtension(reportFullPath, ".json"); - string historicalText = File.ReadAllText(jsonFileName); - if (json != historicalText) - throw new Exception("File doesn't match historical!"); - } - } - } - return results; - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/Hyphen.cs b/Adaptation/FileHandlers/MET08RESIMAPCDE/Hyphen.cs deleted file mode 100644 index 5066d9c..0000000 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/Hyphen.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Adaptation.FileHandlers.MET08RESIMAPCDE; - -public enum Hyphen -{ - IsXToOpenInsightMetrologyViewer, //MetrologyWS.SendData(file, string.Concat("http://", serverName, "/api/inbound/CDE")); - IsXToIQSSi, //NA -361 - IsXToOpenInsight, //NA -363 - IsXToOpenInsightMetrologyViewerAttachments, //Site-None -362 - IsXToAPC, - IsXToSPaCe, - IsXToArchive, - IsArchive, - IsDummy, - IsNaEDA -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/ProcessData.cs b/Adaptation/FileHandlers/MET08RESIMAPCDE/ProcessData.cs deleted file mode 100644 index d4a17fa..0000000 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/ProcessData.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Adaptation.Shared; -using Adaptation.Shared.Properties; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Adaptation.FileHandlers.MET08RESIMAPCDE; - -public class ProcessData -{ - - internal static List> HyphenTuples => new() - { - new Tuple(0, Hyphen.IsNaEDA, @"\EC_EDA\Staging\Traces\~\Source"), - new Tuple(15, Hyphen.IsXToOpenInsightMetrologyViewer, @"\EC_EAFLog\TracesMES\~\Source"), - new Tuple(-36, Hyphen.IsXToIQSSi, @"\EC_SPC_Si\Traces\~\PollPath"), - new Tuple(-36, Hyphen.IsXToOpenInsight, @"\\messa01ec.ec.local\APPS\Metrology\~\Source"), - new Tuple(-36, Hyphen.IsXToOpenInsightMetrologyViewerAttachments, @"\EC_Characterization_Si\In Process\~\Source"), - new Tuple(360, Hyphen.IsXToAPC, @"\EC_APC\Staging\Traces\~\PollPath"), - new Tuple(-36, Hyphen.IsXToSPaCe, @"\EC_SPC_Si\Traces\~\Source"), - new Tuple(180, Hyphen.IsXToArchive, @"\EC_EAFLog\TracesArchive\~\Source"), - new Tuple(36, Hyphen.IsArchive, @"\EC_Characterization_Si\Processed") - //new Tuple("IsDummy" - }; - - internal static string GetLines(IFileRead fileRead, Logistics logistics, List descriptions) - { - StringBuilder result = new(); - if (fileRead is null) - { } - if (logistics is null) - { } - if (descriptions is null) - { } - return result.ToString(); - } - - internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, DateTime dateTime, string logisticsSequenceMemoryDirectory, List descriptions, string matchDirectory) - { - if (fileRead is null) - { } - if (dateTime == DateTime.MinValue) - { } - if (logisticsSequenceMemoryDirectory is null) - { } - if (descriptions is null) - { } - if (matchDirectory is null) - { } - //Not used - } - -} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs new file mode 100644 index 0000000..32677f5 --- /dev/null +++ b/Adaptation/FileHandlers/MoveMatchingFiles/FileRead.cs @@ -0,0 +1,198 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.MoveMatchingFiles; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + 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 List GetSearchDirectories(int numberLength, string parentDirectory) + { + List results = new(); + string[] directories = Directory.GetDirectories(parentDirectory, "*", SearchOption.TopDirectoryOnly); + foreach (string directory in directories) + { + if (Path.GetFileName(directory).Length != numberLength) + continue; + results.Add(directory); + } + results.Sort(); + return results; + } + + private List GetMatchingFiles(long ticks, string reportFullPath, List searchDirectories) + { + List results = new(); + string[] found; + string fileName = Path.GetFileName(reportFullPath); + foreach (string searchDirectory in searchDirectories) + { + for (int i = 0; i < int.MaxValue; i++) + { + found = Directory.GetFiles(searchDirectory, fileName, SearchOption.AllDirectories); + if (found.Any()) + { + results.AddRange(found); + break; + } + if (new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds > _BreakAfterSeconds) + break; + } + } + return results; + } + + private static List<(string matchingFile, string checkFile)> GetCollection(int numberLength, string parentDirectory, List matchingFiles) + { + List<(string matchingFile, string checkFile)> results = new(); + string checkFile; + int parentDirectoryLength = parentDirectory.Length; + foreach (string matchingFile in matchingFiles) + { + checkFile = $"{matchingFile[0]}{matchingFile.Substring(parentDirectoryLength + numberLength + 1)}"; + results.Add(new(matchingFile, checkFile)); + } + return results; + } + + private void MoveCollection(long ticks, List<(string matchingFile, string checkFile)> collection) + { + string errFile; + string checkDirectory; + foreach ((string matchingFile, string checkFile) in collection) + { + errFile = string.Concat(checkFile, ".err"); + checkDirectory = Path.GetDirectoryName(checkFile); + if (!Directory.Exists(checkDirectory)) + _ = Directory.CreateDirectory(checkDirectory); + File.Move(matchingFile, checkFile); + for (int i = 0; i < int.MaxValue; i++) + { + if (File.Exists(errFile)) + throw new Exception(File.ReadAllText(errFile)); + if (!File.Exists(checkFile)) + break; + if (new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds > _BreakAfterSeconds) + throw new Exception($"Not all files were consumned after {_BreakAfterSeconds} second(s)!"); + } + } + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) + { + if (dateTime == DateTime.MinValue) + { } + Tuple> results = new(string.Empty, null, null, new List()); + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + int numberLength = 2; + long ticks = DateTime.Now.Ticks; + string parentDirectory = Path.GetDirectoryName(Path.GetDirectoryName(reportFullPath)); + List searchDirectories = GetSearchDirectories(numberLength, parentDirectory); + List matchingFiles = GetMatchingFiles(ticks, reportFullPath, searchDirectories); + if (matchingFiles.Count != searchDirectories.Count) + throw new Exception($"Didn't find all files after {_BreakAfterSeconds} second(s)!"); + List<(string matchingFile, string checkFile)> collection = GetCollection(numberLength, parentDirectory, matchingFiles); + MoveCollection(ticks, collection); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs new file mode 100644 index 0000000..26b6a30 --- /dev/null +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -0,0 +1,133 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.OpenInsight; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + 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 SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List descriptions, Test[] tests) + { + if (reportFullPath is null) + { } + if (dateTime == DateTime.MinValue) + { } + if (descriptions is null) + { } + if (tests is null) + { } + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) + { + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = pcl.ProcessData.GetDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + SaveOpenInsightFile(reportFullPath, dateTime, descriptions, tests); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs new file mode 100644 index 0000000..99082ed --- /dev/null +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs @@ -0,0 +1,142 @@ +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 Adaptation.Shared.Metrology; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer; + +public class FileRead : Shared.FileRead, IFileRead +{ + + private readonly string _OpenInsightMetrologyViewerAPI; + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + throw new Exception(cellInstanceConnectionName); + _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); + } + + 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 void SendData(DateTime dateTime, List descriptions) + { + if (dateTime == DateTime.MinValue) + { } + WSRequest wsRequest = new(this, _Logistics, descriptions); + (string json, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest); + if (!wsResults.Success) + throw new Exception(wsResults.ToString()); + _Log.Debug(wsResults.HeaderID); + lock (_StaticRuns) + { + if (!_StaticRuns.ContainsKey(_Logistics.Sequence)) + _StaticRuns.Add(_Logistics.Sequence, new()); + _StaticRuns[_Logistics.Sequence].Add(json); + } + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) + { + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = pcl.ProcessData.GetDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + SendData(dateTime, descriptions); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs similarity index 60% rename from Adaptation/FileHandlers/MET08RESIMAPCDE/WSRequest.cs rename to Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index c27c2bc..e3cfe68 100644 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -1,10 +1,13 @@ using Adaptation.Shared; +using Adaptation.Shared.Metrology; using Adaptation.Shared.Properties; using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Text.Json; -namespace Adaptation.FileHandlers.MET08RESIMAPCDE; +namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer; public class WSRequest { @@ -101,4 +104,45 @@ public class WSRequest FilePath = onlyWSRequest; } + internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, string json, List descriptions, string matchDirectory) + { + if (fileRead is null) + { } + if (logistics is null) + { } + if (dateTime == DateTime.MinValue) + { } + if (descriptions is null) + { } + if (matchDirectory is null) + { } + if (string.IsNullOrEmpty(json)) + { + WSRequest wsRequest = new(fileRead, logistics, descriptions); + (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, wsRequest); + if (!wsResults.Success) + throw new Exception(wsResults.ToString()); + } + WS.Results metrologyWSRequest = JsonSerializer.Deserialize(json); + long wsResultsHeaderID = metrologyWSRequest.HeaderID; + string[] pclFiles = Directory.GetFiles(matchDirectory, "*.pcl", SearchOption.TopDirectoryOnly); + if (pclFiles.Length != 1) + throw new Exception($"Invalid source file count for <{wsResultsHeaderID}>!{Environment.NewLine}{json}"); + List pdfFiles = new(); + pdfFiles.AddRange(Directory.GetFiles(matchDirectory, "*.pdf_old", SearchOption.TopDirectoryOnly)); + foreach (string pdfFile in pdfFiles) + File.Delete(pdfFile); + pdfFiles.Clear(); + pdfFiles.AddRange(Directory.GetFiles(matchDirectory, "*.pdf", SearchOption.TopDirectoryOnly)); + foreach (string pdfFile in pdfFiles) + File.Move(pdfFile, Path.ChangeExtension(pdfFile, ".pdf_old")); + pdfFiles.Clear(); + + if (pdfFiles.Count == 0) + throw new Exception("Invalid *.pdf file count!"); + List headerAttachments = new() + { new WS.Attachment(descriptions[0].HeaderUniqueId, "Data.pdf", pdfFiles[0]) }; + WS.AttachFiles(openInsightMetrologyViewerAPI, wsResultsHeaderID, headerAttachments, dataAttachments: null); + } + } \ No newline at end of file diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs new file mode 100644 index 0000000..a5dbdb1 --- /dev/null +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs @@ -0,0 +1,150 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.OpenInsightMetrologyViewerAttachments; + +public class FileRead : Shared.FileRead, IFileRead +{ + + private readonly string _JobIdParentDirectory; + private readonly string _OpenInsightMetrologyViewerAPI; + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + throw new Exception(cellInstanceConnectionName); + _JobIdParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.SourceFileLocation); + _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); + } + + 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 void PostOpenInsightMetrologyViewerAttachments(string reportFullPath, DateTime dateTime, List descriptions) + { + if (string.IsNullOrEmpty(reportFullPath)) + { } + if (dateTime == DateTime.MinValue) + { } + string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID); + if (!Directory.Exists(jobIdDirectory)) + _ = Directory.CreateDirectory(jobIdDirectory); + string json; + string[] matchDirectories = GetInProcessDirectory(jobIdDirectory); + if (!_StaticRuns.ContainsKey(_Logistics.Sequence)) + json = string.Empty; + else + { + if (_StaticRuns[_Logistics.Sequence].Count != 1) + throw new Exception($"{nameof(_StaticRuns)} has too many values for {_Logistics.Sequence}!"); + json = _StaticRuns[_Logistics.Sequence][0]; + lock (_StaticRuns) + _ = _StaticRuns.Remove(_Logistics.Sequence); + } + OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, dateTime, json, descriptions, matchDirectories[0]); + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) + { + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = pcl.ProcessData.GetDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + PostOpenInsightMetrologyViewerAttachments(reportFullPath, dateTime, descriptions); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/Processed/FileRead.cs b/Adaptation/FileHandlers/Processed/FileRead.cs new file mode 100644 index 0000000..ff94090 --- /dev/null +++ b/Adaptation/FileHandlers/Processed/FileRead.cs @@ -0,0 +1,164 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.Processed; + +public class FileRead : Shared.FileRead, IFileRead +{ + + private readonly string _JobIdParentDirectory; + private readonly string _JobIdProcessParentDirectory; + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + throw new Exception(cellInstanceConnectionName); + _JobIdParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.SourceFileLocation); + _JobIdProcessParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.TargetFileLocation); + } + + 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 void DirectoryMove(string reportFullPath, DateTime dateTime, List descriptions) + { + if (dateTime == DateTime.MinValue) + { } + FileInfo fileInfo = new(reportFullPath); + string logisticsSequence = _Logistics.Sequence.ToString(); + string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID); + if (!Directory.Exists(jobIdDirectory)) + _ = Directory.CreateDirectory(jobIdDirectory); + string[] matchDirectories = GetInProcessDirectory(jobIdDirectory); + if ((matchDirectories is null) || matchDirectories.Length != 1) + throw new Exception("Didn't find directory by logistics sequence"); + if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) + File.SetLastWriteTime(reportFullPath, fileInfo.CreationTime); + OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, descriptions); + JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; + string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions); + string directoryName = $"{Path.GetFileName(matchDirectories[0]).Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0]}{_Logistics.DateTimeFromSequence:yyyy-MM-dd_hh;mm_tt_}{DateTime.Now.Ticks - _Logistics.Sequence}"; + string destinationJobIdDirectory = Path.Combine(_JobIdProcessParentDirectory, _Logistics.JobID, directoryName); + string sequenceDirectory = Path.Combine(destinationJobIdDirectory, logisticsSequence); + string jsonFileName = Path.Combine(sequenceDirectory, $"{Path.GetFileNameWithoutExtension(reportFullPath)}.json"); + Directory.Move(matchDirectories[0], destinationJobIdDirectory); + if (!Directory.Exists(sequenceDirectory)) + _ = Directory.CreateDirectory(sequenceDirectory); + File.Copy(reportFullPath, Path.Combine(sequenceDirectory, Path.GetFileName(reportFullPath)), overwrite: true); + File.WriteAllText(jsonFileName, json); + } + + private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) + { + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = pcl.ProcessData.GetDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) + DirectoryMove(reportFullPath, dateTime, descriptions); + else if (!_IsEAFHosted) + { + OpenInsightMetrologyViewer.WSRequest wsRequest = new(this, _Logistics, descriptions); + JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; + string json = JsonSerializer.Serialize(wsRequest, wsRequest.GetType(), jsonSerializerOptions); + string jsonFileName = Path.ChangeExtension(reportFullPath, ".json"); + string historicalText = File.ReadAllText(jsonFileName); + if (json != historicalText) + throw new Exception("File doesn't match historical!"); + } + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/RsM/FileRead.cs b/Adaptation/FileHandlers/RsM/FileRead.cs index d92efd3..f6d4902 100644 --- a/Adaptation/FileHandlers/RsM/FileRead.cs +++ b/Adaptation/FileHandlers/RsM/FileRead.cs @@ -14,12 +14,12 @@ namespace Adaptation.FileHandlers.RsM; public class FileRead : Shared.FileRead, IFileRead { - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -28,7 +28,7 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -93,8 +93,6 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) => throw new Exception(string.Concat("Not ", nameof(_IsDuplicator))); - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { Tuple> results = new(string.Empty, null, null, new List()); diff --git a/Adaptation/FileHandlers/RsM/ProcessData.cs b/Adaptation/FileHandlers/RsM/ProcessData.cs index 4fb9f83..cab10ce 100644 --- a/Adaptation/FileHandlers/RsM/ProcessData.cs +++ b/Adaptation/FileHandlers/RsM/ProcessData.cs @@ -8,6 +8,7 @@ using System.IO; using System.Linq; using System.Text; using System.Text.Json; +using System.Text.Json.Serialization; using System.Text.RegularExpressions; namespace Adaptation.FileHandlers.RsM; @@ -271,4 +272,19 @@ public class ProcessData : IProcessData LogBody = stringBuilder.ToString(); } + internal static List GetDescriptions(JsonElement[] jsonElements) + { + List results = new(); + Description description; + JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString }; + foreach (JsonElement jsonElement in jsonElements) + { + if (jsonElement.ValueKind != JsonValueKind.Object) + throw new Exception(); + description = JsonSerializer.Deserialize(jsonElement.ToString(), jsonSerializerOptions); + results.Add(description); + } + return results; + } + } \ No newline at end of file diff --git a/Adaptation/FileHandlers/SPaCe/FileRead.cs b/Adaptation/FileHandlers/SPaCe/FileRead.cs new file mode 100644 index 0000000..c96c4e2 --- /dev/null +++ b/Adaptation/FileHandlers/SPaCe/FileRead.cs @@ -0,0 +1,121 @@ +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.Linq; +using System.Text.Json; + +namespace Adaptation.FileHandlers.SPaCe; + +public class FileRead : Shared.FileRead, IFileRead +{ + + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) + { + _MinFileLength = 10; + _NullData = string.Empty; + _Logistics = new(this); + if (_FileParameter is null) + throw new Exception(cellInstanceConnectionName); + if (_ModelObjectParameterDefinitions is null) + throw new Exception(cellInstanceConnectionName); + if (!_IsDuplicator) + 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 dateTime) + { + if (dateTime == DateTime.MinValue) + { } + Tuple> results; + Tuple pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath); + _Logistics = new Logistics(reportFullPath, pdsf.Item1); + SetFileParameterLotIDToLogisticsMID(); + JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf); + List descriptions = GetDuplicatorDescriptions(jsonElements); + Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); + results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); + return results; + } + +} \ No newline at end of file diff --git a/Adaptation/FileHandlers/ToArchive/FileRead.cs b/Adaptation/FileHandlers/ToArchive/FileRead.cs index 05860a0..d3bb941 100644 --- a/Adaptation/FileHandlers/ToArchive/FileRead.cs +++ b/Adaptation/FileHandlers/ToArchive/FileRead.cs @@ -6,7 +6,6 @@ using Adaptation.Shared.Methods; using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text.Json; namespace Adaptation.FileHandlers.ToArchive; @@ -14,12 +13,12 @@ namespace Adaptation.FileHandlers.ToArchive; public class FileRead : Shared.FileRead, IFileRead { - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, 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, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 10; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -37,7 +36,7 @@ public class FileRead : Shared.FileRead, IFileRead if (fileInfo.Exists && fileInfo.LastWriteTime < fileInfo.CreationTime) File.SetLastWriteTime(_Logistics.ReportFullPath, fileInfo.CreationTime); } - Move(extractResults, exception); + Move(extractResults); } void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -103,12 +102,6 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) - { - if (_Description is not Description) - throw new Exception(); - } - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { if (dateTime == DateTime.MinValue) diff --git a/Adaptation/FileHandlers/pcl/FileRead.cs b/Adaptation/FileHandlers/pcl/FileRead.cs index 872ab73..d8485f0 100644 --- a/Adaptation/FileHandlers/pcl/FileRead.cs +++ b/Adaptation/FileHandlers/pcl/FileRead.cs @@ -14,12 +14,12 @@ namespace Adaptation.FileHandlers.pcl; public class FileRead : Shared.FileRead, IFileRead { - public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) : - base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, useCyclicalForDescription, isEAFHosted) + public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : + base(new Description(), true, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted) { _MinFileLength = 15; _NullData = string.Empty; - _Logistics = new Logistics(this); + _Logistics = new(this); if (_FileParameter is null) throw new Exception(cellInstanceConnectionName); if (_ModelObjectParameterDefinitions is null) @@ -28,7 +28,7 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); } - void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults, exception); + void IFileRead.Move(Tuple> extractResults, Exception exception) => Move(extractResults); void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); @@ -93,8 +93,6 @@ public class FileRead : Shared.FileRead, IFileRead return results; } - void IFileRead.CheckTests(Test[] tests, bool extra) => throw new Exception(string.Concat("Not ", nameof(_IsDuplicator))); - private Tuple> GetExtractResult(string reportFullPath, DateTime dateTime) { Tuple> results = new(string.Empty, null, null, new List()); diff --git a/Adaptation/FileHandlers/pcl/ProcessData.cs b/Adaptation/FileHandlers/pcl/ProcessData.cs index c87cac0..8722792 100644 --- a/Adaptation/FileHandlers/pcl/ProcessData.cs +++ b/Adaptation/FileHandlers/pcl/ProcessData.cs @@ -9,6 +9,7 @@ using System.IO; using System.Linq; using System.Text; using System.Text.Json; +using System.Text.Json.Serialization; using System.Text.RegularExpressions; namespace Adaptation.FileHandlers.pcl; @@ -139,7 +140,7 @@ public class ProcessData : IProcessData private string GetToEOL(bool trim) { string str; - str = (!trim ? GetBefore("\n", false) : GetToEOL()); + str = !trim ? GetBefore("\n", false) : GetToEOL(); return str; } @@ -147,14 +148,14 @@ public class ProcessData : IProcessData { while (true) { - if ((_I >= _Data.Length || !IsNullOrWhiteSpace(_Data.Substring(_I, 1)))) + if (_I >= _Data.Length || !IsNullOrWhiteSpace(_Data.Substring(_I, 1))) break; _I++; } int num = _I; while (true) { - if ((num >= _Data.Length || IsNullOrWhiteSpace(_Data.Substring(num, 1)))) + if (num >= _Data.Length || IsNullOrWhiteSpace(_Data.Substring(num, 1))) break; num++; } @@ -172,7 +173,7 @@ public class ProcessData : IProcessData private bool IsBlankLine() { int num = _Data.IndexOf("\n", _I); - return IsNullOrWhiteSpace((num > -1 ? _Data.Substring(_I, num - _I) : _Data.Substring(_I))); + return IsNullOrWhiteSpace(num > -1 ? _Data.Substring(_I, num - _I) : _Data.Substring(_I)); } private static bool IsNullOrWhiteSpace(string text) @@ -262,7 +263,7 @@ public class ProcessData : IProcessData log = log.Replace(" ", " "); } log = log.Replace(" ", "\t").Replace(": ", "\t").Replace(":\t", "\t"); - IEnumerable lines = (from l in log.Split('\r') select l.Trim()); + IEnumerable lines = from l in log.Split('\r') select l.Trim(); string logFile = Path.ChangeExtension(logistics.ReportFullPath, ".log"); File.WriteAllLines(logFile, lines); fileInfoCollection.Add(new FileInfo(logFile)); @@ -383,7 +384,6 @@ public class ProcessData : IProcessData _Log.Debug($"****ParseData - cde.Run:'{Run}'"); if (string.IsNullOrEmpty(Run)) throw new Exception("Batch (Run) information does not exist"); - //parse out batch and validate string[] parsedBatch = Run.Split('-'); if (parsedBatch.Length >= 1) @@ -400,10 +400,8 @@ public class ProcessData : IProcessData } if (parsedBatch.Length >= 4) Zone = parsedBatch[3]; - //create filename / unique id string timeFormat = "yyyyMMddHHmmss"; - //fix equip StringBuilder equipFixed = new(); foreach (char c in EquipId) @@ -415,13 +413,11 @@ public class ProcessData : IProcessData } EquipId = equipFixed.ToString(); _Log.Debug($"****ParseData - cde.EquipId:'{EquipId}'"); - // The "cde.Run" string is used as part of the SharePoint header unique ID. The "cde.Run" ID is typed // at the tool by the users. The characters are not controlled and the user can type any characters like // "\", "*", ".", " ", etc. Some of these characters are not valid and thus can't be used for the // SharePoint header unique ID. Therefore, we need to filter out invalid characters and only keep the // important ones. - StringBuilder runFixed = new(); foreach (char c in Run) { @@ -429,15 +425,28 @@ public class ProcessData : IProcessData _ = runFixed.Append(c); } Run = runFixed.ToString(); - UniqueId = string.Concat(EquipId, "_", Run, "_", logistics.DateTimeFromSequence.ToString(timeFormat)); - foreach (Detail item in _Details) + foreach (Detail item in _Details.Cast()) { item.HeaderUniqueId = UniqueId; item.UniqueId = string.Concat(item, item.UniqueId); } - fileInfoCollection.Add(new FileInfo(logistics.ReportFullPath)); } + internal static List GetDescriptions(JsonElement[] jsonElements) + { + List results = new(); + Description description; + JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString }; + foreach (JsonElement jsonElement in jsonElements) + { + if (jsonElement.ValueKind != JsonValueKind.Object) + throw new Exception(); + description = JsonSerializer.Deserialize(jsonElement.ToString(), jsonSerializerOptions); + results.Add(description); + } + return results; + } + } \ No newline at end of file diff --git a/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs b/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs index 9d9aa53..57475d5 100644 --- a/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs +++ b/Adaptation/Ifx/Eaf/EquipmentConnector/File/SelfDescription/FileConnectorParameterTypeDefinitionProvider.cs @@ -1,5 +1,4 @@ using Adaptation.Eaf.EquipmentCore.SelfDescription.ParameterTypes; -using System; using System.Collections.Generic; namespace Adaptation.Ifx.Eaf.EquipmentConnector.File.SelfDescription; diff --git a/Adaptation/MET08RESIMAPCDE.Tests.csproj b/Adaptation/MET08RESIMAPCDE.Tests.csproj index 354001d..292d8ab 100644 --- a/Adaptation/MET08RESIMAPCDE.Tests.csproj +++ b/Adaptation/MET08RESIMAPCDE.Tests.csproj @@ -6,12 +6,12 @@ SAK - enable + disable + false 10.0 disable win-x64 net6.0 - false trx @@ -34,20 +34,20 @@ - + - + - - + + - - + + @@ -57,12 +57,15 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - + + diff --git a/Adaptation/Shared/FileRead.cs b/Adaptation/Shared/FileRead.cs index c30ebf5..f043d7c 100644 --- a/Adaptation/Shared/FileRead.cs +++ b/Adaptation/Shared/FileRead.cs @@ -33,8 +33,6 @@ public class FileRead : Properties.IFileRead protected readonly bool _IsDuplicator; protected readonly Calendar _Calendar; protected readonly bool _IsSourceTimer; - protected readonly string _VillachPath; - protected readonly string _ProgressPath; protected readonly string _EquipmentType; protected readonly long _BreakAfterSeconds; protected readonly string _ExceptionSubject; @@ -46,6 +44,7 @@ public class FileRead : Properties.IFileRead protected readonly string _CellInstanceConnectionNameBase; protected readonly Dictionary> _DummyRuns; protected readonly Dictionary _FileParameter; + protected readonly Dictionary> _StaticRuns; protected readonly string _ParameterizedModelObjectDefinitionType; protected readonly FileConnectorConfiguration _FileConnectorConfiguration; protected readonly IList _ModelObjectParameterDefinitions; @@ -63,12 +62,13 @@ public class FileRead : Properties.IFileRead string Properties.IFileRead.CellInstanceConnectionName => _CellInstanceConnectionName; string Properties.IFileRead.ParameterizedModelObjectDefinitionType => _ParameterizedModelObjectDefinitionType; - public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, bool useCyclicalForDescription, bool isEAFHosted) + public FileRead(IDescription description, bool isEvent, ISMTP smtp, Dictionary fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) { _SMTP = smtp; _IsEvent = isEvent; _DummyRuns = dummyRuns; _LastTicksDuration = 0; + _StaticRuns = staticRuns; _IsEAFHosted = isEAFHosted; _Description = description; _FileParameter = fileParameter; @@ -84,6 +84,7 @@ public class FileRead : Properties.IFileRead _IsSourceTimer = fileConnectorConfiguration.SourceFileFilter.StartsWith("*Timer.txt"); string cellInstanceConnectionNameBase = cellInstanceConnectionName.Replace("-", string.Empty); _Hyphens = cellInstanceConnectionName.Length - cellInstanceConnectionNameBase.Length; + _TracePath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Trace"); _ExceptionSubject = string.Concat("Exception:", _CellInstanceConnectionName, _FileConnectorConfiguration?.SourceDirectoryCloaking); string suffix; string[] segments = _ParameterizedModelObjectDefinitionType.Split('.'); @@ -111,16 +112,10 @@ public class FileRead : Properties.IFileRead // if (!string.IsNullOrEmpty(equipmentDictionaryName) && isEvent) // throw new Exception(cellInstanceConnectionName); } - ModelObjectParameterDefinition[] paths = GetProperties(cellInstanceConnectionName, modelObjectParameters, "Path."); - if (paths.Length < 4) - throw new Exception(cellInstanceConnectionName); if (isDuplicator) _MesEntity = string.Empty; else _MesEntity = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, string.Concat("CellInstance.", cellInstanceName, ".Alias")); - _TracePath = (from l in paths where l.Name.EndsWith("Trace") select l.Value).FirstOrDefault(); - _VillachPath = (from l in paths where l.Name.EndsWith("Villach") select l.Value).FirstOrDefault(); - _ProgressPath = (from l in paths where l.Name.EndsWith("Progress") select l.Value).FirstOrDefault(); _EventName = eventName; _EventNameFileRead = eventNameFileRead; _EquipmentType = parameterizedModelObjectDefinitionTypeAppended; @@ -130,9 +125,11 @@ public class FileRead : Properties.IFileRead else { if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.TimeBased) - breakAfterSeconds = 360; - else + breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileHandleTimeout.Value); + else if (_FileConnectorConfiguration.FileScanningOption == FileConnectorConfiguration.FileScanningOptionEnum.FileWatcher) breakAfterSeconds = Math.Abs(_FileConnectorConfiguration.FileScanningIntervalInSeconds.Value); + else + throw new Exception(); } _BreakAfterSeconds = breakAfterSeconds; UpdateLastTicksDuration(breakAfterSeconds * 10000000); @@ -142,13 +139,13 @@ public class FileRead : Properties.IFileRead throw new Exception("_Configuration is empty?"); if (_FileConnectorConfiguration.TargetFileLocation.Contains('%') || _FileConnectorConfiguration.ErrorTargetFileLocation.Contains('%')) throw new Exception("_Configuration is incorrect for a duplicator!"); - if (_FileConnectorConfiguration is not null) - { - if (string.IsNullOrEmpty(_FileConnectorConfiguration.SourceDirectoryCloaking)) - throw new Exception("SourceDirectoryCloaking is empty?"); - if (!_FileConnectorConfiguration.SourceDirectoryCloaking.StartsWith("~")) - throw new Exception("SourceDirectoryCloaking is incorrect for a duplicator!"); - } + // if (_FileConnectorConfiguration is not null) + // { + // if (string.IsNullOrEmpty(_FileConnectorConfiguration.SourceDirectoryCloaking)) + // throw new Exception("SourceDirectoryCloaking is empty?"); + // if (!_FileConnectorConfiguration.SourceDirectoryCloaking.StartsWith("~")) + // throw new Exception("SourceDirectoryCloaking is incorrect for a duplicator!"); + // } } } @@ -183,6 +180,7 @@ public class FileRead : Properties.IFileRead if (ticksDuration < 50000000) ticksDuration = 50000000; _LastTicksDuration = (long)Math.Ceiling(ticksDuration * .667); + _Log.Info($"{new TimeSpan(ticksDuration).TotalMilliseconds} TotalMillisecond(s) to process{Environment.NewLine}{_CellInstanceConnectionName}{Environment.NewLine}<{_ReportFullPath}>"); } protected void WaitForThread(Thread thread, List threadExceptions) @@ -216,35 +214,16 @@ public class FileRead : Properties.IFileRead } } - protected void CreateProgressDirectory(string[] exceptionLines) + private void WriteAllLines(string to, string[] exceptionLines) { - string progressDirectory; - StringBuilder stringBuilder = new(); - if (_Hyphens == 0) - progressDirectory = Path.Combine(_ProgressPath, _CellInstanceConnectionName); - else + string fileName = string.Concat(to, @"\readme.txt"); + try { - _ = stringBuilder.Clear(); - for (int i = 0; i < _Hyphens; i++) - { - if (i > 0 && (i % 2) == 0) - _ = stringBuilder.Append(' '); - _ = stringBuilder.Append('-'); - } - progressDirectory = string.Concat(_ProgressPath, @"\", (_Hyphens + 1).ToString().PadLeft(2, '0'), " ", stringBuilder).Trim(); - } - DateTime dateTime = DateTime.Now; - string weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - progressDirectory = string.Concat(progressDirectory, @"\", dateTime.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.MID, "_", _Logistics.Sequence, "_", DateTime.Now.Ticks - _Logistics.Sequence); - if (!Directory.Exists(progressDirectory)) - _ = Directory.CreateDirectory(progressDirectory); - if (exceptionLines is not null) - { - string fileName = string.Concat(progressDirectory, @"\readme.txt"); - try - { File.WriteAllLines(fileName, exceptionLines); } - catch (Exception) { } + if (!Directory.Exists(to)) + _ = Directory.CreateDirectory(to); + File.WriteAllLines(fileName, exceptionLines); } + catch (Exception ex) { _Log.Error(ex.Message); } } protected string[] Move(Tuple> extractResults, string to, string from, string resolvedFileLocation, Exception exception) @@ -258,7 +237,8 @@ public class FileRead : Properties.IFileRead else { results = new string[] { _Logistics.Sequence.ToString(), _Logistics.ReportFullPath, from, resolvedFileLocation, to, string.Empty, string.Empty, exception.Message, string.Empty, string.Empty, exception.StackTrace }; - Shared0449(to, results); + if (!_IsDuplicator) + WriteAllLines(to, results); } if (extractResults is not null && extractResults.Item4 is not null && extractResults.Item4.Any()) { @@ -279,64 +259,6 @@ public class FileRead : Properties.IFileRead return results; } - protected static IEnumerable GetDirectoriesRecursively(string path, string directoryNameSegment = null) - { - Queue queue = new(); - queue.Enqueue(path); - while (queue.Count > 0) - { - path = queue.Dequeue(); - foreach (string subDirectory in Directory.GetDirectories(path)) - { - queue.Enqueue(subDirectory); - if (string.IsNullOrEmpty(directoryNameSegment) || Path.GetFileName(subDirectory).Contains(directoryNameSegment)) - yield return subDirectory; - } - } - } - - protected string GetProcessedDirectory(string progressPath, Logistics logistics, DateTime dateTime, string duplicateDirectory) - { - string result = duplicateDirectory; - string logisticsSequence = logistics.Sequence.ToString(); - string[] matchDirectories; - if (!_IsEAFHosted) - matchDirectories = new string[] { Path.GetDirectoryName(Path.GetDirectoryName(logistics.ReportFullPath)) }; - else - matchDirectories = new string[] { GetDirectoriesRecursively(Path.GetDirectoryName(progressPath), logisticsSequence).FirstOrDefault() }; - if (matchDirectories.Length == 0 || string.IsNullOrEmpty(matchDirectories[0])) - matchDirectories = Directory.GetDirectories(duplicateDirectory, string.Concat('*', logisticsSequence, '*'), SearchOption.AllDirectories); - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - if (!matchDirectories[0].Contains("_processed")) - { - result = string.Concat(matchDirectories[0].Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0], logistics.DateTimeFromSequence.ToString("yyyy-MM-dd_hh;mm_tt_"), dateTime.Ticks - logistics.Sequence, "_processed"); - Directory.Move(matchDirectories[0], result); - result = string.Concat(result, @"\", logistics.Sequence); - if (!Directory.Exists(result)) - _ = Directory.CreateDirectory(result); - } - return result; - } - - protected string WriteScopeInfo(string progressPath, Logistics logistics, DateTime dateTime, string duplicateDirectory, List> tuples) - { - string result = GetProcessedDirectory(progressPath, logistics, dateTime, duplicateDirectory); - string tupleFile; - string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath); - string duplicateFile = string.Concat(result, @"\", fileName, ".pdsf"); - foreach (Tuple tuple in tuples) - { - if (tuple.Item1.FileName.StartsWith(@"\")) - tupleFile = tuple.Item1.FileName; - else - tupleFile = string.Concat(result, @"\", fileName, "_", tuple.Item1.FileNameWithoutExtension, ".pdsfc"); - File.WriteAllText(tupleFile, tuple.Item2); - } - File.Copy(logistics.ReportFullPath, duplicateFile, overwrite: true); - return result; - } - protected static string GetTupleFile(Logistics logistics, Properties.IScopeInfo scopeInfo, string duplicateDirectory) { string result; @@ -369,34 +291,34 @@ public class FileRead : Properties.IFileRead return result; } - protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, string successDirectory, string duplicateDirectory, string duplicateFile, List> tuples) + protected void WaitForFileConsumption(string sourceDirectoryCloaking, Logistics logistics, DateTime dateTime, string successDirectory, string duplicateDirectory, string duplicateFile, List<(Properties.IScopeInfo, string)> tuples) { bool check; long preWait; string tupleFile; - List consumedFileIndices = new(); List duplicateFiles = new(); - bool moreThanAnHour = (_BreakAfterSeconds > 3600); StringBuilder stringBuilder = new(); + List consumedFileIndices = new(); + bool moreThanAnHour = _BreakAfterSeconds > 3600; long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks; - if (moreThanAnHour) - preWait = dateTime.AddSeconds(30).Ticks; + if (_FileConnectorConfiguration?.FileHandleWaitTime is null) + preWait = dateTime.AddMilliseconds(1234).Ticks; else - preWait = dateTime.AddTicks(_LastTicksDuration).Ticks; + preWait = dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; if (!tuples.Any()) duplicateFiles.Add(duplicateFile); string fileName = Path.GetFileNameWithoutExtension(logistics.ReportFullPath); string successFile = string.Concat(successDirectory, @"\", Path.GetFileName(logistics.ReportFullPath)); - foreach (Tuple tuple in tuples) + foreach ((Properties.IScopeInfo scopeInfo, string text) in tuples) { - if (tuple.Item1.FileName.StartsWith(@"\")) - tupleFile = tuple.Item1.FileName; - else if (!tuple.Item1.FileName.Contains('%')) - tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", tuple.Item1.FileNameWithoutExtension, ".pdsfc"); + if (scopeInfo.FileName.StartsWith(@"\")) + tupleFile = scopeInfo.FileName; + else if (!scopeInfo.FileName.Contains('%')) + tupleFile = string.Concat(duplicateDirectory, @"\", fileName, "_", scopeInfo.FileNameWithoutExtension, ".pdsfc"); else - tupleFile = GetTupleFile(logistics, tuple.Item1, duplicateDirectory); + tupleFile = GetTupleFile(logistics, scopeInfo, duplicateDirectory); duplicateFiles.Add(tupleFile); - File.WriteAllText(tupleFile, tuple.Item2); + File.WriteAllText(tupleFile, text); } for (short i = 0; i < short.MaxValue; i++) { @@ -410,7 +332,7 @@ public class FileRead : Properties.IFileRead { try { - check = (string.IsNullOrEmpty(successDirectory) || File.Exists(successFile)); + check = string.IsNullOrEmpty(successDirectory) || File.Exists(successFile); if (check) { consumedFileIndices.Clear(); @@ -482,7 +404,7 @@ public class FileRead : Properties.IFileRead { string directory; if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType) - directory = Path.Combine(_VillachPath, _EquipmentType, "Target"); + directory = Path.Combine(_TracePath, _EquipmentType, "Target", _CellInstanceName, _CellInstanceConnectionName); else directory = Path.Combine(_TracePath, _EquipmentType, "Source", _CellInstanceName, _CellInstanceConnectionName); if (!Directory.Exists(directory)) @@ -498,14 +420,8 @@ public class FileRead : Properties.IFileRead } } - protected void Move(Tuple> extractResults, Exception exception) + protected void Move(Tuple> extractResults) { - bool isErrorFile = exception is not null; - if (!isErrorFile && _IsDuplicator) - { - if (_IsEAFHosted && !string.IsNullOrEmpty(_ProgressPath)) - CreateProgressDirectory(exceptionLines: null); - } if (!_IsEAFHosted) { string to; @@ -583,20 +499,6 @@ public class FileRead : Properties.IFileRead return results; } - protected static Dictionary> GetKeyValuePairs(List descriptions) - { - Dictionary> results = new(); - Test testKey; - for (int i = 0; i < descriptions.Count; i++) - { - testKey = (Test)descriptions[i].Test; - if (!results.ContainsKey(testKey)) - results.Add(testKey, new List()); - results[testKey].Add(descriptions[i]); - } - return results; - } - protected static List GetDuplicatorDescriptions(JsonElement[] jsonElements) { List results = new(); @@ -612,34 +514,7 @@ public class FileRead : Properties.IFileRead return results; } - protected static Tuple>> GetTuple(IFileRead fileRead, IEnumerable descriptions, bool extra = false) - { - Tuple>> result; - Dictionary> keyValuePairs = GetKeyValuePairs(descriptions.ToList()); - Test[] tests = (from l in keyValuePairs select l.Key).ToArray(); - fileRead.CheckTests(tests, extra); - result = new Tuple>>(tests, keyValuePairs); - return result; - } - - protected void Shared0449(string to, string[] exceptionLines) - { - if (_IsDuplicator) - CreateProgressDirectory(exceptionLines: null); - else - { - string fileName = string.Concat(to, @"\readme.txt"); - try - { - if (!Directory.Exists(to)) - _ = Directory.CreateDirectory(to); - File.WriteAllLines(fileName, exceptionLines); - } - catch (Exception ex) { _Log.Error(ex.Message); } - } - } - - protected void Shared1880(string itemFile, List directories, FileInfo sourceFile, bool isErrorFile) + private void Shared1880(string itemFile, List directories, FileInfo sourceFile, bool isErrorFile) { string itemDirectory; directories.Add(Path.GetDirectoryName(sourceFile.FullName)); @@ -674,7 +549,7 @@ public class FileRead : Properties.IFileRead } } - protected void Shared1811(string to, FileInfo sourceFile) + private void Shared1811(string to, FileInfo sourceFile) { if (!_IsDuplicator && _FileConnectorConfiguration.SourceFileFilter != "*" && sourceFile.Exists && sourceFile.Length < _MinFileLength) { @@ -682,7 +557,7 @@ public class FileRead : Properties.IFileRead string jobIdDirectory = Path.GetDirectoryName(to); DateTime dateTime = DateTime.Now.AddMinutes(-15); string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00"); - string weekDirectory = string.Concat(_Logistics.DateTimeFromSequence.ToString("yyyy"), "_Week_", weekOfYear, @"\", _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd")); + string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}{@"\"}{_Logistics.DateTimeFromSequence:yyyy-MM-dd}"; string destinationDirectory = string.Concat(jobIdDirectory, @"\_ Ignore 100 bytes\", weekDirectory, @"\", directoryName); if (!Directory.Exists(destinationDirectory)) _ = Directory.CreateDirectory(destinationDirectory); @@ -711,7 +586,7 @@ public class FileRead : Properties.IFileRead } } - protected void Shared0231(List directories) + private void Shared0231(List directories) { if (_FileConnectorConfiguration.PostProcessingMode != FileConnectorConfiguration.PostProcessingModeEnum.Copy) { @@ -723,13 +598,13 @@ public class FileRead : Properties.IFileRead } } - protected void Shared0413(DateTime dateTime, bool isDummyRun, string successDirectory, string duplicateDirectory, List> tuples, string duplicateFile) + protected void WaitForFileConsumption(DateTime dateTime, bool isDummyRun, string successDirectory, string duplicateDirectory, List<(Properties.IScopeInfo, string)> tuples, string duplicateFile) { if (!isDummyRun && _IsEAFHosted) WaitForFileConsumption(_FileConnectorConfiguration.SourceDirectoryCloaking, _Logistics, dateTime, successDirectory, duplicateDirectory, duplicateFile, tuples); else { - long breakAfter = DateTime.Now.AddSeconds(_FileConnectorConfiguration.ConnectionRetryInterval.Value).Ticks; + long breakAfter = DateTime.Now.AddSeconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks; for (short i = 0; i < short.MaxValue; i++) { if (!_IsEAFHosted || DateTime.Now.Ticks > breakAfter) @@ -739,75 +614,33 @@ public class FileRead : Properties.IFileRead } } - protected static void Shared0607(string reportFullPath, string duplicateDirectory, string logisticsSequence, string destinationDirectory) + internal static string GetJobIdParentDirectory(string directory) { - if (destinationDirectory == duplicateDirectory) - throw new Exception("Check Target File Folder for %LotIDWithLogisticsSequence%_in process on CI (not Duplicator)"); - if (destinationDirectory.EndsWith(logisticsSequence)) - destinationDirectory = Path.GetDirectoryName(destinationDirectory); - string[] deleteFiles = Directory.GetFiles(destinationDirectory, "*", SearchOption.AllDirectories); - if (deleteFiles.Length > 250) - throw new Exception("Safety net!"); - foreach (string file in deleteFiles) - File.Delete(file); - Directory.Delete(destinationDirectory, recursive: true); - File.Delete(reportFullPath); + string result; + if (!string.IsNullOrEmpty(Path.GetFileName(directory))) + result = Path.GetFullPath(Path.GetDirectoryName(Path.GetDirectoryName(directory))); + else + result = Path.GetFullPath(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(directory)))); + if (!Directory.Exists(result)) + _ = Directory.CreateDirectory(result); + return result; } - protected string[] Shared1567(string reportFullPath, List> tuples) + internal string[] GetInProcessDirectory(string jobIdDirectory) { string[] results; - string historicalText; - string logisticsSequence = _Logistics.Sequence.ToString(); - string jobIdDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\", _Logistics.JobID); - if (!Directory.Exists(jobIdDirectory)) - _ = Directory.CreateDirectory(jobIdDirectory); - string[] matchDirectories; if (!_IsEAFHosted) - matchDirectories = new string[] { Path.GetDirectoryName(Path.GetDirectoryName(reportFullPath)) }; + results = new string[] { jobIdDirectory }; else - matchDirectories = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly); - if ((matchDirectories is null) || matchDirectories.Length != 1) - throw new Exception("Didn't find directory by logistics sequence"); - string fileName = Path.GetFileNameWithoutExtension(reportFullPath); - string sequenceDirectory = string.Concat(matchDirectories[0], @"\", logisticsSequence); - if (!Directory.Exists(sequenceDirectory)) - _ = Directory.CreateDirectory(sequenceDirectory); - foreach (Tuple tuple in tuples) { - fileName = string.Concat(sequenceDirectory, @"\", fileName, "_", tuple.Item1.FileNameWithoutExtension, ".pdsfc"); - if (_IsEAFHosted) - File.WriteAllText(fileName, tuple.Item2); - else - { - if (File.Exists(fileName)) - { - historicalText = File.ReadAllText(fileName); - if (tuple.Item2 != historicalText) - throw new Exception("File doesn't match historical!"); - } - } + string logisticsSequence = _Logistics.Sequence.ToString(); + results = Directory.GetDirectories(jobIdDirectory, string.Concat(_Logistics.MID, '*', logisticsSequence, '*'), SearchOption.TopDirectoryOnly); } - results = matchDirectories; + if ((results is null) || results.Length != 1) + throw new Exception("Didn't find directory by logistics sequence"); return results; } - protected void Shared1277(string reportFullPath, string destinationDirectory, string logisticsSequence, string jobIdDirectory, string json) - { - string ecCharacterizationSi = Path.GetDirectoryName(Path.GetDirectoryName(jobIdDirectory)); - string destinationJobIdDirectory = string.Concat(ecCharacterizationSi, @"\Processed\", _Logistics.JobID); - if (!Directory.Exists(destinationJobIdDirectory)) - _ = Directory.CreateDirectory(destinationJobIdDirectory); - destinationJobIdDirectory = string.Concat(destinationJobIdDirectory, @"\", Path.GetFileName(destinationDirectory).Split(new string[] { logisticsSequence }, StringSplitOptions.None)[0], _Logistics.DateTimeFromSequence.ToString("yyyy-MM-dd_hh;mm_tt_"), DateTime.Now.Ticks - _Logistics.Sequence); - string sequenceDirectory = string.Concat(destinationJobIdDirectory, @"\", logisticsSequence); - string jsonFileName = string.Concat(sequenceDirectory, @"\", Path.GetFileNameWithoutExtension(reportFullPath), ".json"); - Directory.Move(destinationDirectory, destinationJobIdDirectory); - if (!Directory.Exists(sequenceDirectory)) - _ = Directory.CreateDirectory(sequenceDirectory); - File.Copy(reportFullPath, string.Concat(sequenceDirectory, @"\", Path.GetFileName(reportFullPath)), overwrite: true); - File.WriteAllText(jsonFileName, json); - } - } -// 2022-02-14 -> Shared - FileRead \ No newline at end of file +// 2022-05-13 -> Shared - FileRead \ No newline at end of file diff --git a/Adaptation/Shared/Methods/IFileRead.cs b/Adaptation/Shared/Methods/IFileRead.cs index 4d383c3..3d690c1 100644 --- a/Adaptation/Shared/Methods/IFileRead.cs +++ b/Adaptation/Shared/Methods/IFileRead.cs @@ -12,7 +12,6 @@ public interface IFileRead : Properties.IFileRead JsonProperty[] GetDefault(); string GetEventDescription(); List GetHeaderNames(); - void CheckTests(Test[] tests, bool extra); Dictionary GetDisplayNamesJsonElement(); Tuple> ReExtract(); List GetDescriptions(IFileRead fileRead, List tests, IProcessData processData); diff --git a/Adaptation/Shared/Metrology/WS.cs b/Adaptation/Shared/Metrology/WS.cs index ae43eb9..b892219 100644 --- a/Adaptation/Shared/Metrology/WS.cs +++ b/Adaptation/Shared/Metrology/WS.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Net.Http; using System.Text; using System.Text.Json; @@ -11,14 +10,14 @@ namespace Adaptation.Shared.Metrology; public partial class WS { - public static Tuple SendData(string url, object payload, int timeoutSeconds = 120) + public static (string, Results) SendData(string url, object payload, int timeoutSeconds = 120) { Results results = new(); string resultsJson = string.Empty; try { string json = JsonSerializer.Serialize(payload, payload.GetType()); - if (string.IsNullOrEmpty(url) || !url.Contains(':') || !url.Contains('.')) + if (string.IsNullOrEmpty(url) || !url.Contains(":") || !url.Contains(".")) throw new Exception("Invalid URL"); using (HttpClient httpClient = new()) { @@ -49,7 +48,7 @@ public partial class WS results.Errors = new List(); results.Errors.Add(stringBuilder.ToString()); } - return new Tuple(resultsJson, results); + return new(resultsJson, results); } // this method is a wrapper for attaching a file to either a header or data record diff --git a/Adaptation/Shared/ProcessDataStandardFormat.cs b/Adaptation/Shared/ProcessDataStandardFormat.cs index 251d1b4..33a248e 100644 --- a/Adaptation/Shared/ProcessDataStandardFormat.cs +++ b/Adaptation/Shared/ProcessDataStandardFormat.cs @@ -348,8 +348,8 @@ public class ProcessDataStandardFormat int startsAt = 0; string[] segments; int? currentGroup = null; - char inputSeperator = '\t'; - char outputSeperator = '\t'; + char inputSeparator = '\t'; + char outputSeparator = '\t'; List vs = new(); List groups = new(); string[] lines = File.ReadAllLines(reportFullPath); @@ -358,7 +358,7 @@ public class ProcessDataStandardFormat { if (string.IsNullOrEmpty(lines[i])) continue; - segments = lines[i].Split(inputSeperator); + segments = lines[i].Split(inputSeparator); if (currentGroup is null) currentGroup = segments.Length; if (segments.Length != currentGroup) @@ -368,20 +368,20 @@ public class ProcessDataStandardFormat startsAt = i; } } - if (startsAt == lines.Length - 1 && lines[0].Split(inputSeperator).Length != currentGroup) + if (startsAt == lines.Length - 1 && lines[0].Split(inputSeparator).Length != currentGroup) groups.Add(new int[] { lines.Length - 1, lines.Length - 1 }); for (int g = 0; g < groups.Count; g++) { vs.Clear(); group = groups[g]; line = lines[group[0]]; - segments = line.Split(inputSeperator); + segments = line.Split(inputSeparator); for (int s = 0; s < segments.Length; s++) vs.Add(segments[s].Length); for (int i = group[0]; i <= group[1]; i++) { line = lines[i]; - segments = line.Split(inputSeperator); + segments = line.Split(inputSeparator); for (int s = 0; s < segments.Length; s++) { if (vs[s] < segments[s].Length) @@ -390,16 +390,16 @@ public class ProcessDataStandardFormat } _ = stringBuilder.Clear(); for (int s = 0; s < segments.Length; s++) - _ = stringBuilder.Append((s + 1).ToString().PadLeft(vs[s], ' ')).Append(outputSeperator); + _ = stringBuilder.Append((s + 1).ToString().PadLeft(vs[s], ' ')).Append(outputSeparator); _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); results.Add(stringBuilder.ToString()); for (int i = group[0]; i <= group[1]; i++) { line = lines[i]; _ = stringBuilder.Clear(); - segments = line.Split(inputSeperator); + segments = line.Split(inputSeparator); for (int s = 0; s < segments.Length; s++) - _ = stringBuilder.Append(segments[s].PadLeft(vs[s], ' ')).Append(outputSeperator); + _ = stringBuilder.Append(segments[s].PadLeft(vs[s], ' ')).Append(outputSeparator); _ = stringBuilder.Remove(stringBuilder.Length - 1, 1); results.Add(stringBuilder.ToString()); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs index 2757607..8c00f1a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE2.cs @@ -1,11 +1,11 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; -namespace _Tests.CreateSelfDescription.Staging.v2_36_1; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_36_1; [TestClass] public class CDE2 : EAFLoggingUnitTesting diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs index 68fd515..24b36a8 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3-EQPT.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_36_1; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_36_1; [TestClass] public class CDE3_EQPT : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting string check = "WafrMeas.log|.RsM"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs index 9ca7978..1a4aa19 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE3.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_36_1; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_36_1; [TestClass] public class CDE3 : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class CDE3 : EAFLoggingUnitTesting string check = "*.RsM"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs index c6c548a..f3d18af 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/CDE5.cs @@ -1,16 +1,11 @@ -using Adaptation.Shared; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; -using System.Text.Json; -using System.Threading; -namespace _Tests.CreateSelfDescription.Staging.v2_36_1; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_36_1; [TestClass] public class CDE5 : EAFLoggingUnitTesting diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs index f144bc6..1324388 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.36.1/MET08RESIMAPCDE.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_36_1; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_36_1; [TestClass] public class MET08RESIMAPCDE : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToOpenInsightMetrologyViewer"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -64,7 +63,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToIQSSi"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -74,7 +73,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToOpenInsight"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -84,7 +83,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToOpenInsightMetrologyViewerAttachments"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -94,7 +93,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToAPC"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -104,7 +103,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToSPaCe"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -114,7 +113,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToArchive"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -124,7 +123,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsArchive"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -134,7 +133,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsDummy"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs index 406aa7a..e65071a 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE2.cs @@ -1,11 +1,11 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; -namespace _Tests.CreateSelfDescription.Staging.v2_39_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_0; [TestClass] public class CDE2 : EAFLoggingUnitTesting diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs index 8e129f8..1216747 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3-EQPT.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_0; [TestClass] public class CDE3_EQPT : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class CDE3_EQPT : EAFLoggingUnitTesting string check = "WafrMeas.log|.RsM"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs index 87385b4..5bc937b 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE3.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_0; [TestClass] public class CDE3 : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class CDE3 : EAFLoggingUnitTesting string check = "*.RsM"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs index 5881aee..8fb76ee 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/CDE5.cs @@ -1,16 +1,11 @@ -using Adaptation.Shared; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; -using System.Text.Json; -using System.Threading; -namespace _Tests.CreateSelfDescription.Staging.v2_39_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_0; [TestClass] public class CDE5 : EAFLoggingUnitTesting diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs index 4e39513..4d824f3 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIMAPCDE.cs @@ -1,13 +1,12 @@ -using Adaptation.Shared.Methods; +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; using System; using System.Diagnostics; using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_39_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_39_0; [TestClass] public class MET08RESIMAPCDE : EAFLoggingUnitTesting @@ -54,7 +53,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToOpenInsightMetrologyViewer"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -64,7 +63,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToIQSSi"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -74,7 +73,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToOpenInsight"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -84,7 +83,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToOpenInsightMetrologyViewerAttachments"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -94,7 +93,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToAPC"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -104,7 +103,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToSPaCe"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -114,7 +113,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsXToArchive"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -124,7 +123,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsArchive"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } @@ -134,7 +133,7 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting string check = "~IsDummy"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE2.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs similarity index 89% rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE2.cs rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs index 275ed0e..2a1f53c 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE2.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE2.cs @@ -1,9 +1,11 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; +using System; using System.Diagnostics; +using System.IO; -namespace _Tests.CreateSelfDescription.Staging.v2_43_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2; [TestClass] public class CDE2 : EAFLoggingUnitTesting @@ -45,7 +47,7 @@ public class CDE2 : EAFLoggingUnitTesting } [TestMethod] - public void Staging__v2_43_0__CDE2__() + public void Staging__v2_43_2__CDE2__() { } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs similarity index 88% rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE3-EQPT.cs rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs index 0d5685f..655826d 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE3-EQPT.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3-EQPT.cs @@ -1,10 +1,12 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; +using System; using System.Diagnostics; +using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_43_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2; [TestClass] public class CDE3_EQPT : EAFLoggingUnitTesting @@ -46,12 +48,12 @@ public class CDE3_EQPT : EAFLoggingUnitTesting } [TestMethod] - public void Staging__v2_43_0__CDE3_EQPT__DownloadRsMFile() + public void Staging__v2_43_2__CDE3_EQPT__DownloadRsMFile() { string check = "WafrMeas.log|.RsM"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs similarity index 88% rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE3.cs rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs index cc2a4cb..a403bbf 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE3.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE3.cs @@ -1,10 +1,12 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; +using System; using System.Diagnostics; +using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_43_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2; [TestClass] public class CDE3 : EAFLoggingUnitTesting @@ -46,12 +48,12 @@ public class CDE3 : EAFLoggingUnitTesting } [TestMethod] - public void Staging__v2_43_0__CDE3__RsM() + public void Staging__v2_43_2__CDE3__RsM() { string check = "*.RsM"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE5.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs similarity index 89% rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE5.cs rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs index 802e31b..8d74a24 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/CDE5.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/CDE5.cs @@ -1,9 +1,11 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; +using System; using System.Diagnostics; +using System.IO; -namespace _Tests.CreateSelfDescription.Staging.v2_43_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2; [TestClass] public class CDE5 : EAFLoggingUnitTesting @@ -45,7 +47,7 @@ public class CDE5 : EAFLoggingUnitTesting } [TestMethod] - public void Staging__v2_43_0__CDE5__() + public void Staging__v2_43_2__CDE5__() { } diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08RESIMAPCDE.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs similarity index 69% rename from Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08RESIMAPCDE.cs rename to Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs index 089d9cd..ae8cd86 100644 --- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.0/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.43.2/MET08RESIMAPCDE.cs @@ -1,10 +1,12 @@ +using Adaptation._Tests.Shared; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared; +using System; using System.Diagnostics; +using System.IO; using System.Reflection; -namespace _Tests.CreateSelfDescription.Staging.v2_43_0; +namespace Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2; [TestClass] public class MET08RESIMAPCDE : EAFLoggingUnitTesting @@ -46,92 +48,102 @@ public class MET08RESIMAPCDE : EAFLoggingUnitTesting } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE() + public void Staging__v2_43_2__MET08RESIMAPCDE__MoveMatchingFiles() { - string check = "~IsXToOpenInsightMetrologyViewer"; + string check = "*.p"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_() + public void Staging__v2_43_2__MET08RESIMAPCDE__OpenInsightMetrologyViewer() { - string check = "~IsXToIQSSi"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE__() + public void Staging__v2_43_2__MET08RESIMAPCDE__IQSSi() { - string check = "~IsXToOpenInsight"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE___() + public void Staging__v2_43_2__MET08RESIMAPCDE__OpenInsight() { - string check = "~IsXToOpenInsightMetrologyViewerAttachments"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE____() + public void Staging__v2_43_2__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments() { - string check = "~IsXToAPC"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_____() + public void Staging__v2_43_2__MET08RESIMAPCDE__APC() { - string check = "~IsXToSPaCe"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE______() + public void Staging__v2_43_2__MET08RESIMAPCDE__SPaCe() { - string check = "~IsXToArchive"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_______() + public void Staging__v2_43_2__MET08RESIMAPCDE__Processed() { - string check = "~IsArchive"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE________() + public void Staging__v2_43_2__MET08RESIMAPCDE__Archive() { - string check = "~IsDummy"; + string check = "*.pdsf"; MethodBase methodBase = new StackFrame().GetMethod(); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); - _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); + } + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__Dummy() + { + string check = "637400762024374000.zip"; + MethodBase methodBase = new StackFrame().GetMethod(); + EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration")); + _ = AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting); EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit")); } diff --git a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs index acd9b00..ccfb4bf 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3-EQPT.cs @@ -1,14 +1,6 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_36_1; +namespace Adaptation._Tests.Extract.Staging.v2_36_1; [TestClass] public class CDE3_EQPT diff --git a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs index 1aa486a..8ec7229 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.36.1/CDE3.cs @@ -2,13 +2,11 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_36_1; +namespace Adaptation._Tests.Extract.Staging.v2_36_1; [TestClass] public class CDE3 @@ -39,10 +37,10 @@ public class CDE3 string[] variables = _CDE3.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _CDE3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - string extractResultItem1 = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); - dateTime = Adaptation.FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); + string extractResultItem1 = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); - dateTime = Adaptation.FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); string logBody = @" RUN [59-478796-3978.1] diff --git a/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs index 09e1f93..4868af5 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.36.1/MET08RESIMAPCDE.cs @@ -1,14 +1,10 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_36_1; +namespace Adaptation._Tests.Extract.Staging.v2_36_1; [TestClass] public class MET08RESIMAPCDE @@ -38,7 +34,7 @@ public class MET08RESIMAPCDE string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - _ = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } [TestMethod] diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3-EQPT.cs index 552ead3..2044d55 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3-EQPT.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3-EQPT.cs @@ -1,14 +1,6 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_0; +namespace Adaptation._Tests.Extract.Staging.v2_39_0; [TestClass] public class CDE3_EQPT diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3.cs index 28978e6..837b005 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/CDE3.cs @@ -2,13 +2,11 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_0; +namespace Adaptation._Tests.Extract.Staging.v2_39_0; [TestClass] public class CDE3 @@ -39,10 +37,10 @@ public class CDE3 string[] variables = _CDE3.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _CDE3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - string extractResultItem1 = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); - dateTime = Adaptation.FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); + string extractResultItem1 = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); - dateTime = Adaptation.FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); string logBody = @" RUN [59-478796-3978.1] diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIMAPCDE.cs index b643258..d5e7ff9 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIMAPCDE.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIMAPCDE.cs @@ -1,14 +1,10 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Reflection; -using System.Text.Json; -namespace _Tests.Extract.Staging.v2_39_0; +namespace Adaptation._Tests.Extract.Staging.v2_39_0; [TestClass] public class MET08RESIMAPCDE @@ -38,7 +34,7 @@ public class MET08RESIMAPCDE string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - _ = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); + _ = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics); } [TestMethod] diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE3-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE3-EQPT.cs deleted file mode 100644 index c2d1da8..0000000 --- a/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE3-EQPT.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace _Tests.Extract.Staging.v2_43_0; - -[TestClass] -public class CDE3_EQPT -{ - -#pragma warning disable CA2254 -#pragma warning disable IDE0060 - - private static CreateSelfDescription.Staging.v2_43_0.CDE3_EQPT _CDE3_EQPT; - - [ClassInitialize] - public static void ClassInitialize(TestContext testContext) - { - CreateSelfDescription.Staging.v2_43_0.CDE3_EQPT.ClassInitialize(testContext); - _CDE3_EQPT = CreateSelfDescription.Staging.v2_43_0.CDE3_EQPT.EAFLoggingUnitTesting; - } - - [TestMethod] - public void Staging__v2_43_0__CDE3_EQPT__DownloadRsMFile() => _CDE3_EQPT.Staging__v2_43_0__CDE3_EQPT__DownloadRsMFile(); - -} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08RESIMAPCDE.cs deleted file mode 100644 index 91ba7fe..0000000 --- a/Adaptation/_Tests/Extract/Staging/v2.43.0/MET08RESIMAPCDE.cs +++ /dev/null @@ -1,64 +0,0 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Diagnostics; -using System.Reflection; - -namespace _Tests.Extract.Staging.v2_43_0; - -[TestClass] -public class MET08RESIMAPCDE -{ - -#pragma warning disable CA2254 -#pragma warning disable IDE0060 - - private static CreateSelfDescription.Staging.v2_43_0.MET08RESIMAPCDE _MET08RESIMAPCDE; - - [ClassInitialize] - public static void ClassInitialize(TestContext testContext) - { - CreateSelfDescription.Staging.v2_43_0.MET08RESIMAPCDE.ClassInitialize(testContext); - _MET08RESIMAPCDE = CreateSelfDescription.Staging.v2_43_0.MET08RESIMAPCDE.EAFLoggingUnitTesting; - } - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE637710931421087642__Normal() - { - string check = "~IsXToOpenInsightMetrologyViewer"; - MethodBase methodBase = new StackFrame().GetMethod(); - _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE(); - string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check); - IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); - Logistics logistics = new(fileRead); - _ = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics); - } - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE__() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE__(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE___() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE___(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE____() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE____(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_____() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_____(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE______() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE______(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_______() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE_______(); - - [TestMethod] - public void Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE________() => _MET08RESIMAPCDE.Staging__v2_43_0__MET08RESIMAPCDE__MET08RESIMAPCDE________(); - -} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE2.cs b/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE2.cs similarity index 100% rename from Adaptation/_Tests/Extract/Staging/v2.43.0/CDE2.cs rename to Adaptation/_Tests/Extract/Staging/v2.43.2/CDE2.cs diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE3-EQPT.cs b/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE3-EQPT.cs new file mode 100644 index 0000000..eb6f361 --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE3-EQPT.cs @@ -0,0 +1,24 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_43_2; + +[TestClass] +public class CDE3_EQPT +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_2.CDE3_EQPT _CDE3_EQPT; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_2.CDE3_EQPT.ClassInitialize(testContext); + _CDE3_EQPT = CreateSelfDescription.Staging.v2_43_2.CDE3_EQPT.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_2__CDE3_EQPT__DownloadRsMFile() => _CDE3_EQPT.Staging__v2_43_2__CDE3_EQPT__DownloadRsMFile(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE3.cs b/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE3.cs similarity index 71% rename from Adaptation/_Tests/Extract/Staging/v2.43.0/CDE3.cs rename to Adaptation/_Tests/Extract/Staging/v2.43.2/CDE3.cs index 56f5832..dd0c292 100644 --- a/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE3.cs +++ b/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE3.cs @@ -1,10 +1,12 @@ using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Diagnostics; +using System.IO; using System.Reflection; -namespace _Tests.Extract.Staging.v2_43_0; +namespace Adaptation._Tests.Extract.Staging.v2_43_2; [TestClass] public class CDE3 @@ -13,32 +15,32 @@ public class CDE3 #pragma warning disable CA2254 #pragma warning disable IDE0060 - private static CreateSelfDescription.Staging.v2_43_0.CDE3 _CDE3; + private static CreateSelfDescription.Staging.v2_43_2.CDE3 _CDE3; [ClassInitialize] public static void ClassInitialize(TestContext testContext) { - CreateSelfDescription.Staging.v2_43_0.CDE3.ClassInitialize(testContext); - _CDE3 = CreateSelfDescription.Staging.v2_43_0.CDE3.EAFLoggingUnitTesting; + CreateSelfDescription.Staging.v2_43_2.CDE3.ClassInitialize(testContext); + _CDE3 = CreateSelfDescription.Staging.v2_43_2.CDE3.EAFLoggingUnitTesting; } [TestMethod] - public void Staging__v2_43_0__CDE3__RsM() => _CDE3.Staging__v2_43_0__CDE3__RsM(); + public void Staging__v2_43_2__CDE3__RsM() => _CDE3.Staging__v2_43_2__CDE3__RsM(); [TestMethod] - public void Staging__v2_43_0__CDE3__RsM643047560320000000__Normal() + public void Staging__v2_43_2__CDE3__RsM643047560320000000__Normal() { DateTime dateTime; string check = "*.RsM"; - _CDE3.Staging__v2_43_0__CDE3__RsM(); + _CDE3.Staging__v2_43_2__CDE3__RsM(); MethodBase methodBase = new StackFrame().GetMethod(); string[] variables = _CDE3.AdaptationTesting.GetVariables(methodBase, check); IFileRead fileRead = _CDE3.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false); Logistics logistics = new(fileRead); - string extractResultItem1 = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF: false); - dateTime = Adaptation.FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); + string extractResultItem1 = Shared.AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics, validatePDSF: false); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, string.Empty); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); - dateTime = Adaptation.FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); + dateTime = FileHandlers.RsM.ProcessData.GetDateTime(logistics, "00:13 09/27/38"); Assert.IsTrue(dateTime == logistics.DateTimeFromSequence); string logBody = @" RUN [59-478796-3978.1] diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.0/CDE5.cs b/Adaptation/_Tests/Extract/Staging/v2.43.2/CDE5.cs similarity index 100% rename from Adaptation/_Tests/Extract/Staging/v2.43.0/CDE5.cs rename to Adaptation/_Tests/Extract/Staging/v2.43.2/CDE5.cs diff --git a/Adaptation/_Tests/Extract/Staging/v2.43.2/MET08RESIMAPCDE.cs b/Adaptation/_Tests/Extract/Staging/v2.43.2/MET08RESIMAPCDE.cs new file mode 100644 index 0000000..7fb2b6e --- /dev/null +++ b/Adaptation/_Tests/Extract/Staging/v2.43.2/MET08RESIMAPCDE.cs @@ -0,0 +1,51 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Adaptation._Tests.Extract.Staging.v2_43_2; + +[TestClass] +public class MET08RESIMAPCDE +{ + +#pragma warning disable CA2254 +#pragma warning disable IDE0060 + + private static CreateSelfDescription.Staging.v2_43_2.MET08RESIMAPCDE _MET08RESIMAPCDE; + + [ClassInitialize] + public static void ClassInitialize(TestContext testContext) + { + CreateSelfDescription.Staging.v2_43_2.MET08RESIMAPCDE.ClassInitialize(testContext); + _MET08RESIMAPCDE = CreateSelfDescription.Staging.v2_43_2.MET08RESIMAPCDE.EAFLoggingUnitTesting; + } + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__MoveMatchingFiles() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__MoveMatchingFiles(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__OpenInsightMetrologyViewer() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__OpenInsightMetrologyViewer(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__IQSSi() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__IQSSi(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__OpenInsight() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__OpenInsight(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__OpenInsightMetrologyViewerAttachments(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__APC() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__APC(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__SPaCe() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__SPaCe(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__Processed() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__Processed(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__Archive() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__Archive(); + + [TestMethod] + public void Staging__v2_43_2__MET08RESIMAPCDE__Dummy() => _MET08RESIMAPCDE.Staging__v2_43_2__MET08RESIMAPCDE__Dummy(); + +} \ No newline at end of file diff --git a/Adaptation/_Tests/Helpers/Metrology.cs b/Adaptation/_Tests/Helpers/Metrology.cs deleted file mode 100644 index c059318..0000000 --- a/Adaptation/_Tests/Helpers/Metrology.cs +++ /dev/null @@ -1,192 +0,0 @@ -using Adaptation.Shared; -using Adaptation.Shared.Methods; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text.Json; - -namespace _Tests.Helpers; - -public class Metrology -{ - - internal static Tuple GetLogisticsColumnsAndBody(string fileFullName) - { - Tuple results; - results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(fileFullName); - Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); - Assert.IsTrue(results.Item2.Length > 0, "Column check"); - Assert.IsTrue(results.Item3.Length > 0, "Body check"); - return results; - } - - internal static Tuple GetLogisticsColumnsAndBody(string searchDirectory, string searchPattern) - { - Tuple results; - if (searchPattern.Length > 3 && !searchPattern.Contains('*') && File.Exists(searchPattern)) - results = GetLogisticsColumnsAndBody(searchPattern); - else - { - string[] pdsfFiles; - pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly); - if (!pdsfFiles.Any()) - _ = Process.Start("explorer.exe", searchDirectory); - Assert.IsTrue(pdsfFiles.Any(), "GetFiles check"); - results = GetLogisticsColumnsAndBody(pdsfFiles[0]); - } - Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); - Assert.IsTrue(results.Item2.Length > 0, "Column check"); - Assert.IsTrue(results.Item3.Length > 0, "Body check"); - return results; - } - - internal static Tuple GetLogisticsColumnsAndBody(IFileRead fileRead, Logistics logistics, Tuple> extractResult, Tuple pdsf) - { - Tuple results; - string text = ProcessDataStandardFormat.GetPDSFText(fileRead, logistics, extractResult.Item3, logisticsText: pdsf.Item1); - string[] lines = text.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); - results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(logistics.ReportFullPath, lines); - Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); - Assert.IsTrue(results.Item2.Length > 0, "Column check"); - Assert.IsTrue(results.Item3.Length > 0, "Body check"); - return results; - } - - internal static string[] GetItem2(Tuple pdsf, Tuple pdsfNew) - { - JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; - string jsonOld = JsonSerializer.Serialize(pdsf.Item2, pdsf.Item2.GetType(), jsonSerializerOptions); - string jsonNew = JsonSerializer.Serialize(pdsfNew.Item2, pdsfNew.Item2.GetType(), jsonSerializerOptions); - return new string[] { jsonOld, jsonNew }; - } - - internal static string[] GetItem3(Tuple pdsf, Tuple pdsfNew) - { - string joinOld = string.Join(Environment.NewLine, from l in pdsf.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); - string joinNew = string.Join(Environment.NewLine, from l in pdsfNew.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); - return new string[] { joinOld, joinNew }; - } - - internal static void UpdatePassDirectory(string searchDirectory) - { - DateTime dateTime = DateTime.Now; - try - { Directory.SetLastWriteTime(searchDirectory, dateTime); } - catch (Exception) { } - string ticksDirectory = Path.GetDirectoryName(searchDirectory); - try - { Directory.SetLastWriteTime(ticksDirectory, dateTime); } - catch (Exception) { } - string[] directories = Directory.GetDirectories(searchDirectory, "*", SearchOption.TopDirectoryOnly); - foreach (string directory in directories) - { - try - { Directory.SetLastWriteTime(directory, dateTime); } - catch (Exception) { } - } - } - - internal static string GetFileName(MethodBase methodBase) - { - string result; - string connectionName; - string seperator = "__"; - string connectionNameAndTicks; - string[] segments = methodBase.Name.Split(new string[] { seperator }, StringSplitOptions.None); - string environment = segments[0]; - string rawVersionName = segments[1]; - string equipmentTypeDirectory = segments[2]; - string ticks = DateTime.Now.Ticks.ToString(); - string comment = segments[segments.Length - 1]; - string versionName = segments[1].Replace('_', '.'); - string before = string.Concat(environment, seperator, rawVersionName, seperator, equipmentTypeDirectory, seperator); - string after = methodBase.Name.Substring(before.Length); - if (after.Length < ticks.Length) - { - connectionName = after; - } - else - { - connectionNameAndTicks = after.Substring(0, after.Length - 2 - comment.Length); - connectionName = connectionNameAndTicks.Substring(0, connectionNameAndTicks.Length - ticks.Length); - ticks = connectionNameAndTicks.Substring(connectionName.Length); - } - result = Path.Combine(environment, equipmentTypeDirectory, versionName, $"{environment}__{rawVersionName}__{equipmentTypeDirectory}__{connectionName}", ticks, $"{connectionName.Replace('_', '-')}.json"); - if (result.Contains('/')) - result = string.Concat('/', result); - else - result = string.Concat('\\', result); - return result; - } - - internal static void CompareSaveTSV(string textFileDirectory, string[] join) - { - if (join[0] != join[1]) - { - _ = Process.Start("explorer.exe", textFileDirectory); - File.WriteAllText(Path.Combine(textFileDirectory, "0.tsv"), join[0]); - File.WriteAllText(Path.Combine(textFileDirectory, "1.tsv"), join[1]); - } - } - - internal static void CompareSaveJSON(string textFileDirectory, string[] json) - { - if (json[0] != json[1]) - { - _ = Process.Start("explorer.exe", textFileDirectory); - File.WriteAllText(Path.Combine(textFileDirectory, "0.json"), json[0]); - File.WriteAllText(Path.Combine(textFileDirectory, "1.json"), json[1]); - } - } - - internal static void CompareSave(string textFileDirectory, Tuple pdsf, Tuple pdsfNew) - { - if (pdsf.Item1 != pdsfNew.Item1) - { - _ = Process.Start("explorer.exe", textFileDirectory); - File.WriteAllText(Path.Combine(textFileDirectory, "0.dat"), pdsf.Item1); - File.WriteAllText(Path.Combine(textFileDirectory, "1.dat"), pdsfNew.Item1); - } - } - - internal static IFileRead GetWriteConfigurationGetFileRead(MethodBase methodBase, string check, Shared.AdaptationTesting adaptationTesting) - { - IFileRead result; - string[] fileNameAndJson = adaptationTesting.GetConfiguration(methodBase); - Assert.IsTrue(fileNameAndJson[1].Contains(check)); - File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]); - result = adaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false); - Assert.IsFalse(string.IsNullOrEmpty(result.CellInstanceConnectionName)); - return result; - } - - internal static string ReExtractComapareUpdatePassDirectory(string[] variables, IFileRead fileRead, Logistics logistics, bool validatePDSF = true) - { - string result; - Tuple> extractResult = fileRead.ReExtract(); - Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1)); - Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!"); - Assert.IsNotNull(extractResult.Item4); - Tuple pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]); - Tuple pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf); - if (validatePDSF) - { - CompareSave(variables[5], pdsf, pdsfNew); - Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!"); - string[] json = GetItem2(pdsf, pdsfNew); - CompareSaveJSON(variables[5], json); - Assert.IsTrue(json[0] == json[1], "Item2 check!"); - string[] join = GetItem3(pdsf, pdsfNew); - CompareSaveTSV(variables[5], join); - Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!"); - } - UpdatePassDirectory(variables[2]); - result = extractResult.Item1; - return result; - } - -} \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs index 22ca92e..baa2c9d 100644 --- a/Adaptation/_Tests/Shared/AdaptationTesting.cs +++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs @@ -1,12 +1,13 @@ +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.CellInstance; +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; +using Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; using Adaptation.Eaf.Management.ConfigurationData.CellAutomation; using Adaptation.Ifx.Eaf.Common.Configuration; using Adaptation.Ifx.Eaf.EquipmentConnector.File.Configuration; +using Adaptation.Shared; using Adaptation.Shared.Methods; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Shared.PasteSpecialXml.EAF.XML.API.CellInstance; -using Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; -using Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; -using Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; using System; using System.Collections.Generic; using System.Diagnostics; @@ -20,7 +21,7 @@ using System.Xml; using System.Xml.Linq; using System.Xml.Serialization; -namespace Shared; +namespace Adaptation._Tests.Shared; public class AdaptationTesting : ISMTP { @@ -175,20 +176,20 @@ public class AdaptationTesting : ISMTP string fileFullName; string comment; string[] textFiles; - string seperator = "__"; + string separator = "__"; string connectionNameAndTicks; string cellInstanceConnectionName; string ticks = DateTime.Now.Ticks.ToString(); string cellInstanceConnectionNameFromMethodBaseName; string testResultsDirectory = GetTestResultsDirectory(); - string[] segments = methodBaseName.Split(new string[] { seperator }, StringSplitOptions.None); + string[] segments = methodBaseName.Split(new string[] { separator }, StringSplitOptions.None); if (segments[0] != _Environment) throw new Exception(); string rawVersionName = segments[1]; string rawCellInstanceName = segments[2]; string cellInstanceVersionName = segments[1].Replace('_', '.'); string cellInstanceName = segments[2].Replace('_', '-').Replace("_EQPT", "-EQPT"); - string before = string.Concat(_Environment, seperator, rawVersionName, seperator, cellInstanceName, seperator); + string before = string.Concat(_Environment, separator, rawVersionName, separator, cellInstanceName, separator); string after = methodBaseName.Substring(before.Length); string versionDirectory = Path.Combine(testResultsDirectory, _Environment, cellInstanceName, cellInstanceVersionName); if (!Directory.Exists(versionDirectory)) @@ -436,7 +437,7 @@ public class AdaptationTesting : ISMTP AppendLine("using Adaptation.Shared.Methods;"). AppendLine("using Microsoft.Extensions.Logging;"). AppendLine("using Microsoft.VisualStudio.TestTools.UnitTesting;"). - AppendLine("using Shared;"). + AppendLine("using Adaptation._Tests.Shared;"). AppendLine("using System;"). AppendLine("using System.Collections.Generic;"). AppendLine("using System.Diagnostics;"). @@ -445,7 +446,7 @@ public class AdaptationTesting : ISMTP AppendLine("using System.Text.Json;"). AppendLine("using System.Threading;"); _ = stringBuilder.AppendLine(). - Append("namespace _Tests.").Append(loopName).Append('.').Append(_Environment).Append('.').Append(cellInstanceVersionNameAsCode).AppendLine(";"). + Append("namespace Adaptation._Tests.").Append(loopName).Append('.').Append(_Environment).Append('.').Append(cellInstanceVersionNameAsCode).AppendLine(";"). AppendLine(). AppendLine("[TestClass]"); if (i == 2) @@ -555,7 +556,7 @@ public class AdaptationTesting : ISMTP Append("string check = \"").Append(check.Split('\\').Last()).AppendLine("\";"). AppendLine("MethodBase methodBase = new StackFrame().GetMethod();"). AppendLine("EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, \" - Getting configuration\"));"). - AppendLine("_ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);"). + AppendLine("_ = Shared.AdaptationTesting.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);"). AppendLine("EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, \" - Exit\"));"). AppendLine("}"). AppendLine(); @@ -614,7 +615,7 @@ public class AdaptationTesting : ISMTP foreach (Setting setting in componentsCellComponentCellComponent.Equipment.ConnectionSettings.Setting) result.ConnectionSettings.Add(new ConnectionSetting(null, null) { Name = setting.Name, Value = setting.Value }); } - IEnumerable sourceDirectoryCloakingCollection = (from l in result.ConnectionSettings where l.Name == sourceDirectoryCloaking select l); + IEnumerable sourceDirectoryCloakingCollection = from l in result.ConnectionSettings where l.Name == sourceDirectoryCloaking select l; if (sourceDirectoryCloakingCollection.Any()) result.SourceDirectoryCloaking = sourceDirectoryCloakingCollection.First().Value; else @@ -860,7 +861,7 @@ public class AdaptationTesting : ISMTP { Dictionary results = new() { - { nameof(Environment), _Environment }, + { nameof(System.Environment), _Environment }, { nameof(HostNameAndPort), _HostNameAndPort }, { nameof(cellInstanceName), cellInstanceName }, { nameof(equipmentTypeName), equipmentTypeName }, @@ -894,6 +895,7 @@ public class AdaptationTesting : ISMTP { string[] results; string[] segments = GetSegments(methodBase.Name); + string ticks = GetTicks(segments); FileInfo fileInfo = GetFileName(segments); string cellInstanceName = GetCellInstanceName(segments); string cellInstanceVersionName = GetCellInstanceVersionName(segments); @@ -902,6 +904,16 @@ public class AdaptationTesting : ISMTP _ = Directory.CreateDirectory(fileInfo.Directory.FullName); Tuple cellInstanceVersionTuple = GetCellInstanceVersionTuple(cellInstanceName, cellInstanceVersionName); Tuple fileConnectorConfigurationTuple = GetFileConnectorConfigurationTuple(cellInstanceVersionTuple, cellInstanceConnectionName); + if (string.IsNullOrEmpty(ticks) && fileConnectorConfigurationTuple.Item2?.FileScanningIntervalInSeconds is not null) + { + string fileScanningIntervalInSecondsLine; + string versionDirectory = Path.GetDirectoryName(fileInfo.DirectoryName); + if (fileConnectorConfigurationTuple.Item2.FileScanningIntervalInSeconds.Value < 0) + fileScanningIntervalInSecondsLine = $"-\t{fileConnectorConfigurationTuple.Item2.FileScanningIntervalInSeconds.Value:0000}\t{Path.GetFileName(fileInfo.DirectoryName)}"; + else + fileScanningIntervalInSecondsLine = $"+\t{fileConnectorConfigurationTuple.Item2.FileScanningIntervalInSeconds.Value:+0000}\t{Path.GetFileName(fileInfo.DirectoryName)}"; + File.AppendAllLines(Path.Combine(versionDirectory, "FileScanningIntervalInSeconds.txt"), new string[] { fileScanningIntervalInSecondsLine }); + } Tuple equipmentTypeVersionTuple = GetEquipmentTypeVersionTuple(cellInstanceVersionTuple.Item2, cellInstanceConnectionName); Tuple parameterizedModelObjectDefinitionTypeTuple = GetParameterizedModelObjectDefinitionTypeTuple(equipmentTypeVersionTuple); Tuple> modelObjectParametersTuple = GetModelObjectParameters(equipmentTypeVersionTuple); @@ -925,13 +937,13 @@ public class AdaptationTesting : ISMTP if (!string.IsNullOrEmpty(cellInstanceConnectionName) && !Directory.Exists(fileInfo.DirectoryName)) _ = Directory.CreateDirectory(fileInfo.Directory.FullName); Dictionary> dummyRuns = new(); + Dictionary> staticRuns = new(); Tuple cellInstanceVersionTuple = GetCellInstanceVersionTuple(cellInstanceName, cellInstanceVersionName); Tuple fileConnectorConfigurationTuple = GetFileConnectorConfigurationTuple(cellInstanceVersionTuple, cellInstanceConnectionName); Tuple equipmentTypeVersionTuple = GetEquipmentTypeVersionTuple(cellInstanceVersionTuple.Item2, cellInstanceConnectionName); Tuple parameterizedModelObjectDefinitionTypeTuple = GetParameterizedModelObjectDefinitionTypeTuple(equipmentTypeVersionTuple); Tuple> modelObjectParametersTuple = GetModelObjectParameters(equipmentTypeVersionTuple); Tuple equipmentDictionaryVersionTuple = GetEquipmentDictionaryVersionTuple(cellInstanceVersionTuple.Item2, cellInstanceConnectionName, equipmentTypeVersionTuple.Item4); - _ = GetEquipmentDictionaryIsAlwaysEnabledEventsTuple(equipmentDictionaryVersionTuple); if (!string.IsNullOrEmpty(sourceFileLocation) && sourceFileLocation != fileConnectorConfigurationTuple.Item2.SourceFileLocation) fileConnectorConfigurationTuple.Item2.SourceFileLocation = sourceFileLocation; @@ -940,7 +952,16 @@ public class AdaptationTesting : ISMTP fileConnectorConfigurationTuple.Item2.SourceFileFilter = sourceFileFilter; fileConnectorConfigurationTuple.Item2.SourceFileFilters = sourceFileFilter.Split('|').ToList(); } - result = Adaptation.FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, useCyclicalForDescription, isEAFHosted: false); + if (_TestContext.FullyQualifiedTestClassName.Contains(nameof(Extract))) + { + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.ErrorTargetFileLocation); + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.SourceFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.SourceFileLocation); + if (!Directory.Exists(fileConnectorConfigurationTuple.Item2.TargetFileLocation)) + _ = Directory.CreateDirectory(fileConnectorConfigurationTuple.Item2.TargetFileLocation); + } + result = FileHandlers.CellInstanceConnectionName.Get(this, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfigurationTuple.Item2, equipmentTypeVersionTuple.Item2, parameterizedModelObjectDefinitionTypeTuple.Item2, modelObjectParametersTuple.Item2, equipmentDictionaryVersionTuple.Item2, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: false); return result; } @@ -1043,6 +1064,183 @@ public class AdaptationTesting : ISMTP return results; } + internal static Tuple GetLogisticsColumnsAndBody(string fileFullName) + { + Tuple results; + results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(fileFullName); + Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); + Assert.IsTrue(results.Item2.Length > 0, "Column check"); + Assert.IsTrue(results.Item3.Length > 0, "Body check"); + return results; + } + + internal static Tuple GetLogisticsColumnsAndBody(string searchDirectory, string searchPattern) + { + Tuple results; + if (searchPattern.Length > 3 && !searchPattern.Contains('*') && File.Exists(searchPattern)) + results = GetLogisticsColumnsAndBody(searchPattern); + else + { + string[] pdsfFiles; + pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly); + if (!pdsfFiles.Any()) + _ = Process.Start("explorer.exe", searchDirectory); + Assert.IsTrue(pdsfFiles.Any(), "GetFiles check"); + results = GetLogisticsColumnsAndBody(pdsfFiles[0]); + } + Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); + Assert.IsTrue(results.Item2.Length > 0, "Column check"); + Assert.IsTrue(results.Item3.Length > 0, "Body check"); + return results; + } + + internal static Tuple GetLogisticsColumnsAndBody(IFileRead fileRead, Logistics logistics, Tuple> extractResult, Tuple pdsf) + { + Tuple results; + string text = ProcessDataStandardFormat.GetPDSFText(fileRead, logistics, extractResult.Item3, logisticsText: pdsf.Item1); + string[] lines = text.Split(new string[] { System.Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); + results = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(logistics.ReportFullPath, lines); + Assert.IsFalse(string.IsNullOrEmpty(results.Item1)); + Assert.IsTrue(results.Item2.Length > 0, "Column check"); + Assert.IsTrue(results.Item3.Length > 0, "Body check"); + return results; + } + + internal static string[] GetItem2(Tuple pdsf, Tuple pdsfNew) + { + JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; + string jsonOld = JsonSerializer.Serialize(pdsf.Item2, pdsf.Item2.GetType(), jsonSerializerOptions); + string jsonNew = JsonSerializer.Serialize(pdsfNew.Item2, pdsfNew.Item2.GetType(), jsonSerializerOptions); + return new string[] { jsonOld, jsonNew }; + } + + internal static string[] GetItem3(Tuple pdsf, Tuple pdsfNew) + { + string joinOld = string.Join(System.Environment.NewLine, from l in pdsf.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); + string joinNew = string.Join(System.Environment.NewLine, from l in pdsfNew.Item3 select string.Join('\t', from t in l.Split('\t') where !t.Contains(@"\\") select t)); + return new string[] { joinOld, joinNew }; + } + + internal static void UpdatePassDirectory(string searchDirectory) + { + DateTime dateTime = DateTime.Now; + try + { Directory.SetLastWriteTime(searchDirectory, dateTime); } + catch (Exception) { } + string ticksDirectory = Path.GetDirectoryName(searchDirectory); + try + { Directory.SetLastWriteTime(ticksDirectory, dateTime); } + catch (Exception) { } + string[] directories = Directory.GetDirectories(searchDirectory, "*", SearchOption.TopDirectoryOnly); + foreach (string directory in directories) + { + try + { Directory.SetLastWriteTime(directory, dateTime); } + catch (Exception) { } + } + } + + internal static string GetFileName(MethodBase methodBase) + { + string result; + string connectionName; + string separator = "__"; + string connectionNameAndTicks; + string[] segments = methodBase.Name.Split(new string[] { separator }, StringSplitOptions.None); + string environment = segments[0]; + string rawVersionName = segments[1]; + string equipmentTypeDirectory = segments[2]; + string ticks = DateTime.Now.Ticks.ToString(); + string comment = segments[segments.Length - 1]; + string versionName = segments[1].Replace('_', '.'); + string before = string.Concat(environment, separator, rawVersionName, separator, equipmentTypeDirectory, separator); + string after = methodBase.Name.Substring(before.Length); + if (after.Length < ticks.Length) + { + connectionName = after; + } + else + { + connectionNameAndTicks = after.Substring(0, after.Length - 2 - comment.Length); + connectionName = connectionNameAndTicks.Substring(0, connectionNameAndTicks.Length - ticks.Length); + ticks = connectionNameAndTicks.Substring(connectionName.Length); + } + result = Path.Combine(environment, equipmentTypeDirectory, versionName, $"{environment}__{rawVersionName}__{equipmentTypeDirectory}__{connectionName}", ticks, $"{connectionName.Replace('_', '-')}.json"); + if (result.Contains('/')) + result = string.Concat('/', result); + else + result = string.Concat('\\', result); + return result; + } + + internal static void CompareSaveTSV(string textFileDirectory, string[] join) + { + if (join[0] != join[1]) + { + _ = Process.Start("explorer.exe", textFileDirectory); + File.WriteAllText(Path.Combine(textFileDirectory, "0.tsv"), join[0]); + File.WriteAllText(Path.Combine(textFileDirectory, "1.tsv"), join[1]); + } + } + + internal static void CompareSaveJSON(string textFileDirectory, string[] json) + { + if (json[0] != json[1]) + { + _ = Process.Start("explorer.exe", textFileDirectory); + File.WriteAllText(Path.Combine(textFileDirectory, "0.json"), json[0]); + File.WriteAllText(Path.Combine(textFileDirectory, "1.json"), json[1]); + } + } + + internal static void CompareSave(string textFileDirectory, Tuple pdsf, Tuple pdsfNew) + { + if (pdsf.Item1 != pdsfNew.Item1) + { + _ = Process.Start("explorer.exe", textFileDirectory); + File.WriteAllText(Path.Combine(textFileDirectory, "0.dat"), pdsf.Item1); + File.WriteAllText(Path.Combine(textFileDirectory, "1.dat"), pdsfNew.Item1); + } + } + + internal static IFileRead GetWriteConfigurationGetFileRead(MethodBase methodBase, string check, AdaptationTesting adaptationTesting) + { + IFileRead result; + string[] fileNameAndJson = adaptationTesting.GetConfiguration(methodBase); + Assert.IsTrue(fileNameAndJson[1].Contains(check)); + File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]); + result = adaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false); + Assert.IsFalse(string.IsNullOrEmpty(result.CellInstanceConnectionName)); + return result; + } + + internal static string ReExtractCompareUpdatePassDirectory(string[] variables, IFileRead fileRead, Logistics logistics, bool validatePDSF = true) + { + string result; + Tuple> extractResult = fileRead.ReExtract(); + Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1)); + Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!"); + Assert.IsNotNull(extractResult.Item4); + if (!validatePDSF) + _ = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, new(string.Empty, Array.Empty(), Array.Empty())); + else + { + Tuple pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]); + Tuple pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf); + CompareSave(variables[5], pdsf, pdsfNew); + Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!"); + string[] json = GetItem2(pdsf, pdsfNew); + CompareSaveJSON(variables[5], json); + Assert.IsTrue(json[0] == json[1], "Item2 check!"); + string[] join = GetItem3(pdsf, pdsfNew); + CompareSaveTSV(variables[5], join); + Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!"); + } + UpdatePassDirectory(variables[2]); + result = extractResult.Item1; + return result; + } + } -// namespace _Tests.Helpers { public class AdaptationTesting { } } -// 2022-02-02 -> AdaptationTesting \ No newline at end of file +// namespace Adaptation._Tests.Helpers { public class AdaptationTesting { } } +// 2022-05-12 -> AdaptationTesting \ No newline at end of file diff --git a/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs b/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs index 4504bae..62a6cf7 100644 --- a/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs +++ b/Adaptation/_Tests/Shared/EAFLoggingUnitTesting.cs @@ -1,7 +1,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -namespace Shared; +namespace Adaptation._Tests.Shared; public class EAFLoggingUnitTesting : LoggingUnitTesting, IDisposable { diff --git a/Adaptation/_Tests/Shared/IsEnvironment.cs b/Adaptation/_Tests/Shared/IsEnvironment.cs index 6135607..fee5113 100644 --- a/Adaptation/_Tests/Shared/IsEnvironment.cs +++ b/Adaptation/_Tests/Shared/IsEnvironment.cs @@ -2,7 +2,7 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Shared; +namespace Adaptation._Tests.Shared; public class IsEnvironment { diff --git a/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs b/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs index 9cb544b..8ea4d19 100644 --- a/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs +++ b/Adaptation/_Tests/Shared/Log/ConsoleLogger.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; +using System; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class ConsoleLogger : ILogger { diff --git a/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs b/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs index 2967940..94cad4d 100644 --- a/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs +++ b/Adaptation/_Tests/Shared/Log/ConsoleProvider.cs @@ -1,7 +1,8 @@ using Microsoft.Extensions.Logging; +using System; using System.Collections.Concurrent; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class ConsoleProvider : ILoggerProvider { diff --git a/Adaptation/_Tests/Shared/Log/DebugLogger.cs b/Adaptation/_Tests/Shared/Log/DebugLogger.cs index a258fbf..87e312d 100644 --- a/Adaptation/_Tests/Shared/Log/DebugLogger.cs +++ b/Adaptation/_Tests/Shared/Log/DebugLogger.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; +using System; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class DebugLogger : ILogger { diff --git a/Adaptation/_Tests/Shared/Log/DebugProvider.cs b/Adaptation/_Tests/Shared/Log/DebugProvider.cs index 5bed1d3..0511f67 100644 --- a/Adaptation/_Tests/Shared/Log/DebugProvider.cs +++ b/Adaptation/_Tests/Shared/Log/DebugProvider.cs @@ -1,7 +1,8 @@ using Microsoft.Extensions.Logging; +using System; using System.Collections.Concurrent; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class DebugProvider : ILoggerProvider { diff --git a/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs b/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs index d9bcd96..5a6cabf 100644 --- a/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs +++ b/Adaptation/_Tests/Shared/Log/FeedbackLogger.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; +using System; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class FeedbackLogger : ILogger { diff --git a/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs b/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs index cdb994e..f207b9b 100644 --- a/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs +++ b/Adaptation/_Tests/Shared/Log/FeedbackProvider.cs @@ -1,7 +1,8 @@ using Microsoft.Extensions.Logging; +using System; using System.Collections.Concurrent; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class FeedbackProvider : ILoggerProvider { diff --git a/Adaptation/_Tests/Shared/Log/IFeedback.cs b/Adaptation/_Tests/Shared/Log/IFeedback.cs index 6430c3a..9cd7e79 100644 --- a/Adaptation/_Tests/Shared/Log/IFeedback.cs +++ b/Adaptation/_Tests/Shared/Log/IFeedback.cs @@ -1,4 +1,6 @@ -namespace Shared; +using System.Collections.Generic; + +namespace Adaptation._Tests.Shared.Log; public interface IFeedback { diff --git a/Adaptation/_Tests/Shared/Log/Log.cs b/Adaptation/_Tests/Shared/Log/Log.cs index c31c055..8a57ac6 100644 --- a/Adaptation/_Tests/Shared/Log/Log.cs +++ b/Adaptation/_Tests/Shared/Log/Log.cs @@ -1,6 +1,9 @@ using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO; -namespace Shared; +namespace Adaptation._Tests.Shared.Log; public class Log { diff --git a/Adaptation/_Tests/Shared/LoggingUnitTesting.cs b/Adaptation/_Tests/Shared/LoggingUnitTesting.cs index 2ea7bef..f5c6a40 100644 --- a/Adaptation/_Tests/Shared/LoggingUnitTesting.cs +++ b/Adaptation/_Tests/Shared/LoggingUnitTesting.cs @@ -1,3 +1,4 @@ +using Adaptation._Tests.Shared.Log; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -5,7 +6,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace Shared; +namespace Adaptation._Tests.Shared; public class LoggingUnitTesting : UnitTesting, IDisposable { diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs index d7f251f..77ac5ab 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/CellInstance.cs @@ -1,4 +1,6 @@ -namespace Shared.PasteSpecialXml.EAF.XML.API.CellInstance; +using System; + +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.CellInstance; // NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0. /// diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs index 40e7492..6fe43f6 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/ConfigurationData.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.ConfigurationData; [XmlRoot(ElementName = "ChildBackboneMembers", Namespace = "http://schemas.datacontract.org/2004/07/EafManagement.Configuration.Services")] public class ChildBackboneMembers diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs index 4b66360..040401c 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentDictionary.cs @@ -1,4 +1,6 @@ -namespace Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; +using System; + +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentDictionary; // NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0. /// diff --git a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs index c3b7ef1..ae223c9 100644 --- a/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs +++ b/Adaptation/_Tests/Shared/PasteSpecialXml/EAF XML API/EquipmentType.cs @@ -1,4 +1,6 @@ -namespace Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; +using System; + +namespace Adaptation._Tests.Shared.PasteSpecialXml.EAF.XML.API.EquipmentType; // NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0. /// diff --git a/Adaptation/_Tests/Shared/UnitTesting.cs b/Adaptation/_Tests/Shared/UnitTesting.cs index 161de0c..3477030 100644 --- a/Adaptation/_Tests/Shared/UnitTesting.cs +++ b/Adaptation/_Tests/Shared/UnitTesting.cs @@ -8,7 +8,7 @@ using System.Text; using System.Text.Json; using System.Threading; -namespace Shared; +namespace Adaptation._Tests.Shared; public class UnitTesting { diff --git a/Adaptation/package.json b/Adaptation/package.json index 584069a..3427440 100644 --- a/Adaptation/package.json +++ b/Adaptation/package.json @@ -3,26 +3,26 @@ "Alpha": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "nuget-clear": "dotnet nuget locals all --clear", "build": "dotnet build --runtime win-x64 --self-contained", - "build-Packagemanagement": "dotnet build --runtime win-x64 --self-contained --source https://packagemanagement.eu.infineon.com:4430/api/v2/", - "build-nuget-And-Packagemanagement": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/", + "build-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://packagemanagement.eu.infineon.com:4430/api/v2/", + "build-nuget-And-Package-Management": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/", "build-All-Sources": "dotnet build --runtime win-x64 --self-contained --source https://api.nuget.org/v3/index.json --source https://packagemanagement.eu.infineon.com:4430/api/v2/ --source https://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json --source http://192.168.0.73:5002/v3/index.json", "dotnet-format": "dotnet format --report .vscode --verbosity detailed --severity warn", - "MSBuild": "\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Msbuild\\Current\\Bin\\MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 \"..\\MET08RESIMAPCDE.csproj\"", + "MSBuild": "\"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe\" /target:Build /restore:True /p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=Debug;TargetFrameworkVersion=v4.8 ../MET08RESIMAPCDE.csproj", "pull": "git pull", "garbage-collect": "git gc", - "AA-CreateSelfDescription.Staging.v2_43_0-CDE3_EQPT-Staging__v2_43_0__CDE3_EQPT__DownloadRsMFile": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~CDE3_EQPT & Staging__v2_43_0__CDE3_EQPT__DownloadRsMFile\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AT-CreateSelfDescription.Staging.v2_43_0-MET08RESIMAPCDE": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~MET08RESIMAPCDE\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AV-CreateSelfDescription.Staging.v2_43_0-CDE2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~CDE2_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AW-CreateSelfDescription.Staging.v2_43_0-CDE2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~CDE2\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AX-CreateSelfDescription.Staging.v2_43_0-CDE3_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~CDE3_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AY-CreateSelfDescription.Staging.v2_43_0-CDE3": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0 & ClassName~CDE3\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "AZ-CreateSelfDescription.Staging.v2_43_0": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.CreateSelfDescription.Staging.v2_43_0\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BA-Extract.Staging.v2_43_0-CDE3-Staging__v2_43_0__CDE3__RsM643047560320000000__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0 & ClassName~CDE3 & Staging__v2_43_0__CDE3__RsM643047560320000000__Normal\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BT-Extract.Staging.v2_43_0-MET08RESIMAPCDE": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0 & ClassName~MET08RESIMAPCDE\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BV-Extract.Staging.v2_43_0-CDE2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0 & ClassName~CDE2_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BW-Extract.Staging.v2_43_0-CDE2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0 & ClassName~CDE2\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BX-Extract.Staging.v2_43_0-CDE3_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0 & ClassName~CDE3_EQPT\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BY-Extract.Staging.v2_43_0-CDE3": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0 & ClassName~CDE3\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", - "BZ-Extract.Staging.v2_43_0": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~_Tests.Extract.Staging.v2_43_0\" --% -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")" + "AA-CreateSelfDescription.Staging.v2_43_2-CDE3_EQPT-Staging__v2_43_2__CDE3_EQPT__DownloadRsMFile": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2 & ClassName~CDE3_EQPT & Name~Staging__v2_43_2__CDE3_EQPT__DownloadRsMFile\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AT-CreateSelfDescription.Staging.v2_43_2-MET08RESIMAPCDE": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2 & ClassName~MET08RESIMAPCDE\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AV-CreateSelfDescription.Staging.v2_43_2-CDE2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2 & ClassName~CDE2_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AW-CreateSelfDescription.Staging.v2_43_2-CDE2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2 & ClassName~CDE2\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AX-CreateSelfDescription.Staging.v2_43_2-CDE3_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2 & ClassName~CDE3_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AY-CreateSelfDescription.Staging.v2_43_2-CDE3": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2 & ClassName~CDE3\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "AZ-CreateSelfDescription.Staging.v2_43_2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.CreateSelfDescription.Staging.v2_43_2\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BA-Extract.Staging.v2_43_2-CDE3-Staging__v2_43_2__CDE3__RsM643047560320000000__Normal": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2 & ClassName~CDE3 & Name~Staging__v2_43_2__CDE3__RsM643047560320000000__Normal\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BT-Extract.Staging.v2_43_2-MET08RESIMAPCDE": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2 & ClassName~MET08RESIMAPCDE\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BV-Extract.Staging.v2_43_2-CDE2_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2 & ClassName~CDE2_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BW-Extract.Staging.v2_43_2-CDE2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2 & ClassName~CDE2\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BX-Extract.Staging.v2_43_2-CDE3_EQPT": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2 & ClassName~CDE3_EQPT\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BY-Extract.Staging.v2_43_2-CDE3": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2 & ClassName~CDE3\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")", + "BZ-Extract.Staging.v2_43_2": "dotnet test --runtime win-x64 --no-build --filter \"FullyQualifiedName~Adaptation._Tests.Extract.Staging.v2_43_2\" -- TestRunParameters.Parameter(name=\\\"Debug\\\", value=\\\"Debugger.IsAttached\\\")" } } \ No newline at end of file diff --git a/FileHandlers/FileRead.cs b/FileHandlers/FileRead.cs index fa76069..bf7fa56 100644 --- a/FileHandlers/FileRead.cs +++ b/FileHandlers/FileRead.cs @@ -37,8 +37,13 @@ public partial class FileRead : FileReaderHandler, ISMTP private FilePathGenerator _FilePathGeneratorForTarget; private readonly List _EquipmentParameters; private static readonly Dictionary> _DummyRuns; + private static readonly Dictionary> _StaticRuns; - static FileRead() => _DummyRuns = new Dictionary>(); + static FileRead() + { + _DummyRuns = new(); + _StaticRuns = new(); + } public FileRead() { @@ -192,7 +197,7 @@ public partial class FileRead : FileReaderHandler, ISMTP FileConnectorConfiguration fileConnectorConfiguration = Mapper.Map(Configuration); string parameterizedModelObjectDefinitionType = methodBase.DeclaringType.FullName; IList modelObjectParameters = Mapper.Map(ConfiguredParameters); - _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _UseCyclicalForDescription, isEAFHosted: true); + _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, isEAFHosted: true); if (_FileRead.IsEvent) AddParameterRangeAndEvent(); } @@ -333,7 +338,7 @@ public partial class FileRead : FileReaderHandler, ISMTP if (modelObjectParameterDefinitionJsonElement.ValueKind != JsonValueKind.Array) throw new Exception(); IList modelObjectParameters = JsonSerializer.Deserialize>(modelObjectParameterDefinitionJsonElement.ToString(), jsonSerializerOptions); - _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _UseCyclicalForDescription, isEAFHosted: false); + _FileRead = CellInstanceConnectionName.Get(this, FileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, _DummyRuns, _StaticRuns, _UseCyclicalForDescription, isEAFHosted: false); results = _FileRead.ReExtract(); if (results?.Item2 is null) throw new Exception(); diff --git a/Jenkinsfile b/Jenkinsfile index b119502..1755afb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,27 +1,33 @@ #!/usr/bin/env groovy +/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */ import groovy.transform.Field -@Field def _DDrive = 'D:/' -@Field def _AssemblyName = '...' -@Field def _NetVersion = 'net6.0' -@Field def _TargetLocation = '...' -@Field def _GitCommitSeven = '...' -@Field def _TestProjectDirectory = 'Adaptation' -@Field def _DDriveNet = "${_DDrive}${_NetVersion}" -@Field def _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe' -@Field def _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe' +@Field String _DDrive = 'D:/' +@Field String _AssemblyName = '...' +@Field String _TargetLocation = '...' +@Field String _GitCommitSeven = '...' +@Field String _GitName = 'MET08RESIMAPCDE' +@Field String _TestProjectDirectory = 'Adaptation' +@Field String _AgentStaging = 'mestsa07ec-ecmeseaf' +@Field String _DDriveNet = "${_DDrive}Framework4.8" +@Field String _AgentProduction = 'messa08ec-ecmeseaf' +@Field String _AgentDevelopment = 'mestsa003-mesedasvc' +@Field String _ProgramFilesDotnet = 'C:/Program Files/dotnet/dotnet.exe' +@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe' pipeline { - agent any + agent { + label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else' + } parameters { - string(name: 'EAF_ENVIRONMENT', defaultValue: 'Staging', description: 'Environment for file-share') - string(name: 'DEFAULT_FILE_SERVER', defaultValue: 'messv02ecc1.ec.local', description: 'Default file server...') + string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server') + string(name: 'DEFAULT_FILE_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'messv02ecc1_ec_local' : 'messv02ecc1.ec.local', description: 'Default file server...') } stages { // stage('Git') { // steps { // bat(returnStatus: true, script: 'git init') - // bat(returnStatus: true, script: 'git remote add origin \\\\mestsa07ec.ec.local\\Git\\MET08RESIMAPCDE.git') + // bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git') // bat(returnStatus: true, script: 'git pull origin master') // } // } @@ -29,7 +35,8 @@ pipeline { steps { script { _AssemblyName = "${env.JOB_NAME}" - _GitCommitSeven = "${env.GIT_COMMIT.substring(0, 7)}" + // _GitCommitSeven = '1234567' + _GitCommitSeven = env.GIT_COMMIT.substring(0, 7) def files = findFiles(glob: '*.csproj') if (files.length != 1) { error("Build failed because couldn't find a *.csproj file") @@ -42,27 +49,49 @@ pipeline { ${files[0].lastModified} """ _AssemblyName = files[0].name.split('[.]csproj')[0] - _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${params.EAF_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}" + _TargetLocation = "\\\\${params.DEFAULT_FILE_SERVER}\\EC_EAFRepository\\${env.JENKINS_ENVIRONMENT}\\DeploymentStorage\\Adaptation_${_AssemblyName}" } } } stage('Info') { steps { + echo "_AssemblyName ${_AssemblyName}" // ... echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11 - echo "JOB_NAME ${env.JOB_NAME}" // MET08RESIMAPCDE - echo "_AssemblyName ${_AssemblyName}" // YODA Viewer + echo "DEFAULT_FILE_SERVER ${params.DEFAULT_FILE_SERVER}" // 11 echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master - echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\MET08RESIMAPCDE - echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/ - echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\MET08RESIMAPCDE.git echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41 + echo "GIT_SERVER ${params.GIT_SERVER}" // ... + echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git + echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11 + echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/ + echo "JOB_NAME ${env.JOB_NAME}" // ... + echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\... + } + } + // stage('Restore') { + // steps { + // bat(returnStatus: true, script: 'dotnet --info') + // } + // } + stage('Safe storage of app secrets') { + steps { + dir(_TestProjectDirectory) { + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets init') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "BuildNumber" "' + env.BUILD_NUMBER + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "GitCommitSeven" "' + _GitCommitSeven + '"') + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + + 'user-secrets set "Server" "' + params.DEFAULT_FILE_SERVER + '"') + } } } stage('Core Build') { steps { echo "Build number is ${currentBuild.number}" dir(_TestProjectDirectory) { - bat(returnStatus: true, script: '"' + "${_ProgramFilesDotnet}" + '" ' + + bat(returnStatus: true, script: '"' + _ProgramFilesDotnet + '" ' + 'build --runtime win-x64 --self-contained --verbosity quiet') } } @@ -80,13 +109,13 @@ pipeline { stage('Framework Build') { steps { echo "Build number is ${currentBuild.number}" - bat(returnStatus: true, script: '"' + "${_ProgramFilesMSBuild}" + '" ' + + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + '/target:Restore ' + '/detailedsummary ' + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' + _AssemblyName + '.csproj') - bat(returnStatus: true, script: '"' + "${_ProgramFilesMSBuild}" + '" ' + + bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' + '/target:Build ' + '/detailedsummary ' + '/consoleloggerparameters:PerformanceSummary;ErrorsOnly; ' + @@ -107,16 +136,6 @@ pipeline { fileOperations([fileCopyOperation(excludes: '', flattenFiles: true, includes: "${_AssemblyName}*", renameFiles: false, sourceCaptureExpression: '', targetLocation: "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}-Debug", targetNameExpression: '')]) } } - // stage('Publish') { - // steps { - // bat(returnStatus: true, script: '"' + "${_ProgramFilesDotnet}" + '" ' + - // 'remove reference "../Client/' + "${env.JOB_NAME}" + '.Client.csproj"') - // bat(returnStatus: true, script: '"' + "${_ProgramFilesDotnet}" + '" ' + - // 'publish --configuration Release --runtime win-x64 --verbosity quiet ' + - // "--self-contained true --p:Version=6.0.202-${_GitCommitSeven}-${env.BUILD_NUMBER} -o " + - // '"' + "${_DDriveNet}/${_GitCommitSeven}-${env.BUILD_NUMBER}-${env.JOB_NAME}" + '"') - // } - // } // stage('Force Fail') { // steps { // error("Build failed because of this and that..") diff --git a/MET08RESIMAPCDE.csproj b/MET08RESIMAPCDE.csproj index 5e7457b..1833717 100644 --- a/MET08RESIMAPCDE.csproj +++ b/MET08RESIMAPCDE.csproj @@ -96,22 +96,28 @@ + + - - - + + + + + + - + - - + + + @@ -125,29 +131,28 @@ - - - - - - - - - - - + + + + + + + + + + + - @@ -161,6 +166,9 @@ 6.0.3 - + + + + \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 73fee06..8e09942 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.39.2.0")] -[assembly: AssemblyFileVersion("2.39.2.0")] +[assembly: AssemblyVersion("2.43.0.0")] +[assembly: AssemblyFileVersion("2.43.0.0")]