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

Pending changes

Browse Source
This commit is contained in:
Mike Phares 2024-06-17 21:01:57 -07:00
parent dc1b0e3efd
commit a9275dd5d1
3 changed files with 69 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Rename/Models/Binder/AppSettings.cs
View File

@ -39,8 +39,10 @@ public class AppSettings
private static void Verify(Models.AppSettings appSettings) private static void Verify(Models.AppSettings appSettings)
{ {
if (appSettings.MaxDegreeOfParallelism > 1 && appSettings.RenameConfiguration.InPlace) if (appSettings.MaxDegreeOfParallelism > 1 && (appSettings.RenameConfiguration.InPlaceWithOriginalName || appSettings.RenameConfiguration.InPlace))
throw new NotSupportedException($"Change configuration: {nameof(appSettings.RenameConfiguration.InPlace)} or {nameof(appSettings.MaxDegreeOfParallelism)}"); throw new NotSupportedException($"Change configuration: {nameof(appSettings.RenameConfiguration.InPlace)} or {nameof(appSettings.MaxDegreeOfParallelism)}");
if (appSettings.RenameConfiguration.InPlaceWithOriginalName && appSettings.RenameConfiguration.InPlace)
throw new NotSupportedException($"Change configuration: {nameof(appSettings.RenameConfiguration.InPlace)} or {nameof(appSettings.RenameConfiguration.InPlaceWithOriginalName)}");
} }
private static Models.AppSettings Get(AppSettings? appSettings, RenameConfiguration renameConfiguration) private static Models.AppSettings Get(AppSettings? appSettings, RenameConfiguration renameConfiguration)

1
Rename/Models/RenameConfiguration.cs
View File

@ -9,6 +9,7 @@ public record RenameConfiguration(Shared.Models.MetadataConfiguration MetadataCo
bool ForceNewId, bool ForceNewId,
string[] IgnoreExtensions, string[] IgnoreExtensions,
bool InPlace, bool InPlace,
bool InPlaceWithOriginalName,
bool OnlySaveIdentifiersToDisk, bool OnlySaveIdentifiersToDisk,
string RelativePropertyCollectionFile, string RelativePropertyCollectionFile,
string[] SidecarExtensions, string[] SidecarExtensions,

78
Rename/Rename.cs
View File

@ -117,7 +117,7 @@ public partial class Rename : IRename, IDisposable
#pragma warning restore CA1416 #pragma warning restore CA1416
private void NonParallelismAndInPlace(MetadataConfiguration metadataConfiguration, ExifDirectory exifDirectory, FileInfo fileInfo, FilePath filePath, ReadOnlyCollection<FileHolder> sidecarFiles) private void NonParallelismAndInPlace(RenameConfiguration renameConfiguration, ReadOnlyCollection<int> ids, ExifDirectory exifDirectory, FileInfo fileInfo, FilePath filePath, ReadOnlyCollection<FileHolder> sidecarFiles)
{ {
if (exifDirectory.Id is null) if (exifDirectory.Id is null)
throw new NotImplementedException(); throw new NotImplementedException();
@ -127,11 +127,14 @@ public partial class Rename : IRename, IDisposable
const string jpeg = ".jpeg"; const string jpeg = ".jpeg";
List<ToDo> toDoCollection = []; List<ToDo> toDoCollection = [];
ReadOnlyCollection<string> keywords = IMetadata.GetKeywords(exifDirectory); ReadOnlyCollection<string> keywords = IMetadata.GetKeywords(exifDirectory);
MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration;
bool hasIgnoreKeyword = metadataConfiguration.IgnoreRulesKeyWords.Any(keywords.Contains); bool hasIgnoreKeyword = metadataConfiguration.IgnoreRulesKeyWords.Any(keywords.Contains);
string checkDirectory = Path.Combine(filePath.DirectoryName, filePath.FileNameFirstSegment);
string checkFileExtension = filePath.ExtensionLowered == jpeg ? jpg : filePath.ExtensionLowered; string checkFileExtension = filePath.ExtensionLowered == jpeg ? jpg : filePath.ExtensionLowered;
string paddedId = IId.GetPaddedId(metadataConfiguration, exifDirectory.Id.Value, hasIgnoreKeyword, i); string paddedId = IId.GetPaddedId(metadataConfiguration, exifDirectory.Id.Value, hasIgnoreKeyword, i);
string checkDirectory = renameConfiguration.InPlaceWithOriginalName ? Path.Combine(filePath.DirectoryName, filePath.FileNameFirstSegment) : filePath.DirectoryName;
string checkFile = Path.Combine(checkDirectory, $"{paddedId}{checkFileExtension}"); string checkFile = Path.Combine(checkDirectory, $"{paddedId}{checkFileExtension}");
if (checkFile != filePath.FullName)
{
if (File.Exists(checkFile)) if (File.Exists(checkFile))
{ {
checkFile = string.Concat(checkFile, ".del"); checkFile = string.Concat(checkFile, ".del");
@ -141,18 +144,27 @@ public partial class Rename : IRename, IDisposable
toDoCollection.Add(new(checkDirectory, filePath, checkFile, JsonFile: false)); toDoCollection.Add(new(checkDirectory, filePath, checkFile, JsonFile: false));
if (sidecarFiles.Count != 0) if (sidecarFiles.Count != 0)
{ {
if (renameConfiguration.InPlace)
throw new NotSupportedException($"Must use {nameof(renameConfiguration.InPlaceWithOriginalName)} when sidecar file(s) are present!");
dateTime = IDate.GetDateTimeOriginal(exifDirectory); dateTime = IDate.GetDateTimeOriginal(exifDirectory);
bool hasDateTimeOriginal = dateTime is not null; bool hasDateTimeOriginal = dateTime is not null;
dateTime ??= IDate.GetMinimum(exifDirectory); dateTime ??= IDate.GetMinimum(exifDirectory);
RecordB recordB = new(dateTime.Value, exifDirectory, filePath, sidecarFiles, hasDateTimeOriginal, hasIgnoreKeyword, fileInfo.FullName); RecordB recordB = new(dateTime.Value, exifDirectory, filePath, sidecarFiles, hasDateTimeOriginal, hasIgnoreKeyword, fileInfo.FullName);
toDoCollection.AddRange(GetSidecarFiles(metadataConfiguration, recordB, [], checkDirectory, paddedId)); toDoCollection.AddRange(GetSidecarFiles(metadataConfiguration, recordB, [], checkDirectory, paddedId));
} }
_ = RenameFilesInDirectories(new(toDoCollection)); _ = RenameFilesInDirectories(renameConfiguration, new(toDoCollection));
string jsonFile = Path.Combine(checkDirectory, $"{paddedId}{checkFileExtension}.json"); string jsonFile = Path.Combine(checkDirectory, $"{paddedId}{checkFileExtension}.json");
File.Move(fileInfo.FullName, jsonFile); File.Move(fileInfo.FullName, jsonFile, overwrite: true);
if (renameConfiguration.InPlaceWithOriginalName && ids.Count > 0)
{
string idCheck = Path.Combine(checkDirectory, ids.Contains(exifDirectory.Id.Value) ? "_ Exists _" : "_ New _");
if (!Directory.Exists(idCheck))
_ = Directory.CreateDirectory(idCheck);
}
}
} }
private List<RecordA> GetRecordACollection(ILogger<Program>? logger, RenameConfiguration renameConfiguration, IRename rename, IEnumerable<string> files, A_Metadata metadata) private List<RecordA> GetRecordACollection(ILogger<Program>? logger, RenameConfiguration renameConfiguration, IRename rename, ReadOnlyCollection<int> ids, IEnumerable<string> files, A_Metadata metadata)
{ {
List<RecordA> results = []; List<RecordA> results = [];
int index = -1; int index = -1;
@ -185,7 +197,7 @@ public partial class Rename : IRename, IDisposable
{ {
ffmpegFiles = null; ffmpegFiles = null;
deterministicHashCode = new(null, filePath.Id, null); deterministicHashCode = new(null, filePath.Id, null);
if (renameConfiguration.InPlace) if (renameConfiguration.InPlaceWithOriginalName || (renameConfiguration.InPlace && filePath.DirectoryName.EndsWith(filePath.Id.Value.ToString())))
continue; continue;
} }
else else
@ -213,8 +225,8 @@ public partial class Rename : IRename, IDisposable
foreach (string ffmpegFile in ffmpegFiles) foreach (string ffmpegFile in ffmpegFiles)
File.Delete(ffmpegFile); File.Delete(ffmpegFile);
} }
if (renameConfiguration.InPlace) if (renameConfiguration.InPlace || renameConfiguration.InPlaceWithOriginalName)
NonParallelismAndInPlace(renameConfiguration.MetadataConfiguration, exifDirectory, fileInfo, filePath, new(sidecarFiles)); NonParallelismAndInPlace(renameConfiguration, ids, exifDirectory, fileInfo, filePath, new(sidecarFiles));
results.Add(new(exifDirectory, fileInfo, filePath, new(sidecarFiles))); results.Add(new(exifDirectory, fileInfo, filePath, new(sidecarFiles)));
} }
} }
@ -240,7 +252,7 @@ public partial class Rename : IRename, IDisposable
return new(results); return new(results);
} }
private ReadOnlyCollection<RecordB> GetRecordBCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, DirectoryInfo directoryInfo) private ReadOnlyCollection<RecordB> GetRecordBCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, DirectoryInfo directoryInfo)
{ {
ReadOnlyCollection<RecordB> results; ReadOnlyCollection<RecordB> results;
List<RecordA> recordACollection = []; List<RecordA> recordACollection = [];
@ -251,7 +263,7 @@ public partial class Rename : IRename, IDisposable
int filesCount = appSettingsMaxDegreeOfParallelism == 1 ? files.Count() : 123000; int filesCount = appSettingsMaxDegreeOfParallelism == 1 ? files.Count() : 123000;
_ProgressBar = new(filesCount, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }); _ProgressBar = new(filesCount, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true });
if (appSettingsMaxDegreeOfParallelism == 1) if (appSettingsMaxDegreeOfParallelism == 1)
recordACollection.AddRange(GetRecordACollection(logger, renameConfiguration, rename, files, metadata)); recordACollection.AddRange(GetRecordACollection(logger, renameConfiguration, rename, ids, files, metadata));
else else
{ {
List<string> distinct = []; List<string> distinct = [];
@ -295,7 +307,7 @@ public partial class Rename : IRename, IDisposable
string splat = filePath.DirectoryName[^3..][1] == '!' ? filePath.DirectoryName[^3..] : string.Empty; string splat = filePath.DirectoryName[^3..][1] == '!' ? filePath.DirectoryName[^3..] : string.Empty;
string makerSplit = string.IsNullOrEmpty(maker) ? string.IsNullOrEmpty(renameConfiguration.DefaultMaker) ? string.Empty : renameConfiguration.DefaultMaker : $" {maker.Split(' ')[0]}"; string makerSplit = string.IsNullOrEmpty(maker) ? string.IsNullOrEmpty(renameConfiguration.DefaultMaker) ? string.Empty : renameConfiguration.DefaultMaker : $" {maker.Split(' ')[0]}";
string directoryName = $"{year}.{seasonValue} {seasonName}{makerSplit}{splat}"; string directoryName = $"{year}.{seasonValue} {seasonName}{makerSplit}{splat}";
result = Path.Combine(renameConfiguration.MetadataConfiguration.ResultConfiguration.RootDirectory, record.ExifDirectory.Id is null || !ids.Contains(record.ExifDirectory.Id.Value) ? "_ Destination _" : "_ Exists _", record.HasDateTimeOriginal ? "Has" : "Not", directoryName); result = Path.Combine(renameConfiguration.MetadataConfiguration.ResultConfiguration.RootDirectory, record.ExifDirectory.Id is null || ids.Contains(record.ExifDirectory.Id.Value) ? "_ Exists _" : "_ New-Destination _", record.HasDateTimeOriginal ? "Has" : "Not", directoryName);
} }
return result; return result;
} }
@ -346,7 +358,7 @@ public partial class Rename : IRename, IDisposable
return result; return result;
} }
private static ReadOnlyCollection<ToDo> GetToDoCollection(RenameConfiguration renameConfiguration, Identifier[]? identifiers, ReadOnlyCollection<RecordB> recordBCollection) private static ReadOnlyCollection<ToDo> GetToDoCollection(RenameConfiguration renameConfiguration, ReadOnlyCollection<int> ids, ReadOnlyCollection<RecordB> recordBCollection)
{ {
List<ToDo> results = []; List<ToDo> results = [];
RecordB record; RecordB record;
@ -366,7 +378,6 @@ public partial class Rename : IRename, IDisposable
MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration; MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration;
VerifyIntMinValueLength(metadataConfiguration, recordBCollection); VerifyIntMinValueLength(metadataConfiguration, recordBCollection);
bool multipleDirectoriesWithFiles = directoryCheck is not null && directoryCheck.Value; bool multipleDirectoriesWithFiles = directoryCheck is not null && directoryCheck.Value;
ReadOnlyCollection<int> ids = identifiers is null ? new([]) : new((from l in identifiers select l.Id).ToArray());
ReadOnlyCollection<RecordB> sorted = new((from l in recordBCollection orderby l.DateTime select l).ToArray()); ReadOnlyCollection<RecordB> sorted = new((from l in recordBCollection orderby l.DateTime select l).ToArray());
for (int i = 0; i < sorted.Count; i++) for (int i = 0; i < sorted.Count; i++)
{ {
@ -422,14 +433,17 @@ public partial class Rename : IRename, IDisposable
} }
} }
private ReadOnlyCollection<string> RenameFilesInDirectories(ReadOnlyCollection<ToDo> toDoCollection) private ReadOnlyCollection<string> RenameFilesInDirectories(RenameConfiguration renameConfiguration, ReadOnlyCollection<ToDo> toDoCollection)
{ {
List<string> results = []; List<string> results = [];
VerifyDirectories(toDoCollection); VerifyDirectories(toDoCollection);
bool useProgressBar = !renameConfiguration.InPlace && !renameConfiguration.InPlaceWithOriginalName;
if (useProgressBar)
_ProgressBar = new(toDoCollection.Count, "Move Files", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true }); _ProgressBar = new(toDoCollection.Count, "Move Files", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true });
foreach (ToDo toDo in toDoCollection) foreach (ToDo toDo in toDoCollection)
{ {
_ProgressBar.Tick(); if (useProgressBar)
_ProgressBar?.Tick();
if (toDo.JsonFile) if (toDo.JsonFile)
{ {
if (File.Exists(toDo.File)) if (File.Exists(toDo.File))
@ -449,14 +463,17 @@ public partial class Rename : IRename, IDisposable
results.Add($"{toDo.FilePath.FullName}\t{toDo.File}"); results.Add($"{toDo.FilePath.FullName}\t{toDo.File}");
} }
} }
_ProgressBar.Dispose(); if (useProgressBar)
_ProgressBar?.Dispose();
return new(results); return new(results);
} }
private static void SaveIdentifiersToDisk(long ticks, RenameConfiguration renameConfiguration, string aMetadataCollectionDirectory, ReadOnlyCollection<RecordB> recordBCollection) private static void SaveIdentifiersToDisk(long ticks, RenameConfiguration renameConfiguration, ReadOnlyCollection<RecordB> recordBCollection)
{ {
string paddedId; string paddedId;
List<Identifier> identifiers = []; List<Identifier> identifiers = [];
MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration;
string aMetadataCollectionDirectory = IResult.GetResultsDateGroupDirectory(metadataConfiguration.ResultConfiguration, nameof(A_Metadata), metadataConfiguration.ResultConfiguration.ResultCollection);
foreach (RecordB record in recordBCollection) foreach (RecordB record in recordBCollection)
{ {
if (record.ExifDirectory.Id is null) if (record.ExifDirectory.Id is null)
@ -468,21 +485,28 @@ public partial class Rename : IRename, IDisposable
_ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null); _ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
} }
private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks) private static ReadOnlyCollection<int> GetIds(RenameConfiguration renameConfiguration)
{ {
RenameConfiguration renameConfiguration = appSettings.RenameConfiguration; ReadOnlyCollection<int> results;
MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration; string? propertyCollectionFile = string.IsNullOrEmpty(renameConfiguration.RelativePropertyCollectionFile) ? null : renameConfiguration.RelativePropertyCollectionFile;
string aMetadataCollectionDirectory = IResult.GetResultsDateGroupDirectory(metadataConfiguration.ResultConfiguration, nameof(A_Metadata), metadataConfiguration.ResultConfiguration.ResultCollection);
string? propertyCollectionFile = string.IsNullOrEmpty(renameConfiguration.RelativePropertyCollectionFile) ? null : Path.GetFullPath(Path.Combine(aMetadataCollectionDirectory, renameConfiguration.RelativePropertyCollectionFile));
string? json = !File.Exists(propertyCollectionFile) ? null : File.ReadAllText(propertyCollectionFile); string? json = !File.Exists(propertyCollectionFile) ? null : File.ReadAllText(propertyCollectionFile);
Identifier[]? identifiers = json is null ? null : JsonSerializer.Deserialize(json, IdentifierCollectionSourceGenerationContext.Default.IdentifierArray); Identifier[]? identifiers = json is null ? null : JsonSerializer.Deserialize(json, IdentifierCollectionSourceGenerationContext.Default.IdentifierArray);
if (identifiers is null && !string.IsNullOrEmpty(renameConfiguration.RelativePropertyCollectionFile)) if (identifiers is null && !string.IsNullOrEmpty(renameConfiguration.RelativePropertyCollectionFile))
throw new Exception($"Invalid {nameof(renameConfiguration.RelativePropertyCollectionFile)}"); throw new Exception($"Invalid {nameof(renameConfiguration.RelativePropertyCollectionFile)}");
results = identifiers is null ? new([]) : new((from l in identifiers select l.Id).ToArray());
return results;
}
private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks)
{
ReadOnlyCollection<int> ids = GetIds(appSettings.RenameConfiguration);
RenameConfiguration renameConfiguration = appSettings.RenameConfiguration;
MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration;
DirectoryInfo directoryInfo = new(Path.GetFullPath(metadataConfiguration.ResultConfiguration.RootDirectory)); DirectoryInfo directoryInfo = new(Path.GetFullPath(metadataConfiguration.ResultConfiguration.RootDirectory));
logger?.LogInformation("{Ticks} {RootDirectory}", ticks, directoryInfo.FullName); logger?.LogInformation("{Ticks} {RootDirectory}", ticks, directoryInfo.FullName);
ReadOnlyCollection<RecordB> recordBCollection = GetRecordBCollection(logger, appSettings, rename, directoryInfo); ReadOnlyCollection<RecordB> recordBCollection = GetRecordBCollection(logger, appSettings, rename, ids, directoryInfo);
SaveIdentifiersToDisk(ticks, renameConfiguration, aMetadataCollectionDirectory, recordBCollection); SaveIdentifiersToDisk(ticks, renameConfiguration, recordBCollection);
if (renameConfiguration.InPlace) if (renameConfiguration.InPlace || renameConfiguration.InPlaceWithOriginalName)
{ {
if (recordBCollection.Count > 0) if (recordBCollection.Count > 0)
recordBCollection = new([]); recordBCollection = new([]);
@ -491,8 +515,8 @@ public partial class Rename : IRename, IDisposable
} }
if (!renameConfiguration.OnlySaveIdentifiersToDisk) if (!renameConfiguration.OnlySaveIdentifiersToDisk)
{ {
ReadOnlyCollection<ToDo> toDoCollection = GetToDoCollection(renameConfiguration, identifiers, recordBCollection); ReadOnlyCollection<ToDo> toDoCollection = GetToDoCollection(renameConfiguration, ids, recordBCollection);
ReadOnlyCollection<string> lines = RenameFilesInDirectories(toDoCollection); ReadOnlyCollection<string> lines = RenameFilesInDirectories(renameConfiguration, toDoCollection);
if (lines.Count != 0) if (lines.Count != 0)
{ {
File.WriteAllLines($"D:/Tmp/Phares/{DateTime.Now.Ticks}.tsv", lines); File.WriteAllLines($"D:/Tmp/Phares/{DateTime.Now.Ticks}.tsv", lines);