This commit is contained in:
2023-06-25 00:21:10 -07:00
parent 141ed4bf37
commit 8dfcc33e74
2 changed files with 4 additions and 2 deletions

View File

@ -137,6 +137,8 @@ public class CopyDistinct
{ {
foreach ((FileHolder fileHolder, string to) in toDoCollection) foreach ((FileHolder fileHolder, string to) in toDoCollection)
{ {
if (File.Exists(to))
continue;
results.Add(fileHolder.NameWithoutExtension); results.Add(fileHolder.NameWithoutExtension);
try try
{ File.Copy(fileHolder.FullName, to); } { File.Copy(fileHolder.FullName, to); }

View File

@ -322,7 +322,7 @@ public class Rename
if (seasonDirectory is null || (isWrongYear is not null && isWrongYear.Value)) if (seasonDirectory is null || (isWrongYear is not null && isWrongYear.Value))
{ {
if (metadataMinimumDateTime is null) if (metadataMinimumDateTime is null)
break; continue;
checkFileExtension = fileHolder.ExtensionLowered == jpeg ? jpg : fileHolder.ExtensionLowered; checkFileExtension = fileHolder.ExtensionLowered == jpeg ? jpg : fileHolder.ExtensionLowered;
checkFile = Path.Combine(fileHolder.DirectoryName, $"{metadataMinimumDateTime.Value:yyyy-MM-dd}.{metadataMinimumDateTime.Value.Ticks}.{fileHolder.Length}{checkFileExtension}"); checkFile = Path.Combine(fileHolder.DirectoryName, $"{metadataMinimumDateTime.Value:yyyy-MM-dd}.{metadataMinimumDateTime.Value.Ticks}.{fileHolder.Length}{checkFileExtension}");
if (checkFile == fileHolder.FullName) if (checkFile == fileHolder.FullName)
@ -510,6 +510,7 @@ public class Rename
continue; continue;
toDoCollection = GetToDoCollection(progressBar, files, nefPresent); toDoCollection = GetToDoCollection(progressBar, files, nefPresent);
} }
progressBar.Dispose();
verifiedToDoCollection = new(); verifiedToDoCollection = new();
foreach ((FileHolder fileHolder, string directory, string to) in toDoCollection) foreach ((FileHolder fileHolder, string directory, string to) in toDoCollection)
{ {
@ -533,7 +534,6 @@ public class Rename
continue; continue;
results.AddRange(Move(log, verifiedToDoCollection)); results.AddRange(Move(log, verifiedToDoCollection));
allFiles = GetAllFiles(matchNginxCollection); allFiles = GetAllFiles(matchNginxCollection);
progressBar.Dispose();
} }
return results; return results;
} }