Ready to test v2.43.0
This commit is contained in:
		| @ -6,7 +6,6 @@ using System; | ||||
| using System.Collections.Generic; | ||||
| using System.IO; | ||||
| using System.Linq; | ||||
| using System.Reflection; | ||||
| using System.Text.Json; | ||||
| using System.Text.RegularExpressions; | ||||
|  | ||||
| @ -16,25 +15,29 @@ public class FileRead : Shared.FileRead, IFileRead | ||||
| { | ||||
|  | ||||
|     private readonly string _GhostPCLFileName; | ||||
|     private readonly string _PDFTextStripperFileName; | ||||
|  | ||||
|     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> 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<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> 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) | ||||
|             throw new Exception(cellInstanceConnectionName); | ||||
|         if (_IsDuplicator) | ||||
|             throw new Exception(cellInstanceConnectionName); | ||||
|         _GhostPCLFileName = string.Concat(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), @"\gpcl6win64.exe"); | ||||
|         _GhostPCLFileName = Path.Combine(AppContext.BaseDirectory, "gpcl6win64.exe"); | ||||
|         if (!File.Exists(_GhostPCLFileName)) | ||||
|             throw new Exception("Ghost PCL FileName doesn't Exist!"); | ||||
|         _PDFTextStripperFileName = Path.Combine(AppContext.BaseDirectory, "PDF-Text-Stripper.exe"); | ||||
|         if (!File.Exists(_PDFTextStripperFileName)) | ||||
|             throw new Exception("PDF-Text-Stripper FileName doesn't Exist!"); | ||||
|     } | ||||
|  | ||||
|     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception) => Move(extractResults, exception); | ||||
|     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception) => Move(extractResults); | ||||
|  | ||||
|     void IFileRead.WaitForThread() => WaitForThread(thread: null, threadExceptions: null); | ||||
|  | ||||
| @ -99,8 +102,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<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime) | ||||
|     { | ||||
|         Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>()); | ||||
| @ -110,17 +111,16 @@ public class FileRead : Shared.FileRead, IFileRead | ||||
|             results.Item4.Add(new FileInfo(reportFullPath)); | ||||
|         else | ||||
|         { | ||||
|             IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4, _GhostPCLFileName); | ||||
|             if (iProcessData is ProcessData processData) | ||||
|             { | ||||
|                 string mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); | ||||
|                 mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; | ||||
|                 _Logistics.MID = mid; | ||||
|                 SetFileParameterLotID(mid); | ||||
|                 _Logistics.ProcessJobID = processData.Reactor; | ||||
|             } | ||||
|             IProcessData iProcessData = new ProcessData(this, _Logistics, results.Item4, _GhostPCLFileName, _PDFTextStripperFileName); | ||||
|             if (iProcessData is not ProcessData processData) | ||||
|                 throw new Exception(string.Concat("A) No Data - ", dateTime.Ticks)); | ||||
|             string mid = string.Concat(processData.Reactor, "-", processData.RDS, "-", processData.PSN); | ||||
|             mid = Regex.Replace(mid, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0]; | ||||
|             _Logistics.MID = mid; | ||||
|             SetFileParameterLotID(mid); | ||||
|             _Logistics.ProcessJobID = processData.Reactor; | ||||
|             if (!iProcessData.Details.Any()) | ||||
|                 throw new Exception(string.Concat("No Data - ", dateTime.Ticks)); | ||||
|                 throw new Exception(string.Concat("B) No Data - ", dateTime.Ticks)); | ||||
|             results = iProcessData.GetResults(this, _Logistics, results.Item4); | ||||
|         } | ||||
|         return results; | ||||
|  | ||||
		Reference in New Issue
	
	Block a user