Updated to Phares 8.0.118.14751 for Shared and Metadata

This commit is contained in:
2025-07-20 08:28:52 -07:00
parent 97797fc440
commit 9b61eceb80
3 changed files with 15 additions and 15 deletions

View File

@ -31,7 +31,7 @@
<PackageReference Include="System.Drawing.Common" Version="8.0.16" /> <PackageReference Include="System.Drawing.Common" Version="8.0.16" />
<PackageReference Include="System.IO.Ports" Version="8.0.0" /> <PackageReference Include="System.IO.Ports" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.5" /> <PackageReference Include="System.Text.Json" Version="9.0.5" />
<PackageReference Include="Phares.AA.Shared" Version="8.0.114.12235" /> <PackageReference Include="Phares.Shared" Version="8.0.118.14751" />
<PackageReference Include="Phares.AA.Metadata" Version="8.0.114.12235" /> <PackageReference Include="Phares.Metadata" Version="8.0.118.14751" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -7,10 +7,10 @@ using System.Drawing.Imaging;
using System.IO.Compression; using System.IO.Compression;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text.Json; using System.Text.Json;
using View_by_Distance.Metadata.Models; using Phares.Metadata.Models;
using View_by_Distance.Metadata.Models.Stateless; using Phares.Metadata.Models.Stateless;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace File_Watcher.Helpers; namespace File_Watcher.Helpers;
@ -20,11 +20,12 @@ internal static partial class DeterministicHashCodeHelper
private class Windows : IWindows, IDisposable private class Windows : IWindows, IDisposable
{ {
public long Ticks { get; init; }
public int? CurrentTick => _ProgressBar?.CurrentTick;
private ProgressBar? _ProgressBar; private ProgressBar? _ProgressBar;
private readonly ProgressBarOptions _ProgressBarOptions; private readonly ProgressBarOptions _ProgressBarOptions;
public int CurrentTick { get; internal set; }
public Windows() => public Windows() =>
_ProgressBarOptions = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }; _ProgressBarOptions = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
@ -164,7 +165,7 @@ internal static partial class DeterministicHashCodeHelper
string sourceDirectory; string sourceDirectory;
List<string> check = []; List<string> check = [];
string archiveEntryFile; string archiveEntryFile;
long ticks = DateTime.Now.Ticks; Windows windows = new();
ReadOnlyCollection<FirstPass> collection; ReadOnlyCollection<FirstPass> collection;
string rootDirectory = Path.GetFullPath(appSettings.ResultSettings.RootDirectory); string rootDirectory = Path.GetFullPath(appSettings.ResultSettings.RootDirectory);
if (!Directory.Exists(rootDirectory)) if (!Directory.Exists(rootDirectory))
@ -187,7 +188,7 @@ internal static partial class DeterministicHashCodeHelper
archiveEntryFile = Path.Combine(sourceDirectory, zipArchiveEntry.Name); archiveEntryFile = Path.Combine(sourceDirectory, zipArchiveEntry.Name);
zipArchiveEntry.ExtractToFile(archiveEntryFile); zipArchiveEntry.ExtractToFile(archiveEntryFile);
} }
collection = WindowsWork(logger, appSettings, ticks, sourceDirectory); collection = WindowsWork(windows, logger, appSettings, sourceDirectory);
if (check.Count == collection.Count) if (check.Count == collection.Count)
{ {
json = JsonSerializer.Serialize(collection.ToList(), FirstPassCollectionSourceGenerationContext.Default.ListFirstPass); json = JsonSerializer.Serialize(collection.ToList(), FirstPassCollectionSourceGenerationContext.Default.ListFirstPass);
@ -198,12 +199,11 @@ internal static partial class DeterministicHashCodeHelper
return true; return true;
} }
private static ReadOnlyCollection<FirstPass> WindowsWork(ILogger<Worker>? logger, AppSettings appSettings, long ticks, string sourceDirectory) private static ReadOnlyCollection<FirstPass> WindowsWork(IWindows windows, ILogger<Worker>? logger, AppSettings appSettings, string sourceDirectory)
{ {
ReadOnlyCollection<FirstPass> results; ReadOnlyCollection<FirstPass> results;
Windows windows = new();
IWindows windowsInterface = windows; IWindows windowsInterface = windows;
logger?.LogInformation("{Ticks} {RootDirectory}", ticks, sourceDirectory); logger?.LogInformation("{Ticks} {RootDirectory}", windows.Ticks, sourceDirectory);
A_Metadata metadata = new(appSettings.ResultSettings, appSettings.MetadataSettings); A_Metadata metadata = new(appSettings.ResultSettings, appSettings.MetadataSettings);
int appSettingsMaxDegreeOfParallelism = appSettings.DeterministicHashCodeConfiguration.MaxDegreeOfParallelism; int appSettingsMaxDegreeOfParallelism = appSettings.DeterministicHashCodeConfiguration.MaxDegreeOfParallelism;
ReadOnlyCollection<string> files = Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories).AsReadOnly(); ReadOnlyCollection<string> files = Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories).AsReadOnly();
@ -299,7 +299,7 @@ internal static partial class DeterministicHashCodeHelper
return result; return result;
} }
private static ReadOnlyCollection<FirstPass> WindowsAsynchronousWork(AppSettings appSettings, Windows windows, ReadOnlyCollection<string> files, A_Metadata metadata, int appSettingsMaxDegreeOfParallelism) private static ReadOnlyCollection<FirstPass> WindowsAsynchronousWork(AppSettings appSettings, IWindows windows, ReadOnlyCollection<string> files, A_Metadata metadata, int appSettingsMaxDegreeOfParallelism)
{ {
List<FirstPass> results = []; List<FirstPass> results = [];
FirstPass firstPass; FirstPass firstPass;

View File

@ -1,6 +1,6 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
namespace File_Watcher.Models; namespace File_Watcher.Models;