phares3757/aa
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interface over passing ticks

Browse Source
This commit is contained in:
Mike Phares
2025-07-04 09:11:05 -07:00
parent 93598255c0
commit 8f7fd02ba8
17 changed files with 124 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Rename/Rename.cs
View File

@ -18,6 +18,9 @@ namespace View_by_Distance.Rename;
public partial class Rename : IRename, IDisposable
{
public long Ticks { get; init; }
public int? CurrentTick => _ProgressBar?.CurrentTick;
private sealed record ToDo(string? Directory,
FileInfo FileInfo,
string File,
@ -125,10 +128,10 @@ public partial class Rename : IRename, IDisposable
throw new NullReferenceException(nameof(console));
IRename rename = this;
LogNetToHoursSince(logger);
long ticks = DateTime.Now.Ticks;
Ticks = DateTime.Now.Ticks;
_ProgressBarOptions = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
Verify(logger, appSettings, rename);
RenameWork(logger, appSettings, rename, ticks);
RenameWork(logger, appSettings, rename);
}
private static void Verify(ILogger<Program>? logger, AppSettings appSettings, IRename rename)
@ -159,18 +162,18 @@ public partial class Rename : IRename, IDisposable
logger?.LogInformation("It has been {net9TotalHours} hours since net9 was released", net9TotalHours);
}
private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks)
private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename)
{
ReadOnlyCollection<int> ids = GetIds(appSettings.RenameSettings);
string sourceDirectory = Path.GetFullPath(appSettings.ResultSettings.RootDirectory);
if (!Directory.Exists(sourceDirectory))
_ = Directory.CreateDirectory(sourceDirectory);
logger?.LogInformation("{Ticks} {RootDirectory}", ticks, sourceDirectory);
logger?.LogInformation("{Ticks} {RootDirectory}", rename.Ticks, sourceDirectory);
ReadOnlyCollection<string> files = Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories).ToArray().AsReadOnly();
if (files.Count > 0)
_ = IPath.DeleteEmptyDirectories(appSettings.ResultSettings.RootDirectory);
ReadOnlyCollection<Record> recordCollection = GetRecordCollection(logger, appSettings, rename, ticks, ids, sourceDirectory, files);
SaveIdentifiersToDisk(ticks, appSettings, recordCollection);
ReadOnlyCollection<Record> recordCollection = GetRecordCollection(logger, appSettings, rename, ids, sourceDirectory, files);
SaveIdentifiersToDisk(appSettings, rename, recordCollection);
if (appSettings.RenameSettings.InPlace || appSettings.RenameSettings.InPlaceWithOriginalName)
{
if (recordCollection.Count > 0)
@ -203,13 +206,13 @@ public partial class Rename : IRename, IDisposable
return results;
}
private ReadOnlyCollection<Record> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files)
private ReadOnlyCollection<Record> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files)
{
ReadOnlyCollection<Record> results;
List<FirstPass> collection;
string? checkFile = string.IsNullOrEmpty(appSettings.RenameSettings.FirstPassFile) ? null : Path.Combine(sourceDirectory, appSettings.RenameSettings.FirstPassFile);
if (string.IsNullOrEmpty(checkFile) || !File.Exists(checkFile))
collection = GetRecordCollection(logger, appSettings, rename, ticks, ids, sourceDirectory, files, checkFile);
collection = GetRecordCollection(logger, appSettings, rename, ids, sourceDirectory, files, checkFile);
else
{
string json = File.ReadAllText(checkFile);
@ -222,7 +225,7 @@ public partial class Rename : IRename, IDisposable
return results;
}
private List<FirstPass> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files, string? checkFile)
private List<FirstPass> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files, string? checkFile)
{
List<FirstPass> results;
FirstPass firstPass;
@ -233,7 +236,7 @@ public partial class Rename : IRename, IDisposable
if (appSettingsMaxDegreeOfParallelism == 1)
{
ReadOnlyDictionary<string, List<FileHolder>> keyValuePairs = IMetadata.GetKeyValuePairs(files);
results = GetFirstPassCollection(logger, appSettings, rename, ticks, ids, metadata, keyValuePairs);
results = GetFirstPassCollection(logger, appSettings, rename, ids, metadata, keyValuePairs);
}
else
{
@ -255,13 +258,13 @@ public partial class Rename : IRename, IDisposable
if (!string.IsNullOrEmpty(checkFile))
{
string json = JsonSerializer.Serialize(results, FirstPassCollectionSourceGenerationContext.Default.ListFirstPass);
File.WriteAllText(Path.Combine(sourceDirectory, $"{ticks}.json"), json);
File.WriteAllText(Path.Combine(sourceDirectory, $"{rename.Ticks}.json"), json);
}
return results;
}
private List<FirstPass> GetFirstPassCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection<int> ids, A_Metadata metadata, ReadOnlyDictionary<string, List<FileHolder>> keyValuePairs)
private List<FirstPass> GetFirstPassCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, A_Metadata metadata, ReadOnlyDictionary<string, List<FileHolder>> keyValuePairs)
{
List<FirstPass> results = [];
int index = -1;
@ -279,7 +282,7 @@ public partial class Rename : IRename, IDisposable
if (keyValuePair.Value.Count > 2)
throw new NotSupportedException("Too many sidecar files!");
SetFirstPassCollection(logger, appSettings, rename, ids, metadata, index, keyValuePair, results);
timeSpan = new(DateTime.Now.Ticks - ticks);
timeSpan = new(DateTime.Now.Ticks - rename.Ticks);
if (timeSpan.TotalMilliseconds > appSettings.RenameSettings.MaxMilliSecondsPerCall)
break;
}
@ -465,7 +468,7 @@ public partial class Rename : IRename, IDisposable
return results.AsReadOnly();
}
private static void SaveIdentifiersToDisk(long ticks, AppSettings appSettings, ReadOnlyCollection<Record> recordCollection)
private static void SaveIdentifiersToDisk(AppSettings appSettings, IRename rename, ReadOnlyCollection<Record> recordCollection)
{
string paddedId;
Identifier identifier;
@ -480,7 +483,7 @@ public partial class Rename : IRename, IDisposable
identifiers.Add(identifier);
}
string json = JsonSerializer.Serialize(identifiers.OrderBy(l => l.PaddedId).ToArray(), IdentifierCollectionSourceGenerationContext.Default.IdentifierArray);
_ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
_ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{rename.Ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
}
private static ReadOnlyCollection<ToDo> GetToDoCollection(AppSettings appSettings, DirectoryInfo directoryInfo, ReadOnlyCollection<int> ids, ReadOnlyCollection<string> files, ReadOnlyCollection<Record> recordCollection)
@ -706,7 +709,7 @@ public partial class Rename : IRename, IDisposable
foreach (ToDo toDo in toDoCollection)
{
if (useProgressBar)
_ProgressBar?.Tick();
rename?.Tick();
if (!toDo.FileInfo.Exists)
continue;
if (toDo.JsonFile)
@ -731,8 +734,6 @@ public partial class Rename : IRename, IDisposable
results.Add($"{toDo.FileInfo.FullName}\t{toDo.File}");
}
}
if (useProgressBar)
_ProgressBar?.Dispose();
return results.AsReadOnly();
}