Filter copy for InfinityQS

Reactor 43 and 56

Adaptation/.vscode/launch.json

@@ -1,43 +1,43 @@
 {
   "configurations": [
     {
-      "mode": "debug",
       "name": "Go launch file",
-      "program": "${file}",
+      "type": "go",
       "request": "launch",
-      "type": "go"
-    },
-    {
-      "name": "node Launch Current Opened File",
-      "program": "${file}",
-      "request": "launch",
-      "type": "node"
-    },
-    {
-      "cwd": "${workspaceFolder}",
-      "internalConsoleOptions": "neverOpen",
-      "name": "Debug File",
-      "program": "${file}",
-      "request": "launch",
-      "stopOnEntry": false,
-      "type": "bun",
-      "watchMode": false
-    },
-    {
-      "cwd": "${workspaceFolder}",
-      "internalConsoleOptions": "neverOpen",
-      "name": "Run File",
-      "noDebug": true,
-      "program": "${file}",
-      "request": "launch",
-      "type": "bun",
-      "watchMode": false
+      "mode": "debug",
+      "program": "${file}"
     },
     {
       "name": ".NET Core Attach",
-      "processId": 32760,
+      "type": "coreclr",
       "request": "attach",
-      "type": "coreclr"
+      "processId": 32760
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "node Launch Current Opened File",
+      "program": "${file}"
+    },
+    {
+      "type": "bun",
+      "internalConsoleOptions": "neverOpen",
+      "request": "launch",
+      "name": "Debug File",
+      "program": "${file}",
+      "cwd": "${workspaceFolder}",
+      "stopOnEntry": false,
+      "watchMode": false
+    },
+    {
+      "type": "bun",
+      "internalConsoleOptions": "neverOpen",
+      "request": "launch",
+      "name": "Run File",
+      "program": "${file}",
+      "cwd": "${workspaceFolder}",
+      "noDebug": true,
+      "watchMode": false
     }
   ]
-}
+}

Adaptation/FileHandlers/InfinityQS/FileRead.cs

@@ -107,7 +107,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-    private void CopyAndWriteFile(string reportFullPath, ProcessDataStandardFormat processDataStandardFormat, JsonElement[] jsonElements)
+    private void CopyAndMoveFile(JsonElement[] jsonElements)
     {
         string day = $"{_Logistics.DateTimeFromSequence:yyyy-MM-dd}";
         string segment = _Logistics.FileInfo.Name.Split('-')[0].Split('_')[0];
@@ -127,15 +127,15 @@ public class FileRead : Shared.FileRead, IFileRead
             try
             {
                 Six six = JsonSerializer.Deserialize(jsonElements[0].GetRawText(), SixSourceGenerationContext.Default.Six) ?? throw new Exception($"{nameof(Six)} deserialization failed");
-                File.Delete(_Logistics.FileInfo.FullName);
-                if (six.VP12Count > _IQSVP12Count)
+                if (six.VP12Count < _IQSVP12Count)
+                    File.Delete(_Logistics.FileInfo.FullName);
+                else
                 {
                     string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
                     if (!Directory.Exists(duplicateDirectory))
                         _ = Directory.CreateDirectory(duplicateDirectory);
-                    string duplicateFile = Path.Combine(duplicateDirectory, $"{Path.GetFileName(reportFullPath)}.xml");
-                    string xml = ProcessDataStandardFormat.GetXml(processDataStandardFormat);
-                    File.WriteAllText(duplicateFile, xml);
+                    string duplicateFile = Path.Combine(duplicateDirectory, _Logistics.FileInfo.Name);
+                    File.Move(_Logistics.FileInfo.FullName, duplicateFile);
                 }
             }
             catch (Exception) { File.Delete(_Logistics.FileInfo.FullName); }
@@ -152,7 +152,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<Shared.Properties.IDescription> descriptions = GetDuplicatorDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            CopyAndWriteFile(reportFullPath, processDataStandardFormat, jsonElements);
+            CopyAndMoveFile(jsonElements);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/Shared/FileRead.cs

@@ -383,24 +383,17 @@ public class FileRead : Properties.IFileRead
         else
         {
             string[] files;
-            string[] directories;
-            string logisticsSequence;
-            for (int i = 0; i < 10; i++)
+            string logisticsSequence = _Logistics.Sequence.ToString();
+            string[] directories = Directory.GetDirectories(jobIdDirectory, $"*{logisticsSequence}*", SearchOption.TopDirectoryOnly);
+            foreach (string directory in directories)
             {
-                logisticsSequence = (_Logistics.Sequence + -i).ToString();
-                directories = Directory.GetDirectories(jobIdDirectory, $"*{logisticsSequence}*", SearchOption.TopDirectoryOnly);
-                foreach (string directory in directories)
-                {
-                    files = Directory.GetFiles(directory, "*", SearchOption.TopDirectoryOnly);
-                    if (files.Length == 0)
-                        continue;
-                    results.Add(directory);
-                }
-                if (results.Count == 1)
-                    break;
+                files = Directory.GetFiles(directory, "*", SearchOption.TopDirectoryOnly);
+                if (files.Length == 0)
+                    continue;
+                results.Add(directory);
             }
         }
-        if (results.Count != 1)
+        if ((results is null) || results.Count != 1)
             throw new Exception("Didn't find directory by logistics sequence");
         return results.ToArray();
     }

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -2,14 +2,12 @@ using Adaptation.Shared.Methods;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Text.RegularExpressions;
 
 namespace Adaptation.Shared;
 
@@ -229,19 +227,19 @@ internal class ProcessDataStandardFormat
         return results.AsReadOnly();
     }
 
-    internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, ProcessDataStandardFormatMapping processDataStandardFormatMapping)
+    internal static ProcessDataStandardFormat GetProcessDataStandardFormat(string reportFullPath, ProcessDataStandardFormatMapping pdsfMapping)
     {
         ProcessDataStandardFormat result;
         const int columnsLine = 6;
         FileInfo fileInfo = new(reportFullPath);
         ProcessDataStandardFormat processDataStandardFormat = GetProcessDataStandardFormat(fileInfo.LastWriteTime, columnsLine, fileInfo.FullName, lines: null);
-        JsonElement[]? jsonElements = processDataStandardFormatMapping.OldColumnNames.Count != processDataStandardFormatMapping.ColumnIndices.Count ? null : GetFullArray(processDataStandardFormat);
+        JsonElement[]? jsonElements = pdsfMapping.OldColumnNames.Count != pdsfMapping.ColumnIndices.Count ? null : GetFullArray(processDataStandardFormat);
         JsonProperty[]? jsonProperties = jsonElements is null || jsonElements.Length == 0 ? null : jsonElements[0].EnumerateObject().ToArray();
-        if (jsonElements is null || jsonProperties is null || jsonProperties.Length != processDataStandardFormatMapping.NewColumnNames.Count)
+        if (jsonElements is null || jsonProperties is null || jsonProperties.Length != pdsfMapping.NewColumnNames.Count)
             result = processDataStandardFormat;
         else
         {
-            result = GetProcessDataStandardFormat(processDataStandardFormatMapping, jsonElements, processDataStandardFormat);
+            result = GetProcessDataStandardFormat(pdsfMapping, jsonElements, processDataStandardFormat);
             if (result.Sequence is null || result.Columns.Count == 0 || result.Body.Count == 0 || result.Logistics.Count == 0)
                 result = processDataStandardFormat;
         }
@@ -337,14 +335,12 @@ internal class ProcessDataStandardFormat
         int column;
         string value;
         JsonProperty jsonProperty;
-        List<string> debug = new();
         List<string> values = new();
         List<string> results = new();
         JsonProperty[] jsonProperties;
         List<string> unknownColumns = new();
         for (int i = 0; i < jsonElements.Length; i++)
         {
-            debug.Clear();
             values.Clear();
             if (jsonElements[i].ValueKind != JsonValueKind.Object)
             {
@@ -358,22 +354,16 @@ internal class ProcessDataStandardFormat
             {
                 column = processDataStandardFormatMapping.ColumnIndices[c];
                 if (column == -1)
-                {
                     value = processDataStandardFormatMapping.OldColumnNames[c];
-                    debug.Add($"<Item C=-01 Name=\"{value}\" DataType=\"8\" XmlType=\"1\" XPath=\"//records/record/{value}\" />");
-                }
                 else
                 {
                     jsonProperty = jsonProperties[column];
                     value = jsonProperty.Value.ToString();
-                    debug.Add($"<Item C={column + 2:000} Name=\"{processDataStandardFormatMapping.OldColumnNames[c]}\" DataType=\"8\" XmlType=\"1\" XPath=\"//records/record/{jsonProperty.Name}\" />");
                 }
                 values.Add(value);
             }
             results.Add(string.Join("\t", values));
         }
-        if (Debugger.IsAttached)
-            File.WriteAllText("../../.txt", string.Join(Environment.NewLine, debug.OrderBy(l => l)));
         result = new(body: new(results),
                      columns: processDataStandardFormatMapping.OldColumnNames,
                      footer: processDataStandardFormat.Footer,
@@ -388,6 +378,7 @@ internal class ProcessDataStandardFormat
     {
         if (processDataStandardFormat.InputPDSF is null)
             throw new NullReferenceException(nameof(processDataStandardFormat.InputPDSF));
+#pragma warning disable CA1845, IDE0057
         string result;
         string line;
         string value;
@@ -863,40 +854,6 @@ internal class ProcessDataStandardFormat
         return result;
     }
 
-    internal static string GetXml(ProcessDataStandardFormat processDataStandardFormat)
-    {
-        string result;
-        string tag;
-        string value;
-        string[] segments;
-        ReadOnlyCollection<string> body = processDataStandardFormat.InputPDSF is null ?
-            processDataStandardFormat.Body : processDataStandardFormat.InputPDSF.Body;
-        ReadOnlyCollection<string> columns = processDataStandardFormat.InputPDSF is null ?
-            processDataStandardFormat.Columns : processDataStandardFormat.InputPDSF.Columns;
-        List<string> lines = new() { "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "<records>" };
-        for (int i = 0; i < body.Count; i++)
-        {
-            lines.Add("  <record>");
-            segments = body[i].Trim().Split('\t');
-            if (segments.Length != columns.Count)
-                break;
-            for (int c = 0; c < segments.Length; c++)
-            {
-                value = segments[c].Replace("&", "&amp;")
-                                   .Replace("<", "&lt;")
-                                   .Replace(">", "&gt;")
-                                   .Replace("\"", "&quot;")
-                                   .Replace("'", "&apos;");
-                tag = Regex.Replace(columns[c].Trim('"'), @"[^a-zA-Z0-9]", "_").Split('\r')[0].Split('\n')[0];
-                lines.Add(string.Concat("    <", tag, '>', value, "</", tag, '>'));
-            }
-            lines.Add("  </record>");
-        }
-        lines.Add("</records>");
-        result = string.Join(Environment.NewLine, lines);
-        return result;
-    }
-
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true)]