exclamationPoint bug

This commit is contained in:
Mike Phares 2023-05-05 10:39:42 -07:00
parent c80ca04936
commit 272ef46aa3

View File

@ -242,23 +242,26 @@ internal abstract class PersonContainer
private static List<Models.PersonContainer> GetPersonContainersInnerGroups(string mappingDefaultName, string personBirthdayFormat, string facesFileNameExtension, char[] personCharacters, Dictionary<string, List<string>> individuals, string groupDirectory, string groupDirectoryName) private static List<Models.PersonContainer> GetPersonContainersInnerGroups(string mappingDefaultName, string personBirthdayFormat, string facesFileNameExtension, char[] personCharacters, Dictionary<string, List<string>> individuals, string groupDirectory, string groupDirectoryName)
{ {
List<Models.PersonContainer> results = new(); List<Models.PersonContainer> results = new();
char @char;
string[] segments; string[] segments;
const int zero = 0; const int zero = 0;
string innerGroupDirectoryName; string innerGroupDirectoryName;
PersonDirectory personDirectory; PersonDirectory personDirectory;
string[] personDisplayDirectories; string[] personDisplayDirectories;
const char exclamationPoint = '!'; const char exclamationPoint = '!';
char @char = groupDirectoryName[zero];
List<Models.PersonContainer> collection; List<Models.PersonContainer> collection;
string[] innerGroupDirectories = Directory.GetDirectories(groupDirectory, "*", SearchOption.TopDirectoryOnly); string[] innerGroupDirectories = Directory.GetDirectories(groupDirectory, "*", SearchOption.TopDirectoryOnly);
foreach (string innerGroupDirectory in innerGroupDirectories) if (@char == exclamationPoint)
{ {
@char = groupDirectoryName[zero]; personDirectory = new(@char, "Ignore", 'U', 'U', 'U');
innerGroupDirectoryName = Path.GetFileName(innerGroupDirectory); collection = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, innerGroupDirectories);
if (@char == exclamationPoint) results.AddRange(collection);
personDirectory = new(@char, innerGroupDirectoryName, 'U', 'U', 'U'); }
else else
{
foreach (string innerGroupDirectory in innerGroupDirectories)
{ {
innerGroupDirectoryName = Path.GetFileName(innerGroupDirectory);
segments = innerGroupDirectoryName.Split('-'); segments = innerGroupDirectoryName.Split('-');
if (segments.Length != 3) if (segments.Length != 3)
continue; continue;
@ -269,10 +272,10 @@ internal abstract class PersonContainer
if (segments[2] is not "Yes" and not "No" and not "Unknown") if (segments[2] is not "Yes" and not "No" and not "Unknown")
continue; continue;
personDirectory = new(@char, innerGroupDirectoryName, segments[zero][zero], segments[1][zero], segments[2][zero]); personDirectory = new(@char, innerGroupDirectoryName, segments[zero][zero], segments[1][zero], segments[2][zero]);
personDisplayDirectories = Directory.GetDirectories(innerGroupDirectory, "*", SearchOption.TopDirectoryOnly);
collection = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, personDisplayDirectories);
results.AddRange(collection);
} }
personDisplayDirectories = Directory.GetDirectories(innerGroupDirectory, "*", SearchOption.TopDirectoryOnly);
collection = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, personDisplayDirectories);
results.AddRange(collection);
} }
return results; return results;
} }