|
|
@@ -19,20 +19,20 @@ namespace crusherScanner
|
|
|
return;
|
|
|
}
|
|
|
Scan scanData = (Scan)e.Argument;
|
|
|
- string[] DataDirs = new string[2] { Properties.Settings.Default.OreDefWorkFile, Properties.Settings.Default.OreDefInFile };
|
|
|
+ string[] DataDirs = [Properties.Settings.Default.OreDefWorkFile, Properties.Settings.Default.OreDefInFile];
|
|
|
string? JobFile = GetJobFilePath(scanData, DataDirs);
|
|
|
if (JobFile != null)
|
|
|
{
|
|
|
if (JobFile.Contains(DataDirs[0]))
|
|
|
{
|
|
|
- scanData = updateSampleInJobFile(scanData, JobFile);
|
|
|
+ scanData = UpdateSampleInJobFile(scanData, JobFile);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
File.Move(JobFile, $"{DataDirs[0]}\\{scanData.sampleData.Job}.csv");
|
|
|
- scanData = updateSampleInJobFile(scanData, $"{DataDirs[0]}\\{scanData.sampleData.Job}.csv");
|
|
|
+ scanData = UpdateSampleInJobFile(scanData, $"{DataDirs[0]}\\{scanData.sampleData.Job}.csv");
|
|
|
}
|
|
|
catch (Exception)
|
|
|
{
|
|
|
@@ -56,18 +56,17 @@ namespace crusherScanner
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- foreach (var DataDir in DataDirs)
|
|
|
+ foreach (string DataDir in DataDirs)
|
|
|
{
|
|
|
if (Directory.Exists(DataDir))
|
|
|
{
|
|
|
// Pattern match is for 'ML003092.csv' or 'ML003092_20220822.csv'
|
|
|
var jobFiles = Directory.EnumerateFiles(DataDir, "ML??????*.csv", SearchOption.TopDirectoryOnly);
|
|
|
- foreach (var jobFile in jobFiles)
|
|
|
+ foreach (string? jobFile in from jobFile in jobFiles
|
|
|
+ where jobFile.Contains(scanData.sampleData.Job)
|
|
|
+ select jobFile)
|
|
|
{
|
|
|
- if (jobFile.Contains(scanData.sampleData.Job))
|
|
|
- {
|
|
|
- return jobFile;
|
|
|
- }
|
|
|
+ return jobFile;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -79,20 +78,20 @@ namespace crusherScanner
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- private static Scan updateSampleInJobFile(Scan scanData, string DataFile)
|
|
|
+ private static Scan UpdateSampleInJobFile(Scan scanData, string DataFile)
|
|
|
{
|
|
|
- List<string> fileLines = new();
|
|
|
+ List<string> fileLines = [];
|
|
|
using FileStream OreDefWorkingFile = new(DataFile, FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.None);
|
|
|
{
|
|
|
using StreamReader Reader = new(OreDefWorkingFile);
|
|
|
{
|
|
|
- var line = Reader.ReadLine();
|
|
|
+ string? line = Reader.ReadLine();
|
|
|
while (line != null)
|
|
|
{
|
|
|
if (line != null && line.Contains('\u002C'))
|
|
|
{
|
|
|
scanData.JobTotal++;
|
|
|
- string[] CSV = line.Split('\u002C');
|
|
|
+ string[]? CSV = line.Split('\u002C');
|
|
|
if(CSV[0] == scanData.sampleData.Sid)
|
|
|
{
|
|
|
if (scanData.Ins)
|
|
|
@@ -124,7 +123,7 @@ namespace crusherScanner
|
|
|
OreDefWorkingFile.Position = 0;
|
|
|
using StreamWriter writer = new(OreDefWorkingFile);
|
|
|
{
|
|
|
- foreach (var line in fileLines)
|
|
|
+ foreach (string line in fileLines)
|
|
|
{
|
|
|
writer.WriteLine(line);
|
|
|
}
|