Get all before throwing
This commit is contained in:
parent
f35e86d832
commit
9c4767d454
@ -189,7 +189,7 @@ internal abstract class PersonContainer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Models.PersonContainer> GetPersonContainersGroup(string mappingDefaultName, string personBirthdayFormat, string facesFileNameExtension, char[] personCharacters, Dictionary<string, List<string>> individuals, PersonDirectory personDirectory, string[] personDisplayDirectories)
|
private static (List<string?>, List<Models.PersonContainer>) GetPersonContainersGroup(string mappingDefaultName, string personBirthdayFormat, string facesFileNameExtension, char[] personCharacters, Dictionary<string, List<string>> individuals, PersonDirectory personDirectory, string[] personDisplayDirectories)
|
||||||
{
|
{
|
||||||
List<Models.PersonContainer> results = new();
|
List<Models.PersonContainer> results = new();
|
||||||
string? minusOne;
|
string? minusOne;
|
||||||
@ -234,18 +234,18 @@ internal abstract class PersonContainer
|
|||||||
results.Add(personContainer);
|
results.Add(personContainer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (changes.Any(l => l is not null))
|
return new(changes, results);
|
||||||
throw new NotImplementedException($"A directory was changed restart to look for more! {string.Join(Environment.NewLine, (from l in changes where l is not null select l).ToArray())}");
|
|
||||||
return results;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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<string?>, 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();
|
||||||
string[] segments;
|
string[] segments;
|
||||||
const int zero = 0;
|
const int zero = 0;
|
||||||
|
List<string?> changes;
|
||||||
string innerGroupDirectoryName;
|
string innerGroupDirectoryName;
|
||||||
PersonDirectory personDirectory;
|
PersonDirectory personDirectory;
|
||||||
|
List<string?> allChanges = new();
|
||||||
string[] personDisplayDirectories;
|
string[] personDisplayDirectories;
|
||||||
const char exclamationPoint = '!';
|
const char exclamationPoint = '!';
|
||||||
char @char = groupDirectoryName[zero];
|
char @char = groupDirectoryName[zero];
|
||||||
@ -254,7 +254,8 @@ internal abstract class PersonContainer
|
|||||||
if (@char == exclamationPoint)
|
if (@char == exclamationPoint)
|
||||||
{
|
{
|
||||||
personDirectory = new(@char, "Ignore", 'U', 'U', 'U');
|
personDirectory = new(@char, "Ignore", 'U', 'U', 'U');
|
||||||
collection = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, innerGroupDirectories);
|
(changes, collection) = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, innerGroupDirectories);
|
||||||
|
allChanges.AddRange(changes);
|
||||||
results.AddRange(collection);
|
results.AddRange(collection);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -275,18 +276,21 @@ internal abstract class PersonContainer
|
|||||||
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);
|
personDisplayDirectories = Directory.GetDirectories(innerGroupDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||||
collection = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, personDisplayDirectories);
|
(changes, collection) = GetPersonContainersGroup(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, personDirectory, personDisplayDirectories);
|
||||||
|
allChanges.AddRange(changes);
|
||||||
results.AddRange(collection);
|
results.AddRange(collection);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return results;
|
return new(allChanges, results);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Models.PersonContainer> GetPersonContainersGroups(string mappingDefaultName, string personBirthdayFormat, string facesFileNameExtension, char[] personCharacters, Dictionary<string, List<string>> individuals, string[] groupDirectories)
|
private static List<Models.PersonContainer> GetPersonContainersGroups(string mappingDefaultName, string personBirthdayFormat, string facesFileNameExtension, char[] personCharacters, Dictionary<string, List<string>> individuals, string[] groupDirectories)
|
||||||
{
|
{
|
||||||
List<Models.PersonContainer> results;
|
List<Models.PersonContainer> results;
|
||||||
const int zero = 0;
|
const int zero = 0;
|
||||||
|
List<string?> changes;
|
||||||
string groupDirectoryName;
|
string groupDirectoryName;
|
||||||
|
List<string?> allChanges = new();
|
||||||
List<Models.PersonContainer> collection;
|
List<Models.PersonContainer> collection;
|
||||||
List<Models.PersonContainer> personContainers = new();
|
List<Models.PersonContainer> personContainers = new();
|
||||||
foreach (string groupDirectory in groupDirectories)
|
foreach (string groupDirectory in groupDirectories)
|
||||||
@ -294,9 +298,12 @@ internal abstract class PersonContainer
|
|||||||
groupDirectoryName = Path.GetFileName(groupDirectory);
|
groupDirectoryName = Path.GetFileName(groupDirectory);
|
||||||
if (!personCharacters.Contains(groupDirectoryName[zero]))
|
if (!personCharacters.Contains(groupDirectoryName[zero]))
|
||||||
continue;
|
continue;
|
||||||
collection = GetPersonContainersInnerGroups(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, groupDirectory, groupDirectoryName);
|
(changes, collection) = GetPersonContainersInnerGroups(mappingDefaultName, personBirthdayFormat, facesFileNameExtension, personCharacters, individuals, groupDirectory, groupDirectoryName);
|
||||||
|
allChanges.AddRange(changes);
|
||||||
personContainers.AddRange(collection);
|
personContainers.AddRange(collection);
|
||||||
}
|
}
|
||||||
|
if (allChanges.Any(l => l is not null))
|
||||||
|
throw new NotImplementedException($"A directory was changed restart to look for more! {string.Join(Environment.NewLine, (from l in allChanges where l is not null select l).ToArray())}");
|
||||||
results = (from l in personContainers orderby l.Key is not null, l.Key select l).ToList();
|
results = (from l in personContainers orderby l.Key is not null, l.Key select l).ToList();
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user