From 544b008e07665f9624be9b65fa1738f7bac51e1e Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 10 Apr 2023 20:26:29 -0700 Subject: [PATCH] Why duplicate for Individually --- Map/Models/MapLogic.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Map/Models/MapLogic.cs b/Map/Models/MapLogic.cs index 747ff71..a491aa7 100644 --- a/Map/Models/MapLogic.cs +++ b/Map/Models/MapLogic.cs @@ -198,6 +198,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic { if (_Configuration is null) throw new NullReferenceException(nameof(_Configuration)); + string fileName; string checkFile; string sourceFile; List distinct = new(); @@ -242,13 +243,16 @@ public class MapLogic : Shared.Models.Methods.IMapLogic continue; if (saveIndividually) { - if (distinct.Contains(checkFile)) + fileName = Path.GetFileName(checkFile); + if (distinct.Contains(fileName)) continue; - distinct.Add(checkFile); + distinct.Add(fileName); } if (File.Exists(checkFile)) continue; File.Copy(sourceFile, checkFile); + if (saveIndividually) + continue; if (saveContainer.MakeAllHidden) File.SetAttributes(checkFile, FileAttributes.Hidden); if (saveContainer.HiddenFaceFileHolder is not null && saveContainer.HiddenFaceFileHolder.Exists) @@ -474,7 +478,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic keyMapping = normalizedRectangleToMapping[mapping.SortingContainer.Sorting.NormalizedRectangle]; if (keyMapping.MappingFromLocation is null) continue; - if (keyMapping.MappingFromLocation.NormalizedRectangle == mapping.MappingFromLocation.NormalizedRectangle) + if (saveIndividually && keyMapping.MappingFromLocation.NormalizedRectangle == mapping.MappingFromLocation.NormalizedRectangle) results.Add(new(Path.Combine(directory, "Maybe"))); } facesDirectory = Stateless.MapLogic.GetFacesDirectory(dFacesContentDirectory, mapping.MappingFromItem);