phares3757/view-by-distance-mklink-console
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save Shortcuts Rev C

Browse Source
This commit is contained in:
Mike Phares
2022-10-09 17:36:23 -07:00
parent b0b4c20597
commit 022f89106a
8 changed files with 91 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Shared/Models/Stateless/Methods/PersonBirthday.cs
View File

@ -107,9 +107,9 @@ internal abstract class PersonBirthday
return result;
}
internal static List<Models.PersonBirthday> GetPersonBirthdays(string personBirthdayFormat, string[] personKeyDirectories, string personDisplayDirectory, string personDisplayDirectoryName)
internal static List<(string, Models.PersonBirthday)> GetPersonBirthdays(string personBirthdayFormat, string[] personKeyDirectories, string personDisplayDirectory, string personDisplayDirectoryName)
{
List<Models.PersonBirthday> results = new();
List<(string, Models.PersonBirthday)> results = new();
string[] files;
string personKeyFormatted;
Models.PersonBirthday? personBirthday;
@ -120,11 +120,11 @@ internal abstract class PersonBirthday
personBirthday = IPersonBirthday.GetPersonBirthday(personBirthdayFormat, personKeyFormatted);
else
(personBirthday, personKeyFormatted) = Person.Get(personBirthdayFormat, personDisplayDirectory, personKeyDirectory, birthday);
if (personBirthday is null || personKeyFormatted.Contains('#'))
if (personBirthday is null)
continue;
if (!IPersonBirthday.IsCounterPersonBirthday(personBirthday) && ((!personKeyDirectory.Contains('#') && (personDisplayDirectoryName.Contains('~') || personDisplayDirectoryName.Contains('#'))) || (personKeyDirectory.Contains('#') && !personDisplayDirectoryName.Contains('#'))))
throw new NotSupportedException();
results.Add(personBirthday);
results.Add(new(personKeyFormatted, personBirthday));
files = Directory.GetFiles(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
if (files.Any())
continue;