From b8cd2acbde7df552b8985c50e69e9c333aadd662 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Fri, 5 May 2023 11:18:01 -0700 Subject: [PATCH] Name => Group --- Map/Models/MapLogic.cs | 4 ++-- Shared/Models/PersonDirectory.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Map/Models/MapLogic.cs b/Map/Models/MapLogic.cs index 0f84b74..9dd6e6e 100644 --- a/Map/Models/MapLogic.cs +++ b/Map/Models/MapLogic.cs @@ -857,7 +857,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic } else if (i == 2) { - directory = Path.Combine(a2PeopleSingletonDirectory, personContainer.PersonDirectory.Char.ToString(), personContainer.DisplayDirectoryName, personKeyToCount[personKey].ToString("0000")); + directory = Path.Combine(a2PeopleSingletonDirectory, personContainer.PersonDirectory.Char.ToString(), personContainer.PersonDirectory.Group, personContainer.DisplayDirectoryName, personKeyToCount[personKey].ToString("0000")); if (results.Contains(directory)) continue; results.Add(directory); @@ -936,7 +936,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic continue; if (!File.Exists(faceFile)) continue; - directory = Path.Combine(a2PeopleSingletonDirectory, personContainer.PersonDirectory.Char.ToString(), personContainer.DisplayDirectoryName); + directory = Path.Combine(a2PeopleSingletonDirectory, personContainer.PersonDirectory.Char.ToString(), personContainer.PersonDirectory.Group, personContainer.DisplayDirectoryName); if (!Directory.Exists(directory)) continue; fileName = Path.Combine(directory, faceFileName); diff --git a/Shared/Models/PersonDirectory.cs b/Shared/Models/PersonDirectory.cs index 849b7e5..4e701b4 100644 --- a/Shared/Models/PersonDirectory.cs +++ b/Shared/Models/PersonDirectory.cs @@ -2,7 +2,7 @@ using System.Text.Json; namespace View_by_Distance.Shared.Models; -public record PersonDirectory(char Char, string Name, char Status, char Sex, char First) +public record PersonDirectory(char Char, string Group, char Status, char Sex, char First) { public override string ToString()