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

re-organized configurations

Browse Source
This commit is contained in:
Mike Phares
2023-11-12 10:12:51 -07:00
parent bf8b1c010e
commit 9e60e23391
23 changed files with 481 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Rename/Rename.cs
View File

@ -20,9 +20,7 @@ public class Rename : IRename
private record Record(DateTime DateTime, ExifDirectory ExifDirectory, string File, string JsonFile);
private readonly AppSettings _AppSettings;
private readonly Configuration _Configuration;
private readonly IConfigurationRoot _ConfigurationRoot;
private readonly MetadataConfiguration _MetadataConfiguration;
private readonly RenameConfiguration _RenameConfiguration;
public Rename(List<string> args, ILogger<Program>? logger, IConfigurationRoot configurationRoot, AppSettings appSettings, bool isSilent, IConsole console)
{
@ -34,15 +32,12 @@ public class Rename : IRename
throw new NullReferenceException(nameof(console));
_AppSettings = appSettings;
long ticks = DateTime.Now.Ticks;
_ConfigurationRoot = configurationRoot;
MetadataConfiguration metadataConfiguration = Metadata.Models.Binder.Configuration.Get(configurationRoot);
Configuration configuration = Models.Binder.Configuration.Get(configurationRoot, metadataConfiguration);
_MetadataConfiguration = metadataConfiguration;
_Configuration = configuration;
DirectoryInfo directoryInfo = new(Path.GetFullPath(metadataConfiguration.RootDirectory));
ResultConfiguration resultConfiguration = Metadata.Models.Binder.ResultConfiguration.Get(configurationRoot, appSettings.RequireRootDirectoryExists);
MetadataConfiguration metadataConfiguration = Metadata.Models.Binder.MetadataConfiguration.Get(configurationRoot, resultConfiguration);
RenameConfiguration renameConfiguration = Models.Binder.RenameConfiguration.Get(configurationRoot, metadataConfiguration);
_RenameConfiguration = renameConfiguration;
DirectoryInfo directoryInfo = new(Path.GetFullPath(resultConfiguration.RootDirectory));
logger?.LogInformation("{RootDirectory}", directoryInfo.FullName);
MetadataConfiguration.Verify(metadataConfiguration, requireExist: false);
Verify();
ReadOnlyCollection<Record> exifDirectories = GetExifDirectoryCollection(directoryInfo);
ReadOnlyCollection<ToDo> toDoCollection = GetToDoCollection(logger, ticks, exifDirectories);
ReadOnlyCollection<string> lines = RenameFilesInDirectories(toDoCollection);
@ -53,25 +48,13 @@ public class Rename : IRename
}
}
private void Verify()
{
if (_AppSettings is null)
throw new NullReferenceException(nameof(_AppSettings));
if (_Configuration is null)
throw new NullReferenceException(nameof(_Configuration));
if (_ConfigurationRoot is null)
throw new NullReferenceException(nameof(_ConfigurationRoot));
if (_MetadataConfiguration is null)
throw new NullReferenceException(nameof(_MetadataConfiguration));
}
(ReadOnlyCollection<string>, FilePath?) IRename.ConvertAndGetFfmpegFiles(FilePath filePath)
{
List<string> results = [];
FilePath? result;
bool isIgnoreExtension;
bool isValidImageFormatExtension = _MetadataConfiguration.ValidImageFormatExtensions.Contains(filePath.ExtensionLowered);
isIgnoreExtension = isValidImageFormatExtension && _MetadataConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered);
bool isValidImageFormatExtension = _RenameConfiguration.ValidImageFormatExtensions.Contains(filePath.ExtensionLowered);
isIgnoreExtension = isValidImageFormatExtension && _RenameConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered);
if (!isIgnoreExtension && isValidImageFormatExtension)
result = null;
else
@ -85,11 +68,11 @@ public class Rename : IRename
results.AddRange(Directory.GetFiles(filePath.DirectoryName, $"{filePath.Name}-*.jpg", SearchOption.TopDirectoryOnly));
if (results.Count == 0)
throw new Exception();
result = IId.GetFilePath(_MetadataConfiguration, results[0]);
result = IId.GetFilePath(_RenameConfiguration.MetadataConfiguration, results[0]);
if (!result.Name.EndsWith("-0001.jpg"))
throw new Exception();
isValidImageFormatExtension = _MetadataConfiguration.ValidImageFormatExtensions.Contains(result.ExtensionLowered);
isIgnoreExtension = isValidImageFormatExtension && _MetadataConfiguration.IgnoreExtensions.Contains(result.ExtensionLowered);
isValidImageFormatExtension = _RenameConfiguration.ValidImageFormatExtensions.Contains(result.ExtensionLowered);
isIgnoreExtension = isValidImageFormatExtension && _RenameConfiguration.IgnoreExtensions.Contains(result.ExtensionLowered);
if (isIgnoreExtension || !isValidImageFormatExtension)
throw new Exception();
if (result.DirectoryName is null)
@ -143,7 +126,7 @@ public class Rename : IRename
DeterministicHashCode deterministicHashCode;
foreach (string file in files)
{
filePath = IId.GetFilePath(_MetadataConfiguration, file);
filePath = IId.GetFilePath(_RenameConfiguration.MetadataConfiguration, file);
if (filePath.ExtensionLowered is ".paddedId" or ".lsv")
continue;
if (files.Contains($"{filePath.FullName}.paddedId"))
@ -158,7 +141,7 @@ public class Rename : IRename
deterministicHashCode = new(null, filePath.Id, null);
else
deterministicHashCode = rename.GetDeterministicHashCode(filePath);
exifDirectory = metadata.GetMetadataCollection(_MetadataConfiguration, filePath, fileInfo, deterministicHashCode);
exifDirectory = metadata.GetMetadataCollection(_RenameConfiguration.MetadataConfiguration, filePath, fileInfo, deterministicHashCode);
exifDirectories.Add(new(file, fileInfo, exifDirectory));
foreach (string ffmpegFile in ffmpegFiles)
File.Delete(ffmpegFile);
@ -185,14 +168,14 @@ public class Rename : IRename
List<(string, FileInfo, ExifDirectory)> exifDirectories = [];
int appSettingsMaxDegreeOfParallelism = _AppSettings.MaxDegreeOfParallelism;
IEnumerable<string> files = Directory.EnumerateFiles(directoryInfo.FullName, "*", SearchOption.AllDirectories);
A_Metadata metadata = new(_MetadataConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata);
A_Metadata metadata = new(_RenameConfiguration.MetadataConfiguration);
if (appSettingsMaxDegreeOfParallelism == 1)
GetExifDirectoryCollection(rename, exifDirectories, files, metadata);
else
{
ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = appSettingsMaxDegreeOfParallelism };
ProgressBar progressBar = new(123000, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true });
files.AsParallel().ForAll(A_Metadata.SetExifDirectoryCollection(rename, _MetadataConfiguration, metadata, exifDirectories, () => progressBar.Tick()));
files.AsParallel().ForAll(A_Metadata.SetExifDirectoryCollection(rename, _RenameConfiguration.MetadataConfiguration, metadata, exifDirectories, () => progressBar.Tick()));
if (progressBar.CurrentTick != exifDirectories.Count)
throw new NotSupportedException();
}
@ -241,7 +224,7 @@ public class Rename : IRename
jsonFileDirectory = Path.GetDirectoryName(record.JsonFile) ?? throw new Exception();
checkFileExtension = fileHolder.ExtensionLowered == jpeg ? jpg : fileHolder.ExtensionLowered;
seasonDirectory = Path.Combine(fileHolder.DirectoryName, $"{record.DateTime.Year}.{season} {seasonName}");
paddedId = IId.GetPaddedId(intMinValueLength, _MetadataConfiguration.Offset + i, record.ExifDirectory.Id.Value);
paddedId = IId.GetPaddedId(intMinValueLength, _RenameConfiguration.MetadataConfiguration.Offset + i, record.ExifDirectory.Id.Value);
checkFile = Path.Combine(seasonDirectory, $"{paddedId}{checkFileExtension}");
if (checkFile == fileHolder.FullName)
continue;