From 9b61eceb8001387b2b5b8b7287ba8fd3844f5d5d Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sun, 20 Jul 2025 08:28:52 -0700 Subject: [PATCH] Updated to Phares 8.0.118.14751 for Shared and Metadata --- File-Watcher.csproj | 4 ++-- Helpers/DeterministicHashCodeHelper.cs | 24 ++++++++++++------------ Models/AppSettings.cs | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/File-Watcher.csproj b/File-Watcher.csproj index d2c0d57..b96ce9a 100644 --- a/File-Watcher.csproj +++ b/File-Watcher.csproj @@ -31,7 +31,7 @@ - - + + \ No newline at end of file diff --git a/Helpers/DeterministicHashCodeHelper.cs b/Helpers/DeterministicHashCodeHelper.cs index 05e5f72..376ee82 100644 --- a/Helpers/DeterministicHashCodeHelper.cs +++ b/Helpers/DeterministicHashCodeHelper.cs @@ -7,10 +7,10 @@ using System.Drawing.Imaging; using System.IO.Compression; using System.Runtime.InteropServices; using System.Text.Json; -using View_by_Distance.Metadata.Models; -using View_by_Distance.Metadata.Models.Stateless; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Metadata.Models; +using Phares.Metadata.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; namespace File_Watcher.Helpers; @@ -20,11 +20,12 @@ internal static partial class DeterministicHashCodeHelper private class Windows : IWindows, IDisposable { + public long Ticks { get; init; } + public int? CurrentTick => _ProgressBar?.CurrentTick; + private ProgressBar? _ProgressBar; private readonly ProgressBarOptions _ProgressBarOptions; - public int CurrentTick { get; internal set; } - public Windows() => _ProgressBarOptions = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }; @@ -164,7 +165,7 @@ internal static partial class DeterministicHashCodeHelper string sourceDirectory; List check = []; string archiveEntryFile; - long ticks = DateTime.Now.Ticks; + Windows windows = new(); ReadOnlyCollection collection; string rootDirectory = Path.GetFullPath(appSettings.ResultSettings.RootDirectory); if (!Directory.Exists(rootDirectory)) @@ -187,7 +188,7 @@ internal static partial class DeterministicHashCodeHelper archiveEntryFile = Path.Combine(sourceDirectory, zipArchiveEntry.Name); zipArchiveEntry.ExtractToFile(archiveEntryFile); } - collection = WindowsWork(logger, appSettings, ticks, sourceDirectory); + collection = WindowsWork(windows, logger, appSettings, sourceDirectory); if (check.Count == collection.Count) { json = JsonSerializer.Serialize(collection.ToList(), FirstPassCollectionSourceGenerationContext.Default.ListFirstPass); @@ -198,12 +199,11 @@ internal static partial class DeterministicHashCodeHelper return true; } - private static ReadOnlyCollection WindowsWork(ILogger? logger, AppSettings appSettings, long ticks, string sourceDirectory) + private static ReadOnlyCollection WindowsWork(IWindows windows, ILogger? logger, AppSettings appSettings, string sourceDirectory) { ReadOnlyCollection results; - Windows windows = new(); IWindows windowsInterface = windows; - logger?.LogInformation("{Ticks} {RootDirectory}", ticks, sourceDirectory); + logger?.LogInformation("{Ticks} {RootDirectory}", windows.Ticks, sourceDirectory); A_Metadata metadata = new(appSettings.ResultSettings, appSettings.MetadataSettings); int appSettingsMaxDegreeOfParallelism = appSettings.DeterministicHashCodeConfiguration.MaxDegreeOfParallelism; ReadOnlyCollection files = Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories).AsReadOnly(); @@ -299,7 +299,7 @@ internal static partial class DeterministicHashCodeHelper return result; } - private static ReadOnlyCollection WindowsAsynchronousWork(AppSettings appSettings, Windows windows, ReadOnlyCollection files, A_Metadata metadata, int appSettingsMaxDegreeOfParallelism) + private static ReadOnlyCollection WindowsAsynchronousWork(AppSettings appSettings, IWindows windows, ReadOnlyCollection files, A_Metadata metadata, int appSettingsMaxDegreeOfParallelism) { List results = []; FirstPass firstPass; diff --git a/Models/AppSettings.cs b/Models/AppSettings.cs index c08c6eb..b8bb17a 100644 --- a/Models/AppSettings.cs +++ b/Models/AppSettings.cs @@ -1,6 +1,6 @@ using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models; +using Phares.Shared.Models; namespace File_Watcher.Models;