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

Pack and published 8.0.118.14728

Browse Source 
Metadata alignment
This commit is contained in:
Mike Phares
2025-07-19 09:25:58 -07:00
parent 05fb8685d9
commit ba11c04f4a
10 changed files with 413 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Rename/Rename.cs
View File

@ -394,7 +394,7 @@ public partial class Rename : IRename, IDisposable
const string jpeg = ".jpeg";
List<ToDo> toDoCollection = [];
DateTime? dateTime = IDate.GetDateTimeOriginal(exifDirectory);
ReadOnlyCollection<string> keywords = IMetadata.GetKeywords(exifDirectory);
ReadOnlyCollection<string> keywords = IMetaBase.GetKeywords(exifDirectory);
bool hasIgnoreKeyword = appSettings.MetadataSettings.IgnoreRulesKeyWords.Any(keywords.Contains);
string checkFileExtension = exifDirectory.FilePath.ExtensionLowered == jpeg ? jpg : exifDirectory.FilePath.ExtensionLowered;
bool hasDateTimeOriginal = dateTime is not null;
@ -454,7 +454,7 @@ public partial class Rename : IRename, IDisposable
dateTime = IDate.GetDateTimeOriginal(firstPass.ExifDirectory);
hasDateTimeOriginal = dateTime is not null;
dateTime ??= IDate.GetMinimum(firstPass.ExifDirectory);
keywords = IMetadata.GetKeywords(firstPass.ExifDirectory);
keywords = IMetaBase.GetKeywords(firstPass.ExifDirectory);
hasIgnoreKeyword = appSettings.MetadataSettings.IgnoreRulesKeyWords.Any(l => keywords.Contains(l));
record = new(DateTime: dateTime.Value,
ExifDirectory: firstPass.ExifDirectory,
@ -544,7 +544,7 @@ public partial class Rename : IRename, IDisposable
hasDateTimeOriginal = dateTime is not null;
if (dateTime is null && appSettings.ResultSettings.ValidVideoFormatExtensions.Contains(record.ExifDirectory.FilePath.ExtensionLowered))
continue;
keywords = IMetadata.GetKeywords(record.ExifDirectory);
keywords = IMetaBase.GetKeywords(record.ExifDirectory);
hasIgnoreKeyword = appSettings.MetadataSettings.IgnoreRulesKeyWords.Any(keywords.Contains);
}
cei = IPath.GetCombinedEnumAndIndex(appSettings.ResultSettings, record.ExifDirectory.FilePath);
@ -640,7 +640,7 @@ public partial class Rename : IRename, IDisposable
isWrongYear = null;
string directoryName;
string tfw = GetTFW(record, isWrongYear);
string? maker = IMetadata.GetMaker(record.ExifDirectory);
string? maker = IMetaBase.GetMaker(record.ExifDirectory);
string rootDirectory = appSettings.ResultSettings.RootDirectory;
string[] segments = checkDirectoryName.Split(years, StringSplitOptions.None);
(int seasonValue, string seasonName) = IDate.GetSeason(record.DateTime.DayOfYear);