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

Videos

Browse Source
This commit is contained in:
Mike Phares
2023-12-22 16:22:08 -07:00
parent 96c479e639
commit 82de27ce61
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Rename/Rename.cs
View File

@ -61,7 +61,7 @@ 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(renameConfiguration.MetadataConfiguration, results[0]);
result = IId.GetFilePath(renameConfiguration.MetadataConfiguration, results[0], index: null);
if (!result.Name.EndsWith("-0001.jpg"))
throw new Exception();
isValidImageFormatExtension = renameConfiguration.ValidImageFormatExtensions.Contains(result.ExtensionLowered);
@ -111,6 +111,7 @@ public class Rename : IRename
private static void GetExifDirectoryCollection(IRename rename, RenameConfiguration renameConfiguration, List<(string, FileInfo, ExifDirectory)> exifDirectories, IEnumerable<string> files, A_Metadata metadata)
{
int index = -1;
FileInfo fileInfo;
FilePath filePath;
FilePath? ffmpegFilePath;
@ -119,8 +120,9 @@ public class Rename : IRename
DeterministicHashCode deterministicHashCode;
foreach (string file in files)
{
index += 1;
rename.Tick();
filePath = IId.GetFilePath(renameConfiguration.MetadataConfiguration, file);
filePath = IId.GetFilePath(renameConfiguration.MetadataConfiguration, file, index);
if (renameConfiguration.SkipIdFiles && filePath.Id is not null && (filePath.IsIntelligentIdFormat || filePath.SortOrder is not null))
continue;
(ffmpegFiles, ffmpegFilePath) = rename.ConvertAndGetFfmpegFiles(renameConfiguration, filePath);