From db19697d73db40f801352ad628319b11141dfd0b Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 21 Aug 2024 09:30:05 -0700 Subject: [PATCH] Removed HelperEAFProgramData-MoveFiles --- Helpers/HelperEAFProgramData.cs | 37 --------------------------- Models/AppSettings.cs | 1 - Models/Binder/AppSettings.cs | 3 --- Models/EAFProgramDataConfiguration.cs | 21 --------------- Worker.cs | 1 - 5 files changed, 63 deletions(-) diff --git a/Helpers/HelperEAFProgramData.cs b/Helpers/HelperEAFProgramData.cs index 87931fd..e69de29 100644 --- a/Helpers/HelperEAFProgramData.cs +++ b/Helpers/HelperEAFProgramData.cs @@ -1,37 +0,0 @@ -using File_Watcher.Models; - -namespace File_Watcher.Helpers; - -internal static partial class HelperEAFProgramData -{ - - internal static bool MoveFiles(AppSettings appSettings, ILogger logger) - { - string checkFile; - string checkDirectory; - string source = Path.GetFullPath(appSettings.EAFProgramDataConfiguration.Source); - string[] files = Directory.GetFiles(source, "*", SearchOption.AllDirectories); - logger.LogInformation("After {MillisecondsDelay} with search pattern '{SearchPattern}' found {files}", appSettings.MillisecondsDelay, appSettings.EAFLogConfiguration.SearchPattern, files.Length); - foreach (string file in files) - { - Thread.Sleep(500); - checkFile = file.Replace(source, appSettings.EAFProgramDataConfiguration.Destination); - if (checkFile == file) - throw new NotSupportedException("Replace failed!"); - checkDirectory = Path.GetDirectoryName(checkFile) ?? throw new NotSupportedException(); - try - { - if (!Directory.Exists(checkDirectory)) - _ = Directory.CreateDirectory(checkDirectory); - if (File.Exists(checkFile)) - continue; - File.Move(file, checkFile); - Thread.Sleep(500); - } - catch (Exception ex) - { logger.LogInformation(ex, "Inner loop error!"); } - } - return true; - } - -} \ No newline at end of file diff --git a/Models/AppSettings.cs b/Models/AppSettings.cs index 4b45c61..e2c73e7 100644 --- a/Models/AppSettings.cs +++ b/Models/AppSettings.cs @@ -6,7 +6,6 @@ namespace File_Watcher.Models; public record AppSettings(CompassConfiguration CompassConfiguration, DriveConfiguration DriveConfiguration, EAFLogConfiguration EAFLogConfiguration, - EAFProgramDataConfiguration EAFProgramDataConfiguration, EDADatabaseConfiguration EDADatabaseConfiguration, IsoConfiguration IsoConfiguration, MetrologyConfiguration MetrologyConfiguration, diff --git a/Models/Binder/AppSettings.cs b/Models/Binder/AppSettings.cs index a9dd5a2..f29a989 100644 --- a/Models/Binder/AppSettings.cs +++ b/Models/Binder/AppSettings.cs @@ -47,7 +47,6 @@ public class AppSettings CompassConfiguration compassConfiguration, DriveConfiguration driveConfiguration, EAFLogConfiguration eafLogConfiguration, - EAFProgramDataConfiguration eafProgramDataConfiguration, EDADatabaseConfiguration edaDatabaseConfiguration, IsoConfiguration isoConfiguration, MetrologyConfiguration metrologyConfiguration, @@ -69,7 +68,6 @@ public class AppSettings result = new(compassConfiguration, driveConfiguration, eafLogConfiguration, - eafProgramDataConfiguration, edaDatabaseConfiguration, isoConfiguration, metrologyConfiguration, @@ -115,7 +113,6 @@ public class AppSettings results.CompassConfiguration, results.DriveConfiguration, results.EAFLogConfiguration, - results.EAFProgramDataConfiguration, results.EDADatabaseConfiguration, results.IsoConfiguration, results.MetrologyConfiguration, diff --git a/Models/EAFProgramDataConfiguration.cs b/Models/EAFProgramDataConfiguration.cs index 40447a4..e69de29 100644 --- a/Models/EAFProgramDataConfiguration.cs +++ b/Models/EAFProgramDataConfiguration.cs @@ -1,21 +0,0 @@ -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace File_Watcher.Models; - -public record EAFProgramDataConfiguration(string Destination, string Source) -{ - - public override string ToString() - { - string result = JsonSerializer.Serialize(this, EAFProgramDataConfigurationSourceGenerationContext.Default.EAFProgramDataConfiguration); - return result; - } - -} - -[JsonSourceGenerationOptions(WriteIndented = true)] -[JsonSerializable(typeof(EAFProgramDataConfiguration))] -internal partial class EAFProgramDataConfigurationSourceGenerationContext : JsonSerializerContext -{ -} \ No newline at end of file diff --git a/Worker.cs b/Worker.cs index f96f2c4..8bc3bee 100644 --- a/Worker.cs +++ b/Worker.cs @@ -40,7 +40,6 @@ public partial class Worker : BackgroundService nameof(Helpers.HelperInfinityQS) => Helpers.HelperInfinityQS.RunMI(_AppSettings, _Logger), nameof(Helpers.HelperEventLog) => Helpers.HelperEventLog.ClearEventLogs(_AppSettings, _Logger), nameof(Helpers.HelperWaferCounter) => Helpers.HelperWaferCounter.MoveFile(_AppSettings, _Logger), - nameof(Helpers.HelperEAFProgramData) => Helpers.HelperEAFProgramData.MoveFiles(_AppSettings, _Logger), nameof(Helpers.HelperSerial) => Helpers.HelperSerial.ReadWrite(_AppSettings, _Logger, cancellationToken), nameof(Helpers.HelperMetrologyFiles) => Helpers.HelperMetrologyFiles.SortAndDelete(_AppSettings, _Logger), nameof(Helpers.HelperEDADatabase) => Helpers.HelperEDADatabase.SaveDataCollectionPlans(_AppSettings, _Logger, cancellationToken),