diff --git a/Instance/DlibDotNet.cs b/Instance/DlibDotNet.cs index 66ebf62..a353217 100644 --- a/Instance/DlibDotNet.cs +++ b/Instance/DlibDotNet.cs @@ -130,7 +130,7 @@ public partial class DlibDotNet if (rootResultsDirectory is null) throw new Exception(); Storage storage = new(rootDirectory, rootResultsDirectory, peopleRootDirectory); - personContainers = Shared.Models.Stateless.Methods.IPersonContainer.GetPersonContainers(storage, configuration.PersonBirthdayFormat, configuration.JuliePhares, _Faces.FileNameExtension); + personContainers = Shared.Models.Stateless.Methods.IPersonContainer.GetPersonContainers(storage, configuration.PersonBirthdayFormat, _Faces.FileNameExtension); } if (!isSilent && configuration.TestDistanceResults) { @@ -944,7 +944,7 @@ public partial class DlibDotNet if (_Configuration.MappingSaveNotMapped) mapLogic.SaveNotMappedTicks(); if (_Configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions.Contains(outputResolution)) - mapLogic.SaveResizedImagesByPersonKeyFormatted(_Configuration.JuliePhares, mappingCollection, totalNotMapped); + mapLogic.SaveResizedImagesByPersonKeyFormatted(_Configuration.JLinks, a2PeopleSingletonDirectory, personContainers, mappingCollection, totalNotMapped); } private static Container? AreAllSameEndsWith(string argZero, Container[] containers) diff --git a/Instance/Models/Binder/Configuration.cs b/Instance/Models/Binder/Configuration.cs index 5042d9f..cf160c1 100644 --- a/Instance/Models/Binder/Configuration.cs +++ b/Instance/Models/Binder/Configuration.cs @@ -27,7 +27,7 @@ public class Configuration [Display(Name = "Force Resize Last Write Time to Creation Time"), Required] public bool? ForceResizeLastWriteTimeToCreationTime { get; set; } [Display(Name = "Ignore Extensions"), Required] public string[] IgnoreExtensions { get; set; } [Display(Name = "Ignore Relative Paths"), Required] public string[] IgnoreRelativePaths { get; set; } - [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JuliePhares { get; set; } + [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JLinks { get; set; } [Display(Name = "Load Or Create Then Save Distance Results"), Required] public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; } [Display(Name = "Load Or Create Then Save Image Faces Results"), Required] public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; } [Display(Name = "Load Or Create Then Save Index"), Required] public bool? LoadOrCreateThenSaveIndex { get; set; } @@ -235,7 +235,7 @@ public class Configuration configuration.ForceResizeLastWriteTimeToCreationTime.Value, configuration.IgnoreExtensions, configuration.IgnoreRelativePaths, - configuration.JuliePhares, + configuration.JLinks, configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions, configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions, configuration.LoadOrCreateThenSaveIndex.Value, diff --git a/Instance/Models/Configuration.cs b/Instance/Models/Configuration.cs index bfefe80..cf808cd 100644 --- a/Instance/Models/Configuration.cs +++ b/Instance/Models/Configuration.cs @@ -26,7 +26,7 @@ public class Configuration public bool ForceResizeLastWriteTimeToCreationTime { init; get; } public string[] IgnoreExtensions { init; get; } public string[] IgnoreRelativePaths { init; get; } - public string[] JuliePhares { init; get; } + public string[] JLinks { init; get; } public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { init; get; } public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { init; get; } public bool LoadOrCreateThenSaveIndex { init; get; } @@ -94,7 +94,7 @@ public class Configuration bool forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, - string[] juliePhares, + string[] jLinks, string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions, bool loadOrCreateThenSaveIndex, @@ -161,7 +161,7 @@ public class Configuration ForceResizeLastWriteTimeToCreationTime = forceResizeLastWriteTimeToCreationTime; IgnoreExtensions = ignoreExtensions; IgnoreRelativePaths = ignoreRelativePaths; - JuliePhares = juliePhares; + JLinks = jLinks; LoadOrCreateThenSaveDistanceResultsForOutputResolutions = loadOrCreateThenSaveDistanceResultsForOutputResolutions; LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = loadOrCreateThenSaveImageFacesResultsForOutputResolutions; LoadOrCreateThenSaveIndex = loadOrCreateThenSaveIndex; diff --git a/Instance/Models/_G2_Identify.cs b/Instance/Models/_G2_Identify.cs index 099fddf..e1413ae 100644 --- a/Instance/Models/_G2_Identify.cs +++ b/Instance/Models/_G2_Identify.cs @@ -93,9 +93,8 @@ public class G2_Identify : Shared.Models.Properties.IIdentify, IIdentify string rootResultsDirectory = Path.GetDirectoryName(Path.GetDirectoryName(peopleRootDirectory)); if (rootResultsDirectory is null) throw new Exception(); - string[] verifyPersonKeyFormattedCollection = Array.Empty(); Storage storage = new(rootDirectory, rootResultsDirectory, peopleRootDirectory); - PersonContainer[] personContainers = Shared.Models.Stateless.Methods.IPersonContainer.GetPersonContainers(storage, _Configuration.PersonBirthdayFormat, verifyPersonKeyFormattedCollection, facesFileNameExtension); + PersonContainer[] personContainers = Shared.Models.Stateless.Methods.IPersonContainer.GetPersonContainers(storage, _Configuration.PersonBirthdayFormat, facesFileNameExtension); string[] peopleBirthDates = (from l in personContainers select Shared.Models.Stateless.Methods.IPersonBirthday.GetFormatted(_Configuration.PersonBirthdayFormat, l.Person.Birthday)).ToArray(); Dictionary sourceKeyValuePairs = JsonSerializer.Deserialize>(json); foreach (KeyValuePair keyValuePair in sourceKeyValuePairs) diff --git a/Instance/appsettings.Development.json b/Instance/appsettings.Development.json index a0988d2..ac55b82 100644 --- a/Instance/appsettings.Development.json +++ b/Instance/appsettings.Development.json @@ -126,63 +126,8 @@ ".gif", ".GIF" ], - "JuliePhares": [ - "1500-01-16_00", - "1500-01-19_00", - "1500-01-20_00", - "1500-01-21_00", - "1500-01-25_00", - "1500-01-26_00", - "1500-01-27_00", - "1500-02-13_00", - "1500-02-17_00", - "1500-02-24_00", - "1500-02-25_00", - "1500-04-03_00", - "1500-04-06_00", - "1500-04-19_00", - "1500-05-03_00", - "1500-05-18_00", - "1500-05-28_00", - "1500-06-16_00", - "1500-06-26_00", - "1500-06-27_00", - "1500-07-07_00", - "1500-07-16_00", - "1720-09-30_05", - "1500-07-26_00", - "1500-08-03_00", - "1500-08-23_00", - "1500-08-24_00", - "1500-09-16_00", - "1500-09-21_00", - "1500-09-28_00", - "1500-10-14_00", - "1500-11-07_00", - "1500-11-09_00", - "1720-09-28_20", - "1501-01-08_00", - "1501-01-12_00", - "1501-01-13_00", - "1501-01-30_00", - "1501-03-09_00", - "1501-03-14_00", - "1501-03-22_00", - "1501-04-07_00", - "1501-04-10_00", - "1501-04-19_00", - "1501-05-06_00", - "1956-09-19_00", - "2012-09-17_00", - "1998-05-21_00", - "1960-03-01_00", - "1976-03-08_00", - "2007-09-07_00", - "2000-04-07_00", - "1980-01-17_00", - "1958-01-30_00", - "1976-01-05_00", - "1982-05-02_00" + "JLinks": [ + "Julie" ], "LoadOrCreateThenSaveDirectoryDistanceResultsForOutputResolutions": [ "7680 x 4320" @@ -201,8 +146,7 @@ "176 x 176", "256 x 256" ], - "SaveResizedImagesByPersonKeyFormattedForOutputResolutions": [ - ], + "SaveResizedImagesByPersonKeyFormattedForOutputResolutions": [], "ValidImageFormatExtensions": [ ".bmp", ".BMP", @@ -546,7 +490,7 @@ "Trip to Colorado 10 2002", "Trip to Colorado June 2002", "Tub 2002", - "Vericruz 2011", + "Vericruz 2011", "zzz =2005.1 Spring Tracy Pictures", "zzz =2005.2 Summer Tracy Pictures", "zzz =2005.3 Fall Tracy Pictures", diff --git a/Instance/appsettings.json b/Instance/appsettings.json index f82653e..7745a3a 100644 --- a/Instance/appsettings.json +++ b/Instance/appsettings.json @@ -124,63 +124,8 @@ ".gif", ".GIF" ], - "JuliePhares": [ - "1500-01-16_00", - "1500-01-19_00", - "1500-01-20_00", - "1500-01-21_00", - "1500-01-25_00", - "1500-01-26_00", - "1500-01-27_00", - "1500-02-13_00", - "1500-02-17_00", - "1500-02-24_00", - "1500-02-25_00", - "1500-04-03_00", - "1500-04-06_00", - "1500-04-19_00", - "1500-05-03_00", - "1500-05-18_00", - "1500-05-28_00", - "1500-06-16_00", - "1500-06-26_00", - "1500-06-27_00", - "1500-07-07_00", - "1500-07-16_00", - "1720-09-30_05", - "1500-07-26_00", - "1500-08-03_00", - "1500-08-23_00", - "1500-08-24_00", - "1500-09-16_00", - "1500-09-21_00", - "1500-09-28_00", - "1500-10-14_00", - "1500-11-07_00", - "1500-11-09_00", - "1720-09-28_20", - "1501-01-08_00", - "1501-01-12_00", - "1501-01-13_00", - "1501-01-30_00", - "1501-03-09_00", - "1501-03-14_00", - "1501-03-22_00", - "1501-04-07_00", - "1501-04-10_00", - "1501-04-19_00", - "1501-05-06_00", - "1956-09-19_00", - "2012-09-17_00", - "1998-05-21_00", - "1960-03-01_00", - "1976-03-08_00", - "2007-09-07_00", - "2000-04-07_00", - "1980-01-17_00", - "1958-01-30_00", - "1976-01-05_00", - "1982-05-02_00" + "JLinks": [ + "Julie" ], "LoadOrCreateThenSaveDistanceResultsForOutputResolutions": [ "1920 x 1080" diff --git a/Map/Models/MapLogic.cs b/Map/Models/MapLogic.cs index 50ddd12..8e811b7 100644 --- a/Map/Models/MapLogic.cs +++ b/Map/Models/MapLogic.cs @@ -704,17 +704,73 @@ public class MapLogic SaveContainers(totalNotMapped, updated, saveContainers); } - private (FileHolder, string, string, string, string)[] GetCollection(Mapping[] mappingCollection) + private List<(string, PersonContainer)> GetPersonContainers(string[] jLinks, string a2PeopleSingletonDirectory, PersonContainer[] personContainers) { if (_Configuration is null) throw new NullReferenceException(nameof(_Configuration)); - (FileHolder, string, string, string, string)[] results; + List<(string, PersonContainer)> results = new(); + string[] files; + long personKey; + const int zero = 0; + string[] directories; + string checkDirectory; + string personKeyFormatted; + string displayDirectoryName; + PersonContainer[] collection; + PersonBirthday? personBirthday; + WindowsShortcut windowsShortcut; + foreach (string directoryName in jLinks) + { + checkDirectory = Path.Combine(a2PeopleSingletonDirectory, directoryName); + if (!Directory.Exists(checkDirectory)) + continue; + files = Directory.GetFiles(checkDirectory, "*.lnk", SearchOption.TopDirectoryOnly); + foreach (string file in files) + { + windowsShortcut = WindowsShortcut.Load(file); + if (windowsShortcut.Path is null || !Directory.Exists(windowsShortcut.Path)) + continue; + directories = Directory.GetDirectories(windowsShortcut.Path, "*", SearchOption.TopDirectoryOnly); + foreach (string directory in directories) + { + personKeyFormatted = Path.GetFileName(directory); + personBirthday = IPersonBirthday.GetPersonBirthday(_Configuration.PersonBirthdayFormat, personKeyFormatted); + if (personBirthday is null) + continue; + personKey = personBirthday.Value.Ticks; + collection = (from l in personContainers where l.Key == personKey && l.ApproximateYears.HasValue select l).ToArray(); + if (!collection.Any()) + continue; + displayDirectoryName = Path.Combine(checkDirectory, personKeyFormatted, Path.GetFileNameWithoutExtension(file)); + if (!Directory.Exists(displayDirectoryName)) + _ = Directory.CreateDirectory(displayDirectoryName); + results.Add(new(personKeyFormatted, collection[zero])); + } + } + } + return results; + } + + private string[] GetPersonKeyFormattedCollection(string[] jLinks, string a2PeopleSingletonDirectory, PersonContainer[] personContainers) + { + string[] results; + List<(string PersonKeyFormatted, PersonContainer PersonContainer)> collection = GetPersonContainers(jLinks, a2PeopleSingletonDirectory, personContainers); + results = (from l in collection orderby l.PersonKeyFormatted select l.PersonKeyFormatted).ToArray(); + return results; + } + + private (int, FileHolder, int, string, string, string, string)[] GetCollection(string[] jLinks, string a2PeopleSingletonDirectory, PersonContainer[] personContainers, Mapping[] mappingCollection) + { + if (_Configuration is null) + throw new NullReferenceException(nameof(_Configuration)); + (int, FileHolder, int, string, string, string, string)[] results; string checkFile; string directory; string? directoryName; string personDirectory; string personKeyFormatted; - List<(FileHolder ResizedFileHolder, string PersonKeyFormatted, string CheckFile, string Directory, string PersonDirectory)> collection = new(); + string[] personKeyFormattedCollection = GetPersonKeyFormattedCollection(jLinks, a2PeopleSingletonDirectory, personContainers); + List<(int Id, FileHolder ResizedFileHolder, int ApproximateYears, string PersonKeyFormatted, string CheckFile, string Directory, string PersonDirectory)> collection = new(); foreach (Mapping mapping in mappingCollection) { directoryName = Path.GetDirectoryName(mapping.MappingFromItem.RelativePath); @@ -722,35 +778,39 @@ public class MapLogic throw new NotSupportedException(); if (mapping.By is null or IMapLogic.Sorting) continue; - if (mapping.MappingFromPerson is null) + if (mapping.MappingFromPerson?.ApproximateYears is null) continue; if (string.IsNullOrEmpty(mapping.MappingFromPerson.SegmentB)) throw new NotSupportedException(); if (string.IsNullOrEmpty(mapping.MappingFromPerson.DisplayDirectoryName)) throw new NotSupportedException(); personKeyFormatted = IPersonBirthday.GetFormatted(_Configuration.PersonBirthdayFormat, mapping.MappingFromPerson.PersonBirthday); + if (personKeyFormatted == "1501-04-10_00") + continue; + if (!personKeyFormattedCollection.Contains(personKeyFormatted)) + continue; directory = Path.Combine(_EDistanceContentTicksDirectory, "Images", personKeyFormatted); personDirectory = Path.Combine(directory, mapping.MappingFromPerson.DisplayDirectoryName); checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}"); - collection.Add(new(mapping.MappingFromItem.ResizedFileHolder, personKeyFormatted, checkFile, directory, personDirectory)); + collection.Add(new(mapping.MappingFromItem.Id, mapping.MappingFromItem.ResizedFileHolder, mapping.MappingFromPerson.ApproximateYears.Value, personKeyFormatted, directory, personDirectory, checkFile)); } - results = (from l in collection orderby l.PersonKeyFormatted descending select l).ToArray(); + results = (from l in collection orderby l.ApproximateYears descending, l.PersonKeyFormatted descending select l).ToArray(); return results; } - public void SaveResizedImagesByPersonKeyFormatted(string[] juliePhares, Mapping[] mappingCollection, int totalNotMapped) + public void SaveResizedImagesByPersonKeyFormatted(string[] jLinks, string a2PeopleSingletonDirectory, PersonContainer[] personContainers, Mapping[] mappingCollection, int totalNotMapped) { if (_Configuration is null) throw new NullReferenceException(nameof(_Configuration)); - List saveContainers = new(); SaveContainer? saveContainer; - (FileHolder, string, string, string, string)[] collection = GetCollection(mappingCollection); - foreach ((FileHolder resizedFileHolder, string personKeyFormatted, string checkFile, string directory, string personDirectory) in collection) + List distinctCollection = new(); + List saveContainers = new(); + (int, FileHolder, int, string, string, string, string)[] collection = GetCollection(jLinks, a2PeopleSingletonDirectory, personContainers, mappingCollection); + foreach ((int id, FileHolder resizedFileHolder, int approximateYears, string personKeyFormatted, string directory, string personDirectory, string checkFile) in collection) { - if (personKeyFormatted == "1501-04-10_00") - continue; - if (!juliePhares.Contains(personKeyFormatted)) + if (distinctCollection.Contains(id)) continue; + distinctCollection.Add(id); saveContainer = new(personDirectory); saveContainers.Add(saveContainer); saveContainer = new(resizedFileHolder, checkFile, directory); diff --git a/Shared/Models/Stateless/Methods/IPersonContainer.cs b/Shared/Models/Stateless/Methods/IPersonContainer.cs index c71ceae..9c39bdd 100644 --- a/Shared/Models/Stateless/Methods/IPersonContainer.cs +++ b/Shared/Models/Stateless/Methods/IPersonContainer.cs @@ -5,10 +5,10 @@ public interface IPersonContainer // ... - Models.PersonContainer[] TestStatic_GetPersonContainers(Properties.IStorage storage, string personBirthdayFormat, string[] verifyPersonKeyFormattedCollection, string facesFileNameExtension) => - GetPersonContainers(storage, personBirthdayFormat, verifyPersonKeyFormattedCollection, facesFileNameExtension); - static Models.PersonContainer[] GetPersonContainers(Properties.IStorage storage, string personBirthdayFormat, string[] verifyPersonKeyFormattedCollection, string facesFileNameExtension) => - PersonContainer.GetPersonContainers(storage, personBirthdayFormat, verifyPersonKeyFormattedCollection, facesFileNameExtension); + Models.PersonContainer[] TestStatic_GetPersonContainers(Properties.IStorage storage, string personBirthdayFormat, string facesFileNameExtension) => + GetPersonContainers(storage, personBirthdayFormat, facesFileNameExtension); + static Models.PersonContainer[] GetPersonContainers(Properties.IStorage storage, string personBirthdayFormat, string facesFileNameExtension) => + PersonContainer.GetPersonContainers(storage, personBirthdayFormat, facesFileNameExtension); List<(long?, string)> TestStatic_GetDisplay(string personBirthdayFormat, Models.PersonContainer personContainer) => GetDisplay(personBirthdayFormat, personContainer); diff --git a/Shared/Models/Stateless/Methods/PersonContainer.cs b/Shared/Models/Stateless/Methods/PersonContainer.cs index 7134040..8cb8e3a 100644 --- a/Shared/Models/Stateless/Methods/PersonContainer.cs +++ b/Shared/Models/Stateless/Methods/PersonContainer.cs @@ -155,28 +155,7 @@ internal abstract class PersonContainer return results; } - private static void Verify(string personBirthdayFormat, string[] verifyPersonKeyFormattedCollection, Models.PersonContainer[] results) - { - const int zero = 0; - string personKeyFormatted; - List collection = new(); - Models.PersonBirthday personBirthday; - foreach (Models.PersonContainer personContainer in results) - { - if (personContainer.Key is null || personContainer.Birthdays is null || !personContainer.Birthdays.Any()) - continue; - personBirthday = personContainer.Birthdays[zero]; - personKeyFormatted = IPersonBirthday.GetFormatted(personBirthdayFormat, personBirthday); - if (!verifyPersonKeyFormattedCollection.Contains(personKeyFormatted)) - continue; - if (personContainer.DisplayDirectoryAllFiles.Any(l => !l.Contains('^'))) - collection.Add(personContainer.DisplayDirectoryName); - } - if (collection.Any()) - throw new NotSupportedException($"A person in the verify collection has a approximate birthday!{Environment.NewLine}{string.Join(Environment.NewLine, collection.ToArray())}"); - } - - internal static Models.PersonContainer[] GetPersonContainers(Properties.IStorage storage, string personBirthdayFormat, string[] verifyPersonKeyFormattedCollection, string facesFileNameExtension) + internal static Models.PersonContainer[] GetPersonContainers(Properties.IStorage storage, string personBirthdayFormat, string facesFileNameExtension) { Models.PersonContainer[] results; char[] chars = IAge.GetChars(); @@ -195,7 +174,6 @@ internal abstract class PersonContainer results = Array.Empty(); else results = GetPersonContainersGroups(personBirthdayFormat, facesFileNameExtension, chars, groupDirectories); - Verify(personBirthdayFormat, verifyPersonKeyFormattedCollection, results); return results; } diff --git a/Tests/Models/Binder/Configuration.cs b/Tests/Models/Binder/Configuration.cs index 4530927..9ef53e8 100644 --- a/Tests/Models/Binder/Configuration.cs +++ b/Tests/Models/Binder/Configuration.cs @@ -19,7 +19,7 @@ public class Configuration [Display(Name = "Force Resize Last Write Time to Creation Time"), Required] public bool? ForceResizeLastWriteTimeToCreationTime { get; set; } [Display(Name = "Ignore Extensions"), Required] public string[] IgnoreExtensions { get; set; } [Display(Name = "Ignore Relative Paths"), Required] public string[] IgnoreRelativePaths { get; set; } - [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JuliePhares { get; set; } + [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JLinks { get; set; } [Display(Name = "Load Or Create Then Save Distance Results"), Required] public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; } [Display(Name = "Load Or Create Then Save Image Faces Results"), Required] public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; } [Display(Name = "Load Or Create Then Save Index"), Required] public bool? LoadOrCreateThenSaveIndex { get; set; } @@ -149,7 +149,7 @@ public class Configuration configuration.ForceResizeLastWriteTimeToCreationTime.Value, configuration.IgnoreExtensions, configuration.IgnoreRelativePaths, - configuration.JuliePhares, + configuration.JLinks, configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions, configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions, configuration.LoadOrCreateThenSaveIndex.Value, diff --git a/Tests/Models/Configuration.cs b/Tests/Models/Configuration.cs index ec0bed4..1030465 100644 --- a/Tests/Models/Configuration.cs +++ b/Tests/Models/Configuration.cs @@ -18,7 +18,7 @@ public class Configuration public bool ForceResizeLastWriteTimeToCreationTime { init; get; } public string[] IgnoreExtensions { init; get; } public string[] IgnoreRelativePaths { init; get; } - public string[] JuliePhares { init; get; } + public string[] JLinks { init; get; } public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { init; get; } public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { init; get; } public bool LoadOrCreateThenSaveIndex { init; get; } @@ -63,7 +63,7 @@ public class Configuration bool forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, - string[] juliePhares, + string[] jLinks, string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions, bool loadOrCreateThenSaveIndex, @@ -107,7 +107,7 @@ public class Configuration ForceResizeLastWriteTimeToCreationTime = forceResizeLastWriteTimeToCreationTime; IgnoreExtensions = ignoreExtensions; IgnoreRelativePaths = ignoreRelativePaths; - JuliePhares = juliePhares; + JLinks = jLinks; LoadOrCreateThenSaveDistanceResultsForOutputResolutions = loadOrCreateThenSaveDistanceResultsForOutputResolutions; LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = loadOrCreateThenSaveImageFacesResultsForOutputResolutions; LoadOrCreateThenSaveIndex = loadOrCreateThenSaveIndex; diff --git a/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs b/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs index 899756d..d07b79f 100644 --- a/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs +++ b/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs @@ -27,7 +27,7 @@ public class Configuration [Display(Name = "Force Resize Last Write Time to Creation Time"), Required] public bool? ForceResizeLastWriteTimeToCreationTime { get; set; } [Display(Name = "Ignore Extensions"), Required] public string[] IgnoreExtensions { get; set; } [Display(Name = "Ignore Relative Paths"), Required] public string[] IgnoreRelativePaths { get; set; } - [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JuliePhares { get; set; } + [Display(Name = "Julie Phares Copy Birthdays"), Required] public string[] JLinks { get; set; } [Display(Name = "Load Or Create Then Save Distance Results"), Required] public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; } [Display(Name = "Load Or Create Then Save Image Faces Results"), Required] public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; } [Display(Name = "Load Or Create Then Save Index"), Required] public bool? LoadOrCreateThenSaveIndex { get; set; } @@ -235,7 +235,7 @@ public class Configuration configuration.ForceResizeLastWriteTimeToCreationTime.Value, configuration.IgnoreExtensions, configuration.IgnoreRelativePaths, - configuration.JuliePhares, + configuration.JLinks, configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions, configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions, configuration.LoadOrCreateThenSaveIndex.Value, diff --git a/TestsWithFaceRecognitionDotNet/Models/Configuration.cs b/TestsWithFaceRecognitionDotNet/Models/Configuration.cs index 8649b04..a515e17 100644 --- a/TestsWithFaceRecognitionDotNet/Models/Configuration.cs +++ b/TestsWithFaceRecognitionDotNet/Models/Configuration.cs @@ -26,7 +26,7 @@ public class Configuration public bool ForceResizeLastWriteTimeToCreationTime { init; get; } public string[] IgnoreExtensions { init; get; } public string[] IgnoreRelativePaths { init; get; } - public string[] JuliePhares { init; get; } + public string[] JLinks { init; get; } public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { init; get; } public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { init; get; } public bool LoadOrCreateThenSaveIndex { init; get; } @@ -94,7 +94,7 @@ public class Configuration bool forceResizeLastWriteTimeToCreationTime, string[] ignoreExtensions, string[] ignoreRelativePaths, - string[] juliePhares, + string[] jLinks, string[] loadOrCreateThenSaveDistanceResultsForOutputResolutions, string[] loadOrCreateThenSaveImageFacesResultsForOutputResolutions, bool loadOrCreateThenSaveIndex, @@ -161,7 +161,7 @@ public class Configuration ForceResizeLastWriteTimeToCreationTime = forceResizeLastWriteTimeToCreationTime; IgnoreExtensions = ignoreExtensions; IgnoreRelativePaths = ignoreRelativePaths; - JuliePhares = juliePhares; + JLinks = jLinks; LoadOrCreateThenSaveDistanceResultsForOutputResolutions = loadOrCreateThenSaveDistanceResultsForOutputResolutions; LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = loadOrCreateThenSaveImageFacesResultsForOutputResolutions; LoadOrCreateThenSaveIndex = loadOrCreateThenSaveIndex;