diff --git a/Copy-Distinct/CopyDistinct.cs b/Copy-Distinct/CopyDistinct.cs index 12dfe4b..de1dd74 100644 --- a/Copy-Distinct/CopyDistinct.cs +++ b/Copy-Distinct/CopyDistinct.cs @@ -137,6 +137,8 @@ public class CopyDistinct { foreach ((FileHolder fileHolder, string to) in toDoCollection) { + if (File.Exists(to)) + continue; results.Add(fileHolder.NameWithoutExtension); try { File.Copy(fileHolder.FullName, to); } diff --git a/Rename/Rename.cs b/Rename/Rename.cs index 0a45075..a4db43e 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -322,7 +322,7 @@ public class Rename if (seasonDirectory is null || (isWrongYear is not null && isWrongYear.Value)) { if (metadataMinimumDateTime is null) - break; + continue; checkFileExtension = fileHolder.ExtensionLowered == jpeg ? jpg : fileHolder.ExtensionLowered; checkFile = Path.Combine(fileHolder.DirectoryName, $"{metadataMinimumDateTime.Value:yyyy-MM-dd}.{metadataMinimumDateTime.Value.Ticks}.{fileHolder.Length}{checkFileExtension}"); if (checkFile == fileHolder.FullName) @@ -510,6 +510,7 @@ public class Rename continue; toDoCollection = GetToDoCollection(progressBar, files, nefPresent); } + progressBar.Dispose(); verifiedToDoCollection = new(); foreach ((FileHolder fileHolder, string directory, string to) in toDoCollection) { @@ -533,7 +534,6 @@ public class Rename continue; results.AddRange(Move(log, verifiedToDoCollection)); allFiles = GetAllFiles(matchNginxCollection); - progressBar.Dispose(); } return results; }