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

Use ValidVideoFormatExtensions to move when not forcing Id

Browse Source
This commit is contained in:
Mike Phares 2024-11-03 09:14:42 -07:00
parent 368390b353
commit 7b8ab5508b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Rename/Rename.cs
View File

@ -235,6 +235,8 @@ public partial class Rename : IRename, IDisposable
} }
if (renameConfiguration.InPlace || renameConfiguration.InPlaceWithOriginalName) if (renameConfiguration.InPlace || renameConfiguration.InPlaceWithOriginalName)
NonParallelismAndInPlace(renameConfiguration, ids, exifDirectory, fileInfo, filePath, fastForwardMovingPictureExpertsGroupUsed, new(sidecarFiles)); NonParallelismAndInPlace(renameConfiguration, ids, exifDirectory, fileInfo, filePath, fastForwardMovingPictureExpertsGroupUsed, new(sidecarFiles));
if (!fastForwardMovingPictureExpertsGroupUsed && renameConfiguration.InPlaceMoveDirectory && renameConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered))
fastForwardMovingPictureExpertsGroupUsed = true;
results.Add(new(exifDirectory, fastForwardMovingPictureExpertsGroupUsed, fileInfo, filePath, new(sidecarFiles))); results.Add(new(exifDirectory, fastForwardMovingPictureExpertsGroupUsed, fileInfo, filePath, new(sidecarFiles)));
} }
} }
@ -281,7 +283,12 @@ public partial class Rename : IRename, IDisposable
if (_ProgressBar.CurrentTick != recordACollection.Count) if (_ProgressBar.CurrentTick != recordACollection.Count)
throw new NotSupportedException(); throw new NotSupportedException();
foreach ((bool fastForwardMovingPictureExpertsGroupUsed, FilePath filePath, FileInfo fileInfo, ExifDirectory exifDirectory, ReadOnlyCollection<FileHolder> sidecarFiles) in collection) foreach ((bool fastForwardMovingPictureExpertsGroupUsed, FilePath filePath, FileInfo fileInfo, ExifDirectory exifDirectory, ReadOnlyCollection<FileHolder> sidecarFiles) in collection)
recordACollection.Add(new(exifDirectory, fastForwardMovingPictureExpertsGroupUsed, fileInfo, filePath, sidecarFiles)); {
if (fastForwardMovingPictureExpertsGroupUsed || !renameConfiguration.InPlaceMoveDirectory || !renameConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered))
recordACollection.Add(new(exifDirectory, fastForwardMovingPictureExpertsGroupUsed, fileInfo, filePath, sidecarFiles));
else
recordACollection.Add(new(exifDirectory, FastForwardMovingPictureExpertsGroupUsed: true, fileInfo, filePath, sidecarFiles));
}
} }
_ProgressBar.Dispose(); _ProgressBar.Dispose();
results = GetRecordBCollection(renameConfiguration.MetadataConfiguration, recordACollection); results = GetRecordBCollection(renameConfiguration.MetadataConfiguration, recordACollection);
@ -471,7 +478,10 @@ public partial class Rename : IRename, IDisposable
{ {
if (File.Exists(toDo.File)) if (File.Exists(toDo.File))
File.Delete(toDo.File); File.Delete(toDo.File);
File.Move(toDo.FilePath.FullName, toDo.File); try
{ File.Move(toDo.FilePath.FullName, toDo.File); }
catch (Exception)
{ continue; }
} }
else if (toDo.Directory is null) else if (toDo.Directory is null)
throw new NotSupportedException(); throw new NotSupportedException();
@ -527,6 +537,7 @@ public partial class Rename : IRename, IDisposable
ReadOnlyCollection<int> ids = GetIds(appSettings.RenameConfiguration); ReadOnlyCollection<int> ids = GetIds(appSettings.RenameConfiguration);
RenameConfiguration renameConfiguration = appSettings.RenameConfiguration; RenameConfiguration renameConfiguration = appSettings.RenameConfiguration;
MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration; MetadataConfiguration metadataConfiguration = renameConfiguration.MetadataConfiguration;
_ = IPath.DeleteEmptyDirectories(metadataConfiguration.ResultConfiguration.RootDirectory);
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, ids, directoryInfo); ReadOnlyCollection<RecordB> recordBCollection = GetRecordBCollection(logger, appSettings, rename, ids, directoryInfo);