diff --git a/Rename/Rename.cs b/Rename/Rename.cs index 6c3181e..0f7e163 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -20,7 +20,7 @@ public class Rename bool IsIgnoreExtension, bool IsValidImageFormatExtension, List FileHolders, - bool FfmpegFilesPresent, + bool FastForwardMovingPictureExpertsGroupFilesPresent, DateTime? DateTimeOriginal, DateTime[] DateTimes, int? Id); @@ -218,11 +218,11 @@ public class Rename FilePath filePath; DateTime[] dateTimes; FileHolder fileHolder; - string[]? ffmpegFiles; bool isIgnoreExtension; DateTime? dateTimeOriginal; bool isValidImageFormatExtension; ASCIIEncoding asciiEncoding = new(); + string[]? fastForwardMovingPictureExpertsGroupFiles; IReadOnlyList directories; for (int i = 0; i < files.Length; i++) { @@ -243,7 +243,7 @@ public class Rename isValidImageFormatExtension = _PropertyConfiguration.ValidImageFormatExtensions.Contains(fileHolder.ExtensionLowered); isIgnoreExtension = isValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered); if (!isIgnoreExtension && isValidImageFormatExtension) - ffmpegFiles = null; + fastForwardMovingPictureExpertsGroupFiles = null; else { try @@ -255,10 +255,10 @@ public class Rename .WithWorkingDirectory(fileHolder.DirectoryName) .ExecuteAsync(); result.Task.Wait(); - ffmpegFiles = Directory.GetFiles(fileHolder.DirectoryName, $"{fileHolder.Name}-*.jpg", SearchOption.TopDirectoryOnly); - if (ffmpegFiles.Length == 0) + fastForwardMovingPictureExpertsGroupFiles = Directory.GetFiles(fileHolder.DirectoryName, $"{fileHolder.Name}-*.jpg", SearchOption.TopDirectoryOnly); + if (fastForwardMovingPictureExpertsGroupFiles.Length == 0) continue; - fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(ffmpegFiles.First()); + fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(fastForwardMovingPictureExpertsGroupFiles.First()); if (!fileHolder.Name.EndsWith("-0001.jpg")) throw new Exception(); isValidImageFormatExtension = _PropertyConfiguration.ValidImageFormatExtensions.Contains(fileHolder.ExtensionLowered); @@ -269,15 +269,15 @@ public class Rename continue; } (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding); - if (ffmpegFiles is not null) + if (fastForwardMovingPictureExpertsGroupFiles is not null) { fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(files[i]); - foreach (string ffmpegFile in ffmpegFiles) - File.Delete(ffmpegFile); + foreach (string fastForwardMovingPictureExpertsGroupFile in fastForwardMovingPictureExpertsGroupFiles) + File.Delete(fastForwardMovingPictureExpertsGroupFile); } if (message is not null) throw new Exception(message); - results.Add(new(i + offset, isIgnoreExtension, isValidImageFormatExtension, [fileHolder], ffmpegFiles is null, dateTimeOriginal, dateTimes, id)); + results.Add(new(i + offset, isIgnoreExtension, isValidImageFormatExtension, [fileHolder], fastForwardMovingPictureExpertsGroupFiles is null, dateTimeOriginal, dateTimes, id)); } return results; }