CombinedEnumAndIndex

Map/Models/Stateless/MapLogic.cs

@@ -174,7 +174,7 @@ internal abstract class MapLogic
                 results.Add(face);
             }
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static string GetMappingSegmentB(long ticks, PersonBirthday personBirthday, int? approximateYears, MappingFromItem mappingFromItem)
@@ -234,11 +234,28 @@ internal abstract class MapLogic
         }
     }
 
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, string fullFileName)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
+                File.Move(checkFile, fullFileName);
+        }
+    }
+
     internal static string GetFacesDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string dFacesContentDirectory, FilePath filePath, MappingFromItem mappingFromItem)
     {
         string result;
-        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-        result = Path.Combine(dFacesContentDirectory, directoryName, mappingFromItem.FilePath.NameWithoutExtension);
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(propertyConfiguration, filePath);
+        result = Path.Combine(dFacesContentDirectory, cei.Combined, mappingFromItem.FilePath.NameWithoutExtension);
+        MoveIf(mappingFromItem.FilePath.NameWithoutExtension, cei, dFacesContentDirectory, result);
         return result;
     }
 
@@ -369,7 +386,7 @@ internal abstract class MapLogic
             }
             results.Add(idTo.Key, new(keyValuePairs));
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     private static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetReadOnly(Dictionary<int, Dictionary<int, Mapping>> keyValuePairs)
@@ -377,7 +394,7 @@ internal abstract class MapLogic
         Dictionary<int, ReadOnlyDictionary<int, Mapping>> results = [];
         foreach (KeyValuePair<int, Dictionary<int, Mapping>> keyValuePair in keyValuePairs)
             results.Add(keyValuePair.Key, new(keyValuePair.Value));
-        return new(results);
+        return results.AsReadOnly();
     }
 
     private static List<PersonContainer> GetNonSpecificPeopleCollection(Configuration configuration, long ticks, List<long> personKeys, ReadOnlyDictionary<long, int> personKeyToCount)
@@ -793,7 +810,7 @@ internal abstract class MapLogic
             idToWholePercentagesCollection[record.MappedFaceFilePath.Id.Value].Add(wholePercentages.Value);
             results.Add(new(record.PersonKeyFormatted, record.PersonDisplayDirectoryName, record.IsDefault, record.LinksCount, record.MappedFaceFilePath, record.MappedFaceFilePath.Id.Value, wholePercentages.Value));
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static List<PersonContainer> GetNotMappedPersonContainers(Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, ReadOnlyDictionary<long, int> personKeyToCount)
@@ -998,24 +1015,26 @@ internal abstract class MapLogic
     internal static string GetFacePartsDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string d2FacePartsContentDirectory, FilePath filePath, MappingFromItem mappingFromItem)
     {
         string result;
-        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-        result = Path.Combine(d2FacePartsContentDirectory, directoryName, mappingFromItem.FilePath.NameWithoutExtension);
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(propertyConfiguration, filePath);
+        result = Path.Combine(d2FacePartsContentDirectory, cei.Combined, mappingFromItem.FilePath.NameWithoutExtension);
+        MoveIf(mappingFromItem.FilePath.NameWithoutExtension, cei, d2FacePartsContentDirectory, result);
         return result;
     }
 
     internal static string GetFacePartsDirectoryX(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string d2FacePartsContentDirectory, FilePath filePath)
     {
         string result;
-        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-        result = Path.Combine(d2FacePartsContentDirectory, directoryName, filePath.NameWithoutExtension);
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(propertyConfiguration, filePath);
+        result = Path.Combine(d2FacePartsContentDirectory, cei.Combined, filePath.NameWithoutExtension);
+        MoveIf(filePath.NameWithoutExtension, cei, d2FacePartsContentDirectory, result);
         return result;
     }
 
     internal static string GetResizeContentDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string cContentDirectory, FilePath filePath)
     {
         string result;
-        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-        result = Path.Combine(cContentDirectory, directoryName);
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(propertyConfiguration, filePath);
+        result = Path.Combine(cContentDirectory, cei.Combined);
         return result;
     }
 
@@ -1124,7 +1143,7 @@ internal abstract class MapLogic
                 collection.Add(keyValuePair.Key);
             }
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
@@ -1274,7 +1293,7 @@ internal abstract class MapLogic
             foreach ((string _, int wholePercentage) in keyValuePair.Value)
                 wholePercentagesCollection.Add(wholePercentage);
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static ReadOnlyDictionary<int, List<int>> ConvertSkipNotSkip(Dictionary<int, List<(string, int)>> skipNotSkipCollection)
@@ -1292,7 +1311,7 @@ internal abstract class MapLogic
             foreach ((string _, int wholePercentage) in keyValuePair.Value)
                 wholePercentagesCollection.Add(wholePercentage);
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static ReadOnlyDictionary<int, List<LocationContainer>> ConvertLocationContainers(List<LocationContainer> locationContainers)
@@ -1304,7 +1323,7 @@ internal abstract class MapLogic
                 results.Add(locationContainer.Id, []);
             results[locationContainer.Id].Add(locationContainer);
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages)