process-data-standard-format alignment

Adaptation/.editorconfig

@@ -110,7 +110,7 @@ dotnet_diagnostic.CA2254.severity = none # CA2254: The logging message template
 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.IDE0004.severity = warning # IDE0004: Cast is redundant.
-dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
+dotnet_diagnostic.IDE0005.severity = none # Using directive is unnecessary
 dotnet_diagnostic.IDE0028.severity = none # IDE0028: Collection initialization can be simplified
 dotnet_diagnostic.IDE0031.severity = warning # Use null propagation (IDE0031)
 dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed
@@ -122,6 +122,7 @@ dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]cs
 dotnet_diagnostic.IDE0300.severity = none # IDE0300: Collection initialization can be simplified
 dotnet_diagnostic.IDE0301.severity = none #IDE0301: Collection initialization can be simplified
 dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified
+dotnet_diagnostic.MSTEST0015.severity = none # MSTEST0015: Test method {method} should not be ignored
 dotnet_diagnostic.MSTEST0037.severity = error # MSTEST0037: Use proper 'Assert' methods
 dotnet_diagnostic.SYSLIB1045.severity = none # SYSLIB1045: diagnostics for regex source generation
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning

Adaptation/.vscode/tasks.json

@@ -1,19 +1,134 @@
 {
     "version": "2.0.0",
+    "inputs": [
+        {
+            "default": "Development",
+            "description": "Which ASP Net Core Environment?",
+            "id": "ASPNETCORE_ENVIRONMENT",
+            "options": [
+                "Development",
+                "Production"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "{AssemblyTitle}",
+            "description": "What Assembly Title?",
+            "id": "AssemblyTitle",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.BuildId}",
+            "description": "Which Build BuildId?",
+            "id": "Build.BuildId",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Reason}",
+            "description": "Which Build Reason?",
+            "id": "Build.Reason",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Repository.Id}",
+            "description": "Which Build Repository Id?",
+            "id": "Build.Repository.Id",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.Repository.Name}",
+            "description": "Which Build Repository Name?",
+            "id": "Build.Repository.Name",
+            "type": "promptString"
+        },
+        {
+            "default": "{Build.SourceVersion}",
+            "description": "Which Build Source Version?",
+            "id": "Build.SourceVersion",
+            "type": "promptString"
+        },
+        {
+            "default": "Debug",
+            "description": "Which Configuration?",
+            "id": "Configuration",
+            "options": [
+                "Debug",
+                "Release"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "net8.0",
+            "description": "Which Core Version?",
+            "id": "CoreVersion",
+            "options": [
+                "net8.0"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe",
+            "description": "Which MS Build?",
+            "id": "MSBuild",
+            "type": "promptString"
+        },
+        {
+            "default": "https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/",
+            "description": "Which Nuget Source?",
+            "id": "NugetSource",
+            "type": "promptString"
+        },
+        {
+            "default": "win-x64",
+            "description": "Which Runtime?",
+            "id": "Runtime",
+            "options": [
+                "win-x64",
+                "win-x32",
+                "linux-x64",
+                "linux-x32"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "L:/",
+            "description": "Which System DefaultWorkingDirectory?",
+            "id": "System.DefaultWorkingDirectory",
+            "options": [
+                "L:/",
+                "D:/",
+                "C:/"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "v4.8",
+            "description": "Which Core Target Framework Version?",
+            "id": "TargetFrameworkVersion",
+            "options": [
+                "v4.8"
+            ],
+            "type": "pickString"
+        },
+        {
+            "default": "{UserSecretsId}",
+            "description": "Which Core User Secrets Id?",
+            "id": "UserSecretsId",
+            "type": "promptString"
+        }
+    ],
     "tasks": [
         {
             "label": "Build",
             "command": "dotnet",
             "type": "process",
             "args": [
-                "build",
+                "build"
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Test-Debug",
+            "label": "Test Debug",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -24,7 +139,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Test-Release",
+            "label": "Test Release",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -50,7 +165,7 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Format-Whitespaces",
+            "label": "Format Whitespaces",
             "command": "dotnet",
             "type": "process",
             "args": [
@@ -87,13 +202,13 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Project",
+            "label": "Code Project",
             "type": "shell",
             "command": "code ../MET08RESIHGCV.csproj",
             "problemMatcher": []
         },
         {
-            "label": "Readme",
+            "label": "Code Read Me",
             "type": "shell",
             "command": "code ../README.md",
             "problemMatcher": []
@@ -113,7 +228,7 @@
             "problemMatcher": []
         },
         {
-            "label": "Git Config",
+            "label": "Code Git Config",
             "type": "shell",
             "command": "code ../.git/config",
             "problemMatcher": []

Adaptation/FileHandlers/APC/FileRead.cs

@@ -128,7 +128,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Archive/FileRead.cs

@@ -153,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             MoveArchive(reportFullPath, dateTime);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/IQSSi/FileRead.cs

@@ -127,7 +127,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -121,7 +121,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SaveOpenInsightFile(reportFullPath, dateTime, processDataStandardFormat, descriptions, tests);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 
@@ -134,15 +134,6 @@ public class FileRead : Shared.FileRead, IFileRead
         if (!Directory.Exists(duplicateDirectory))
             _ = Directory.CreateDirectory(duplicateDirectory);
         string successDirectory = _FileConnectorConfiguration.AlternateTargetFolder;
-        if (!Directory.Exists(Path.Combine(duplicateDirectory, "1")))
-        {
-            string parentParent = GetParentParent(_FileConnectorConfiguration.SourceFileLocation);
-            if (parentParent.Contains(_CellInstanceName))
-                parentParent = Path.GetDirectoryName(parentParent);
-            duplicateDirectory = Path.Combine(parentParent, "Data");
-            if (!Directory.Exists(duplicateDirectory))
-                _ = Directory.CreateDirectory(duplicateDirectory);
-        }
         if (descriptions.Count == 0 || tests.Length == 0)
             duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
         else

Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs

@@ -147,7 +147,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             SendData(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs

@@ -175,7 +175,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             PostOpenInsightMetrologyViewerAttachments(descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/FileHandlers/Processed/FileRead.cs

@@ -172,7 +172,7 @@ public class FileRead : Shared.FileRead, IFileRead
         JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
         List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             DirectoryMove(reportFullPath, dateTime, descriptions);
         else if (!_IsEAFHosted)

Adaptation/FileHandlers/SPaCe/FileRead.cs

@@ -125,7 +125,7 @@ public class FileRead : Shared.FileRead, IFileRead
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
             FileCopy(reportFullPath, dateTime, descriptions);
-        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
+        results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }
 

Adaptation/MET08RESIHGCV.yml

@@ -38,7 +38,7 @@ stages:
             displayName: "Echo Check"
 
           - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
-            displayName: "Nuget Nuget Clear"
+            displayName: "Nuget Clear"
             enabled: false
 
           - task: CopyFiles@2
@@ -199,7 +199,7 @@ stages:
             displayName: "Echo Check"
 
           - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
-            displayName: "Nuget Nuget Clear"
+            displayName: "Nuget Clear"
             enabled: false
 
           - task: CopyFiles@2

Adaptation/Shared/FileRead.cs

@@ -478,27 +478,14 @@ public class FileRead : Properties.IFileRead
         }
     }
 
-    protected void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
+    protected static void WritePDSF(IFileRead fileRead, JsonElement[] jsonElements)
     {
-        string directory;
+#pragma warning disable CA1510
-        string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
+        if (fileRead is null)
-        string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+            throw new ArgumentNullException(nameof(fileRead));
-        string weekDirectory = $"{_Logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
+        if (jsonElements is null)
-        if (!_CellInstanceConnectionName.StartsWith(_CellInstanceName) && _CellInstanceConnectionNameBase == _EquipmentType)
+            throw new ArgumentNullException(nameof(jsonElements));
-            directory = Path.Combine(_TracePath, _EquipmentType, "Target", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
+#pragma warning restore CA1510
-        else
-            directory = Path.Combine(_TracePath, _EquipmentType, "Source", weekDirectory, day, _CellInstanceName, _CellInstanceConnectionName);
-        if (!Directory.Exists(directory))
-            _ = Directory.CreateDirectory(directory);
-        string file = Path.Combine(directory, string.Concat(_Logistics.MesEntity, "_", _Logistics.Sequence, ".ipdsf"));
-        string lines = ProcessDataStandardFormat.GetPDSFText(fileRead, _Logistics, jsonElements, logisticsText: string.Empty);
-        File.WriteAllText(file, lines);
-        if (_Logistics.TotalSecondsSinceLastWriteTimeFromSequence > 600)
-        {
-            try
-            { File.SetLastWriteTime(file, _Logistics.DateTimeFromSequence); }
-            catch (Exception) { }
-        }
     }
 
     protected void WaitForThread(Thread thread, List<Exception> threadExceptions)

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -398,6 +398,14 @@ internal class ProcessDataStandardFormat
             line = string.Concat(line.Substring(0, line.Length - 1), '}');
             lines.Add(line);
         }
+        string? json = null;
+        if (processDataStandardFormat.Footer is not null && processDataStandardFormat.Footer.Count > 0)
+        {
+            Dictionary<string, string> footerKeyValuePairs = GetFooterKeyValuePairs(processDataStandardFormat.Footer);
+            Dictionary<string, Dictionary<string, string>> logisticKeyValuePairs = GetLogisticKeyValuePairs(processDataStandardFormat.Footer, footerKeyValuePairs);
+            json = JsonSerializer.Serialize(logisticKeyValuePairs, DictionaryStringDictionaryStringStringSourceGenerationContext.Default.DictionaryStringDictionaryStringString);
+        }
+        string footerText = string.IsNullOrEmpty(json) || json == "{}" ? string.Empty : $",{Environment.NewLine}\"PDSF\":{Environment.NewLine}{json}";
         result = string.Concat(
             '{',
             Environment.NewLine,
@@ -426,9 +434,85 @@ internal class ProcessDataStandardFormat
             ": ",
             processDataStandardFormat.Sequence,
             Environment.NewLine,
+            footerText,
+            Environment.NewLine,
             '}');
         return result;
-#pragma warning restore CA1845, IDE0057
+    }
+
+    private static Dictionary<string, string> GetFooterKeyValuePairs(ReadOnlyCollection<string> footerLines)
+    {
+        Dictionary<string, string> results = new();
+        string[] segments;
+        foreach (string footerLine in footerLines)
+        {
+            segments = footerLine.Split('\t');
+            if (segments.Length != 2 || string.IsNullOrEmpty(segments[1].Trim()))
+            {
+                continue;
+            }
+            if (segments[1].Contains(';'))
+            {
+                continue;
+            }
+            else
+            {
+                if (results.ContainsKey(segments[0]))
+                {
+                    continue;
+                }
+                results.Add(segments[0], segments[1]);
+            }
+        }
+        return results;
+    }
+
+    private static Dictionary<string, Dictionary<string, string>> GetLogisticKeyValuePairs(ReadOnlyCollection<string> footerLines, Dictionary<string, string> footerKeyValuePairs)
+    {
+        Dictionary<string, Dictionary<string, string>> results = new();
+        string[] segments;
+        string[] subSegments;
+        string[] subSubSegments;
+        Dictionary<string, string>? keyValue;
+        results.Add("Footer", footerKeyValuePairs);
+        foreach (string footerLine in footerLines)
+        {
+            segments = footerLine.Split('\t');
+            if (segments.Length != 2 || string.IsNullOrEmpty(segments[1].Trim()))
+            {
+                continue;
+            }
+            if (!segments[1].Contains(';') || !segments[1].Contains('='))
+            {
+                continue;
+            }
+            else
+            {
+                subSegments = segments[1].Split(';');
+                if (subSegments.Length < 1)
+                {
+                    continue;
+                }
+                if (!results.TryGetValue(segments[0], out keyValue))
+                {
+                    results.Add(segments[0], new());
+                    if (!results.TryGetValue(segments[0], out keyValue))
+                    {
+                        throw new Exception();
+                    }
+                }
+                foreach (string segment in subSegments)
+                {
+                    subSubSegments = segment.Split('=');
+                    if (subSubSegments.Length != 2)
+                    {
+                        continue;
+                    }
+                    keyValue.Add(subSubSegments[0], subSubSegments[1]);
+                }
+            }
+        }
+        return results;
     }
 
     internal static void Write(string path, ProcessDataStandardFormat processDataStandardFormat, List<Metrology.WS.Results>? wsResults)
@@ -475,15 +559,15 @@ internal class ProcessDataStandardFormat
         {
             results.Add(string.Empty);
             List<char> hyphens = new();
-            results.AddRange(processDataStandardFormat.InputPDSF.Header.Select(l => l.Replace('\t', '|')));
+            results.AddRange(processDataStandardFormat.InputPDSF.Header.Select(l => $"|{l.Replace('\t', '|')}|"));
             results.Add(string.Empty);
             results.Add($"|{string.Join("|", processDataStandardFormat.InputPDSF.Columns)}|");
             for (int i = 0; i < processDataStandardFormat.InputPDSF.Columns.Count; i++)
                 hyphens.Add('-');
             results.Add($"|{string.Join("|", hyphens)}|");
-            results.AddRange(processDataStandardFormat.InputPDSF.Body.Select(l => l.Replace('\t', '|')));
+            results.AddRange(processDataStandardFormat.InputPDSF.Body.Select(l => $"|{l.Replace('\t', '|')}|"));
             results.Add(string.Empty);
-            results.AddRange(processDataStandardFormat.InputPDSF.Footer.Select(l => l.Replace('\t', '|')));
+            results.AddRange(processDataStandardFormat.InputPDSF.Footer.Select(l => $"|{l.Replace('\t', '|')}|"));
             results.Add(string.Empty);
             results.Add("EOF");
             results.Add(string.Empty);
@@ -778,3 +862,9 @@ internal class ProcessDataStandardFormat
 internal partial class JsonElementCollectionSourceGenerationContext : JsonSerializerContext
 {
 }
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(Dictionary<string, Dictionary<string, string>>))]
+internal partial class DictionaryStringDictionaryStringStringSourceGenerationContext : JsonSerializerContext
+{
+}

Adaptation/_Tests/Extract/Production/v2.60.0/MET08RESIHGCV.cs

@@ -55,6 +55,22 @@ public class MET08RESIHGCV
         NonThrowTryCatch();
     }
 
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Production__v2_60_0__MET08RESIHGCV__MoveMatchingFiles638899177571912731__Columns()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESIHGCV.Production__v2_60_0__MET08RESIHGCV__MoveMatchingFiles();
+        string[] variables = _MET08RESIHGCV.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESIHGCV.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+        NonThrowTryCatch();
+    }
+
 #if DEBUG
     [Ignore]
 #endif