NonSpecificPeopleCollection now checks every hour
No longer using default if not any _NotMappedPersonContainers
This commit is contained in:
@ -339,17 +339,14 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
|
||||
return result;
|
||||
}
|
||||
|
||||
private string GetDirectory(bool saveIndividually, int padLeft, string? segmentC, string by, MappingFromItem mappingFromItem, SortingContainer sortingContainer)
|
||||
private string? GetDirectory(Configuration configuration, bool saveIndividually, int padLeft, string? segmentC, string by, MappingFromItem mappingFromItem)
|
||||
{
|
||||
if (_Configuration is null)
|
||||
throw new NullReferenceException(nameof(_Configuration));
|
||||
string result;
|
||||
string? result = null;
|
||||
const int zero = 0;
|
||||
string mappingSegmentB;
|
||||
string personKeyFormatted;
|
||||
PersonBirthday personBirthday;
|
||||
PersonContainer personContainer;
|
||||
result = Path.Combine(_EDistanceContentTicksDirectory, by, sortingContainer.Sorting.Id.ToString(), sortingContainer.Sorting.WholePercentages.ToString());
|
||||
for (int i = _NotMappedPersonContainers.Count - 1; i > 0; i--)
|
||||
{
|
||||
personContainer = _NotMappedPersonContainers[i];
|
||||
@ -357,7 +354,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
|
||||
continue;
|
||||
personBirthday = personContainer.Birthdays[zero];
|
||||
mappingSegmentB = Stateless.MapLogic.GetMappingSegmentB(_Ticks, personBirthday, personContainer.ApproximateYears, mappingFromItem);
|
||||
personKeyFormatted = IPersonBirthday.GetFormatted(_Configuration.PersonBirthdayFormat, personBirthday);
|
||||
personKeyFormatted = IPersonBirthday.GetFormatted(configuration.PersonBirthdayFormat, personBirthday);
|
||||
if (!saveIndividually || segmentC is null)
|
||||
result = Path.Combine(_EDistanceContentTicksDirectory, by, personKeyFormatted, mappingSegmentB);
|
||||
else
|
||||
@ -380,7 +377,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
|
||||
bool isByMapping;
|
||||
bool isBySorting;
|
||||
string checkFile;
|
||||
string directory;
|
||||
string? directory;
|
||||
string shortcutFile;
|
||||
Mapping? keyMapping;
|
||||
string facesDirectory;
|
||||
@ -426,7 +423,9 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
|
||||
if (distinct.Contains(mapping.SortingContainer.Sorting.Id))
|
||||
continue;
|
||||
ticks = DateTime.Now.Ticks;
|
||||
directory = GetDirectory(saveIndividually, padLeft, mapping.SegmentC, by, mapping.MappingFromItem, mapping.SortingContainer);
|
||||
directory = GetDirectory(_Configuration, saveIndividually, padLeft, mapping.SegmentC, by, mapping.MappingFromItem);
|
||||
if (string.IsNullOrEmpty(directory))
|
||||
continue;
|
||||
personDirectory = Path.Combine(directory, $"Z]{ticks}");
|
||||
if (saveIndividually)
|
||||
{
|
||||
|
Reference in New Issue
Block a user