editorconfig
This commit is contained in:
2023-10-20 19:37:19 -07:00
parent b54ea97c67
commit a4a92aacd2
68 changed files with 703 additions and 553 deletions

View File

@ -30,7 +30,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
string fileName;
string checkFile;
string sourceFile;
List<string> distinct = new();
List<string> distinct = [];
WindowsShortcut windowsShortcut;
string[] directories = (from l in saveContainers select l.Directory).Distinct().ToArray();
int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - _Ticks).TotalSeconds);
@ -139,7 +139,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
private List<SaveShortcutsForOutputResolutions> GetCollectionForSaveShortcutsForOutputResolutionsPreMapLogic(string eDistanceContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> mappingCollection)
{
List<SaveShortcutsForOutputResolutions> results = new();
List<SaveShortcutsForOutputResolutions> results = [];
if (_Configuration is null)
throw new NullReferenceException(nameof(_Configuration));
int season;
@ -193,7 +193,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
private void LookForAbandoned(Property.Models.Configuration propertyConfiguration, List<int> distinctFilteredIds)
{
List<string> renameCollection = new();
List<string> renameCollection = [];
foreach (KeyValuePair<int, List<LocationContainer<MetadataExtractor.Directory>>> keyValuePair in _IdToLocationContainers)
{
if (distinctFilteredIds.Contains(keyValuePair.Key))
@ -226,10 +226,10 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
_Configuration = configuration;
_PropertyConfiguration = propertyConfiguration;
ReadOnlyDictionary<long, int> readOnlyPersonKeyToCount;
List<PersonContainer> notMappedPersonContainers = new();
Dictionary<int, List<(string, int)>> skipCollection = new();
Dictionary<int, List<(string, int)>> skipNotSkipCollection = new();
List<LocationContainer<MetadataExtractor.Directory>> locationContainers = new();
List<PersonContainer> notMappedPersonContainers = [];
Dictionary<int, List<(string, int)>> skipCollection = [];
Dictionary<int, List<(string, int)>> skipNotSkipCollection = [];
List<LocationContainer<MetadataExtractor.Directory>> locationContainers = [];
string? rootDirectoryParent = Path.GetDirectoryName(propertyConfiguration.RootDirectory);
string eDistanceContentTicksDirectory = Path.Combine(eDistanceContentDirectory, ticks.ToString());
ReadOnlyDictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> idThenWholePercentagesToPersonContainers;
@ -253,8 +253,8 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
throw new Exception("Confirm Manual files and then restart!");
Stateless.MapLogic.SetSkipCollections(configuration, personContainers, a2PeopleSingletonDirectory, skipCollection, skipNotSkipCollection);
{
List<string> personKeyFormattedCollection = new();
Dictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted = new();
List<string> personKeyFormattedCollection = [];
Dictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted = [];
Stateless.MapLogic.SetPersonCollections(configuration, personContainers, personKeyFormattedToNewestPersonKeyFormatted, personKeyFormattedCollection);
readOnlyPersonKeyFormattedCollection = new(personKeyFormattedCollection);
readOnlyPersonKeyFormattedToNewestPersonKeyFormatted = new(personKeyFormattedToNewestPersonKeyFormatted);
@ -264,11 +264,11 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
ReadOnlyCollection<Stateless.MapLogic.PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection = Stateless.MapLogic.GetPersonKeyFormattedIdThenWholePercentages(configuration, ticks, records);
//
{
Dictionary<long, int> personKeyToCount = new();
Dictionary<long, PersonContainer> personKeyToPersonContainer = new();
Dictionary<string, PersonContainer> personKeyFormattedToPersonContainer = new();
Dictionary<long, List<PersonContainer>> personKeyToPersonContainerCollection = new();
List<(Stateless.MapLogic.PersonKeyFormattedIdThenWholePercentages, PersonContainer)> possiblyNewPersonDisplayDirectoryNamesAndPersonContainer = new();
Dictionary<long, int> personKeyToCount = [];
Dictionary<long, PersonContainer> personKeyToPersonContainer = [];
Dictionary<string, PersonContainer> personKeyFormattedToPersonContainer = [];
Dictionary<long, List<PersonContainer>> personKeyToPersonContainerCollection = [];
List<(Stateless.MapLogic.PersonKeyFormattedIdThenWholePercentages, PersonContainer)> possiblyNewPersonDisplayDirectoryNamesAndPersonContainer = [];
Stateless.MapLogic.SetKeyValuePairsAndAddToCollections(configuration,
personContainers,
personKeyToPersonContainer,
@ -335,26 +335,26 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
{
LocationContainer<MetadataExtractor.Directory>[] results;
if (item.Property?.Id is null)
results = Array.Empty<LocationContainer<MetadataExtractor.Directory>>();
results = [];
else
{
List<LocationContainer<MetadataExtractor.Directory>>? locationContainers;
if (_IdToLocationContainers.TryGetValue(item.Property.Id.Value, out locationContainers))
results = locationContainers.ToArray();
else
results = Array.Empty<LocationContainer<MetadataExtractor.Directory>>();
results = [];
}
return new(results);
}
public ReadOnlyDictionary<long, List<int>> GetPersonKeyToIds()
{
Dictionary<long, List<int>> results = new();
Dictionary<long, List<int>> results = [];
long personKey;
const int zero = 0;
List<int>? collection;
PersonBirthday personBirthday;
List<string> shouldMove = new();
List<string> shouldMove = [];
foreach (KeyValuePair<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> idToCollection in _IdThenWholePercentagesToPersonContainers)
{
foreach (KeyValuePair<int, ReadOnlyCollection<PersonContainer>> wholePercentagesToPersonContainers in idToCollection.Value)
@ -369,7 +369,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
personKey = personBirthday.Value.Ticks;
if (!results.TryGetValue(personKey, out collection))
{
results.Add(personKey, new());
results.Add(personKey, []);
if (!results.TryGetValue(personKey, out collection))
throw new Exception();
}
@ -532,7 +532,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
{
if (_Configuration is null)
throw new NullReferenceException(nameof(_Configuration));
List<SaveContainer> results = new();
List<SaveContainer> results = [];
string by;
Record record;
List<int>? ids;
@ -665,7 +665,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
{
if (_Configuration is null)
throw new NullReferenceException(nameof(_Configuration));
List<Sorting> results = new();
List<Sorting> results = [];
Sorting sorting;
FaceDistance faceDistanceLength;
for (int j = 0; j < faceDistanceLengths.Count; j++)
@ -729,7 +729,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
string? segmentC;
string personKeyFormatted;
MappingFromPerson mappingFromPerson;
Dictionary<string, int> keyToCount = new();
Dictionary<string, int> keyToCount = [];
foreach (SortingContainer sortingContainer in sortingContainers)
{
if (sortingContainer.Question is null)
@ -770,7 +770,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
string counts = distanceLimits.GetCounts();
_ = Directory.CreateDirectory(Path.Combine(_EDistanceContentTicksDirectory, counts));
}
List<SaveContainer> results = new();
List<SaveContainer> results = [];
string by;
Record record;
bool isBySorting;
@ -866,16 +866,16 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
string counts = distanceLimits.GetCounts();
_ = Directory.CreateDirectory(Path.Combine(_EDistanceContentTicksDirectory, counts));
}
List<SortingContainer> results = new();
List<SortingContainer> results = [];
Sorting sorting;
Mapping? keyMapping;
List<int>? wholePercentagesCollection;
MappingFromFilterPre mappingFromFilterPre;
Dictionary<string, int> keyToCount = new();
Dictionary<string, int> keyToCount = [];
MappingFromFilterPost mappingFromFilterPost;
ReadOnlyCollection<PersonContainer>? personContainers;
ReadOnlyDictionary<int, Mapping>? wholePercentagesToMapping;
Dictionary<int, List<int>> idToWholePercentagesCollection = new();
Dictionary<int, List<int>> idToWholePercentagesCollection = [];
int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - _Ticks).TotalSeconds);
ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers;
string message = $") {sortingContainers.Count:000} Filter Sorting Container(s) - {totalSeconds} total second(s)";
@ -915,7 +915,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
continue;
if (!idToWholePercentagesCollection.TryGetValue(sorting.Id, out wholePercentagesCollection))
{
idToWholePercentagesCollection.Add(sorting.Id, new());
idToWholePercentagesCollection.Add(sorting.Id, []);
if (!idToWholePercentagesCollection.TryGetValue(sorting.Id, out wholePercentagesCollection))
throw new Exception();
}
@ -986,7 +986,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
{
if (_Configuration is null)
throw new NullReferenceException(nameof(_Configuration));
List<string> results = new();
List<string> results = [];
string[] files;
string checkDirectory;
string[] checkDirectories;
@ -995,7 +995,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
PersonBirthday? personBirthday;
string fileNameWithoutExtension;
WindowsShortcut windowsShortcut;
List<(long, string)> collection = new();
List<(long, string)> collection = [];
foreach (string directoryName in jLinks)
{
checkDirectory = Path.Combine(a2PeopleContentDirectory, directoryName);
@ -1052,10 +1052,10 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
string? directoryName;
string personDirectory;
string personKeyFormatted;
List<int> distinctCollection = new();
List<int> distinctCollection = [];
bool usePersonKeyAndDeterministicHashCodeKey = false;
List<string> personKeyFormattedCollection = GetPersonKeyFormattedCollection(jLinks, a2PeopleContentDirectory, personContainers, personKeyToIds);
List<(int Id, FileHolder ImageFileHolder, int ApproximateYears, string PersonKeyFormatted, string CheckFile, string Directory, string PersonDirectory)> collection = new();
List<(int Id, FileHolder ImageFileHolder, int ApproximateYears, string PersonKeyFormatted, string CheckFile, string Directory, string PersonDirectory)> collection = [];
foreach (Mapping mapping in mappingCollection)
{
if (distinctCollection.Contains(mapping.MappingFromItem.Id))
@ -1106,7 +1106,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
if (_Configuration is null)
throw new NullReferenceException(nameof(_Configuration));
SaveContainer? saveContainer;
List<SaveContainer> saveContainers = new();
List<SaveContainer> saveContainers = [];
(int, FileHolder, int, string, string, string, string)[] collection = GetCollectionForSaveFilteredOriginalImagesFromJLinks(jLinks, a2PeopleContentDirectory, personContainers, mappingCollection, personKeyToIds);
foreach ((int id, FileHolder imageFileHolder, int approximateYears, string personKeyFormatted, string directory, string personDirectory, string checkFile) in collection)
{
@ -1122,7 +1122,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
{
string hiddenFile;
WindowsShortcut windowsShortcut;
List<SaveShortcutsForOutputResolutions> collection = new();
List<SaveShortcutsForOutputResolutions> collection = [];
collection = GetCollectionForSaveShortcutsForOutputResolutionsPreMapLogic(eDistanceContentDirectory, personKeyToIds, mappingCollection);
string[] distinctDirectories = (from l in collection select l.Directory).Distinct().ToArray();
foreach (string directory in distinctDirectories)
@ -1139,7 +1139,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
continue;
if (s.Description is not null)
{
File.WriteAllLines(hiddenFile, new string[] { s.FullName, s.Description });
File.WriteAllLines(hiddenFile, [s.FullName, s.Description]);
File.SetAttributes(hiddenFile, FileAttributes.Hidden);
File.SetLastWriteTime(hiddenFile, s.DateTime);
}
@ -1168,9 +1168,9 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
string? directoryName;
string personDirectory;
string personKeyFormatted;
List<string> distinct = new();
List<SaveShortcutsForOutputResolutions> collection = new();
List<(string, DateTime[])> directoriesAndDateTimes = new();
List<string> distinct = [];
List<SaveShortcutsForOutputResolutions> collection = [];
List<(string, DateTime[])> directoriesAndDateTimes = [];
foreach (Item item in filteredItems)
{
if (item.ResizedFileHolder is null)

View File

@ -78,7 +78,7 @@ internal abstract class DistanceLogic
private static List<TicksDirectory> UpdateDateVerifyAndGetTicksDirectories(Configuration configuration, string eDistanceContentDirectory)
{
List<TicksDirectory> results = new();
List<TicksDirectory> results = [];
float? totalDays;
long? next = null;
string? checkDirectory;
@ -210,7 +210,7 @@ internal abstract class DistanceLogic
private static List<Record> GetRecords(Configuration configuration, bool? isDefault, string[] files, int directoryNumber, string personKeyFormatted, List<string> distinct, string? personDisplayDirectoryName)
{
List<Record> results = new();
List<Record> results = [];
int? id;
string fileName;
string checkFile;
@ -258,7 +258,7 @@ internal abstract class DistanceLogic
internal static List<Record> DeleteEmptyDirectoriesAndGetCollection(Configuration configuration, long ticks, string eDistanceContentDirectory, ReadOnlyDictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted, ReadOnlyCollection<string> personKeyFormattedCollection)
{
List<Record> results = new();
List<Record> results = [];
bool check;
string message;
string[] files;
@ -273,7 +273,7 @@ internal abstract class DistanceLogic
string personKeyFormatted;
string? personFirstInitial;
bool isReservedDirectoryName;
List<string> distinct = new();
List<string> distinct = [];
string[] personNameDirectories;
string? newestPersonKeyFormatted;
string? personDisplayDirectoryName;

View File

@ -9,7 +9,7 @@ internal abstract class LookForAbandonedLogic
{
string fileNameWithoutExtension;
bool nameWithoutExtensionIsIdFormat;
List<string> renameCollection = new();
List<string> renameCollection = [];
bool nameWithoutExtensionIsPaddedIdFormat;
int sortOrderOnlyLengthIndex = IDirectory.GetSortOrderOnlyLengthIndex(propertyConfiguration.Offset);
string[] distinctFilteredIdsValues = distinctFilteredIds.Select(l => l.ToString()).ToArray();

View File

@ -37,8 +37,8 @@ internal abstract class MapLogic
string fileName;
string checkFile;
int? wholePercentages;
List<string> distinctFiles = new();
List<string> distinctFileName = new();
List<string> distinctFiles = [];
List<string> distinctFileName = [];
bool skipNotSkipDirectoriesAny = configuration.SkipNotSkipDirectories.Length > 0;
string[] checkDirectories = (from l in configuration.SkipNotSkipDirectories select Path.GetFullPath($"{a2PeopleSingletonDirectory}{l}")).ToArray();
foreach (PersonContainer personContainer in personContainers)
@ -69,13 +69,13 @@ internal abstract class MapLogic
if (!skipNotSkipDirectoriesAny || !checkDirectories.Any(l => distinctFile.StartsWith(l)))
{
if (!skipCollection.ContainsKey(id.Value))
skipCollection.Add(id.Value, new());
skipCollection.Add(id.Value, []);
skipCollection[id.Value].Add((distinctFile, wholePercentages.Value));
}
else
{
if (!skipNotSkipCollection.ContainsKey(id.Value))
skipNotSkipCollection.Add(id.Value, new());
skipNotSkipCollection.Add(id.Value, []);
skipNotSkipCollection[id.Value].Add((distinctFile, wholePercentages.Value));
}
}
@ -160,7 +160,7 @@ internal abstract class MapLogic
internal static ReadOnlyCollection<Face> GetFaces(ReadOnlyCollection<Item> items)
{
List<Face> results = new();
List<Face> results = [];
foreach (Item item in items)
{
if (item.Property?.Id is null || item.ResizedFileHolder is null)
@ -183,10 +183,10 @@ internal abstract class MapLogic
private static List<MappedFile> GetDisplayDirectoryAllFiles(string fileNameExtension, string personBirthdayFormat, ReadOnlyCollection<PersonContainer> personContainers)
{
List<MappedFile> results = new();
List<MappedFile> results = [];
string fileName;
string personKeyFormatted;
List<string> distinct = new();
List<string> distinct = [];
foreach (PersonContainer personContainer in personContainers)
{
if (personContainer.Key is null)
@ -242,7 +242,7 @@ internal abstract class MapLogic
private static List<(string, long)> GetDirectoryAndTicksCollection(string[] jLinks, string personBirthdayFormat, string? rootDirectory)
{
List<(string, long)> results = new();
List<(string, long)> results = [];
string directory;
DateTime dateTime;
string[] personKeyDirectories;
@ -275,15 +275,15 @@ internal abstract class MapLogic
{
(long, PersonContainer)[] results;
const int zero = 0;
List<string> errors = new();
List<string> errors = [];
string newestPersonKeyFormatted;
List<(long PersonKey, PersonContainer PersonContainer)> collection = new();
List<(long PersonKey, PersonContainer PersonContainer)> collection = [];
foreach (PersonContainer personContainer in personContainers)
{
if (personContainer.Key is null)
continue;
if (!personKeyToPersonContainerCollection.ContainsKey(personContainer.Key.Value))
personKeyToPersonContainerCollection.Add(personContainer.Key.Value, new());
personKeyToPersonContainerCollection.Add(personContainer.Key.Value, []);
personKeyToPersonContainerCollection[personContainer.Key.Value].Add(personContainer);
newestPersonKeyFormatted = IPersonBirthday.GetFormatted(configuration.PersonBirthdayFormat, personContainer.Key.Value);
if (!personKeyFormattedToPersonContainer.ContainsKey(newestPersonKeyFormatted))
@ -303,7 +303,7 @@ internal abstract class MapLogic
private static Dictionary<int, Dictionary<int, List<PersonContainer>>> GetAll(Configuration configuration, ReadOnlyDictionary<string, PersonContainer> personKeyFormattedToPersonContainer, ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection)
{
Dictionary<int, Dictionary<int, List<PersonContainer>>> results = new();
Dictionary<int, Dictionary<int, List<PersonContainer>>> results = [];
PersonBirthday? personBirthday;
PersonContainer? personContainer;
List<PersonContainer>? personContainers;
@ -319,13 +319,13 @@ internal abstract class MapLogic
throw new Exception();
if (!results.TryGetValue(personKeyFormattedIdThenWholePercentages.Id, out idTo))
{
results.Add(personKeyFormattedIdThenWholePercentages.Id, new());
results.Add(personKeyFormattedIdThenWholePercentages.Id, []);
if (!results.TryGetValue(personKeyFormattedIdThenWholePercentages.Id, out idTo))
throw new Exception();
}
if (!idTo.TryGetValue(personKeyFormattedIdThenWholePercentages.WholePercentages, out personContainers))
{
idTo.Add(personKeyFormattedIdThenWholePercentages.WholePercentages, new());
idTo.Add(personKeyFormattedIdThenWholePercentages.WholePercentages, []);
if (!idTo.TryGetValue(personKeyFormattedIdThenWholePercentages.WholePercentages, out personContainers))
throw new Exception();
}
@ -337,17 +337,17 @@ internal abstract class MapLogic
private static ReadOnlyDictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> GetReadOnly(Dictionary<int, Dictionary<int, List<PersonContainer>>> idThenWholePercentagesToPersonContainerCollection)
{
Dictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> results = new();
List<long> distinct = new();
Dictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> results = [];
List<long> distinct = [];
List<PersonContainer> personContainers;
Dictionary<int, ReadOnlyCollection<PersonContainer>> keyValuePairs;
foreach (KeyValuePair<int, Dictionary<int, List<PersonContainer>>> idTo in idThenWholePercentagesToPersonContainerCollection)
{
keyValuePairs = new();
keyValuePairs = [];
foreach (KeyValuePair<int, List<PersonContainer>> wholePercentagesTo in idThenWholePercentagesToPersonContainerCollection[idTo.Key])
{
distinct.Clear();
personContainers = new();
personContainers = [];
foreach (PersonContainer personContainer in wholePercentagesTo.Value)
{
if (personContainer.Key is null)
@ -365,7 +365,7 @@ internal abstract class MapLogic
private static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetReadOnly(Dictionary<int, Dictionary<int, Mapping>> keyValuePairs)
{
Dictionary<int, ReadOnlyDictionary<int, Mapping>> results = new();
Dictionary<int, ReadOnlyDictionary<int, Mapping>> results = [];
foreach (KeyValuePair<int, Dictionary<int, Mapping>> keyValuePair in keyValuePairs)
results.Add(keyValuePair.Key, new(keyValuePair.Value));
return new(results);
@ -373,13 +373,13 @@ internal abstract class MapLogic
private static List<PersonContainer> GetNonSpecificPeopleCollection(Configuration configuration, long ticks, List<long> personKeys, ReadOnlyDictionary<long, int> personKeyToCount)
{
List<PersonContainer> results = new();
List<PersonContainer> results = [];
bool check;
long personKey;
int? approximateYears = null;
PersonBirthday personBirthday;
PersonContainer personContainer;
string[] personDisplayDirectoryAllFiles = Array.Empty<string>();
string[] personDisplayDirectoryAllFiles = [];
DateTime incrementDate = new(configuration.PersonBirthdayFirstYear, 1, 1);
long oneHour = new DateTime(1, 1, 1, 1, 0, 0).Ticks - new DateTime(1, 1, 1).Ticks;
for (int i = 0; i < int.MaxValue; i++)
@ -409,7 +409,7 @@ internal abstract class MapLogic
if (check)
continue;
personBirthday = IPersonBirthday.GetPersonBirthday(personKey + (oneHour * 2));
personContainer = new(approximateYears, new PersonBirthday[] { personBirthday }, personDisplayDirectoryAllFiles, configuration.MappingDefaultName, personKey);
personContainer = new(approximateYears, [personBirthday], personDisplayDirectoryAllFiles, configuration.MappingDefaultName, personKey);
results.Add(personContainer);
if (results.Count > 99)
break;
@ -431,12 +431,12 @@ internal abstract class MapLogic
private static List<MappedFile> GetMappedFiles(Configuration configuration, ReadOnlyCollection<PersonContainer> personContainers, List<Record> records)
{
List<MappedFile> results = new();
List<MappedFile> results = [];
string file;
long personKey;
string fileName;
string checkFile;
List<string> distinct = new();
List<string> distinct = [];
PersonBirthday? personBirthday;
results.AddRange(GetDisplayDirectoryAllFiles(configuration.FacesFileNameExtension, configuration.PersonBirthdayFormat, personContainers));
foreach (Record record in records)
@ -529,11 +529,11 @@ internal abstract class MapLogic
string key;
float? percent;
float itemPercentagesArea;
List<string> delete = new();
List<Duplicate> duplicates = new();
List<string> delete = [];
List<Duplicate> duplicates = [];
RectangleF? itemPercentagesRectangle;
(string File, int WholePercentages) item;
Dictionary<string, (string, int)> distinct = new();
Dictionary<string, (string, int)> distinct = [];
foreach (LocationContainer<MetadataExtractor.Directory> locationContainer in locationContainers)
{
key = string.Concat(locationContainer.PersonKey, locationContainer.Id);
@ -660,7 +660,7 @@ internal abstract class MapLogic
private static List<(string, long)> GetJLinkResolvedDirectories(string personBirthdayFormat, List<string> resolvedDirectories)
{
List<(string, long)> results = new();
List<(string, long)> results = [];
DateTime dateTime;
string directoryName;
string[] directories;
@ -683,7 +683,7 @@ internal abstract class MapLogic
internal static void SetKeyValuePairsAndAddToCollections(Configuration configuration, ReadOnlyCollection<PersonContainer> personContainers, Dictionary<long, PersonContainer> personKeyToPersonContainer, ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection, Dictionary<long, int> personKeyToCount, Dictionary<string, PersonContainer> personKeyFormattedToPersonContainer, Dictionary<long, List<PersonContainer>> personKeyToPersonContainerCollection, List<(PersonKeyFormattedIdThenWholePercentages, PersonContainer)> possiblyNewPersonDisplayDirectoryNamesAndPersonContainer)
{
PersonBirthday? personBirthday;
Dictionary<int, Dictionary<int, List<PersonContainer>>> idThenWholePercentagesToPersonContainers = new();
Dictionary<int, Dictionary<int, List<PersonContainer>>> idThenWholePercentagesToPersonContainers = [];
(long, PersonContainer)[] collection = GetDistinctCollection(configuration, personContainers, personKeyToPersonContainerCollection, personKeyFormattedToPersonContainer);
foreach ((long personKey, PersonContainer personContainer) in collection)
personKeyToPersonContainer.Add(personKey, personContainer);
@ -733,11 +733,11 @@ internal abstract class MapLogic
internal static ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> GetPersonKeyFormattedIdThenWholePercentages(Configuration configuration, long ticks, List<Record> collection)
{
List<PersonKeyFormattedIdThenWholePercentages> results = new();
List<PersonKeyFormattedIdThenWholePercentages> results = [];
int? id;
int? wholePercentages;
List<int> wholePercentagesCollection;
Dictionary<int, List<int>> idToWholePercentagesCollection = new();
Dictionary<int, List<int>> idToWholePercentagesCollection = [];
int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
string message = $") {collection.Count:000} join from ticks Director(ies) - C - {totalSeconds} total second(s)";
ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
@ -749,7 +749,7 @@ internal abstract class MapLogic
if (id is null || wholePercentages is null)
continue;
if (!idToWholePercentagesCollection.ContainsKey(id.Value))
idToWholePercentagesCollection.Add(id.Value, new());
idToWholePercentagesCollection.Add(id.Value, []);
wholePercentagesCollection = idToWholePercentagesCollection[id.Value];
wholePercentagesCollection.Add(wholePercentages.Value);
idToWholePercentagesCollection[id.Value].Add(wholePercentages.Value);
@ -760,9 +760,9 @@ internal abstract class MapLogic
internal static List<PersonContainer> GetNotMappedPersonContainers(Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, ReadOnlyDictionary<long, int> personKeyToCount)
{
List<PersonContainer> results = new();
List<PersonContainer> notMappedAndNotNamedPersonKeys = new();
List<PersonContainer> notMappedAndWithNamedPersonKeys = new();
List<PersonContainer> results = [];
List<PersonContainer> notMappedAndNotNamedPersonKeys = [];
List<PersonContainer> notMappedAndWithNamedPersonKeys = [];
List<long> personKeys = IPersonContainer.GetPersonKeys(personContainers);
foreach (PersonContainer personContainer in personContainers)
{
@ -826,7 +826,7 @@ internal abstract class MapLogic
const int zero = 0;
string personKeyFormatted;
string[] deleteCollection;
List<string> distinct = new();
List<string> distinct = [];
PersonBirthday personBirthday;
string personDisplayDirectory;
DateTime dateTime = new(ticks);
@ -878,7 +878,7 @@ internal abstract class MapLogic
internal static List<LocationContainer<MetadataExtractor.Directory>> GetLocationContainers(int maxDegreeOfParallelism, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, Dictionary<int, List<(string, int)>> skipCollection, List<Record> records)
{
List<LocationContainer<MetadataExtractor.Directory>> results = new();
List<LocationContainer<MetadataExtractor.Directory>> results = [];
List<MappedFile> mappedFiles = GetMappedFiles(configuration, personContainers, records);
if (mappedFiles.Count > 0 && (configuration.DistanceMoveUnableToMatch || configuration.DistanceRenameToMatch))
{
@ -912,7 +912,7 @@ internal abstract class MapLogic
string checkDirectory;
string personKeyFormatted;
PersonBirthday personBirthday;
List<string> distinct = new();
List<string> distinct = [];
DateTime dateTime = new(ticks);
string by = nameof(Shared.Models.Stateless.IMapLogic.ManualCopy);
foreach (PersonContainer personContainer in personContainers)
@ -1005,7 +1005,7 @@ internal abstract class MapLogic
WindowsShortcut windowsShortcut;
string personDisplayDirectoryName;
(string, string)[] yearDirectoryNameCheck;
List<(string, string)> yearDirectoryNames = new();
List<(string, string)> yearDirectoryNames = [];
string[] personKeyDirectories = Directory.GetDirectories(mappingDirectory, "*", SearchOption.TopDirectoryOnly);
foreach (string personKeyDirectory in personKeyDirectories)
{
@ -1057,7 +1057,7 @@ internal abstract class MapLogic
internal static ReadOnlyDictionary<int, List<long>> GetIdToPersonKeys(ReadOnlyDictionary<long, List<int>> personKeyToIds)
{
Dictionary<int, List<long>> results = new();
Dictionary<int, List<long>> results = [];
List<long>? collection;
foreach (KeyValuePair<long, List<int>> keyValuePair in personKeyToIds)
{
@ -1065,7 +1065,7 @@ internal abstract class MapLogic
{
if (!results.TryGetValue(id, out collection))
{
results.Add(id, new());
results.Add(id, []);
if (!results.TryGetValue(id, out collection))
throw new Exception();
}
@ -1079,7 +1079,7 @@ internal abstract class MapLogic
internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> mappingCollection)
{
Dictionary<int, Dictionary<int, Mapping>> results = new();
Dictionary<int, Dictionary<int, Mapping>> results = [];
Dictionary<int, Mapping>? keyValuePairs;
foreach (Mapping mapping in mappingCollection)
{
@ -1087,7 +1087,7 @@ internal abstract class MapLogic
continue;
if (!results.TryGetValue(mapping.MappingFromItem.Id, out keyValuePairs))
{
results.Add(mapping.MappingFromItem.Id, new());
results.Add(mapping.MappingFromItem.Id, []);
if (!results.TryGetValue(mapping.MappingFromItem.Id, out keyValuePairs))
throw new Exception();
}
@ -1106,14 +1106,14 @@ internal abstract class MapLogic
int totalFiles = 0;
string checkDirectory;
WindowsShortcut windowsShortcut;
List<string> resolvedDirectories = new();
List<string> resolvedDirectories = [];
if (string.IsNullOrEmpty(genealogicalDataCommunicationFile))
results = GetDirectoryAndTicksCollection(jLinks, personBirthdayFormat, a2PeopleContentDirectory);
else
results = GetGenealogicalDataCommunicationDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat);
if (results.Count == 0 || results.Count < jLinks.Length)
{
List<(string, string, string)> a2PeopleSingletonDirectories = new();
List<(string, string, string)> a2PeopleSingletonDirectories = [];
foreach (string directory in Directory.GetDirectories(a2PeopleSingletonDirectory, "*", SearchOption.AllDirectories))
a2PeopleSingletonDirectories.Add((directory, Path.GetFileName(directory), Path.GetFileName(directory).Split(personCharacters).First()));
foreach (string directoryName in jLinks)
@ -1144,7 +1144,7 @@ internal abstract class MapLogic
else
{
resolvedDirectories.Clear();
results = new();
results = [];
}
}
return results;
@ -1205,13 +1205,13 @@ internal abstract class MapLogic
internal static ReadOnlyDictionary<int, List<int>> ConvertSkip(Dictionary<int, List<(string, int)>> skipCollection)
{
Dictionary<int, List<int>> results = new();
Dictionary<int, List<int>> results = [];
List<int>? wholePercentagesCollection;
foreach (KeyValuePair<int, List<(string, int)>> keyValuePair in skipCollection)
{
if (!results.TryGetValue(keyValuePair.Key, out wholePercentagesCollection))
{
results.Add(keyValuePair.Key, new());
results.Add(keyValuePair.Key, []);
if (!results.TryGetValue(keyValuePair.Key, out wholePercentagesCollection))
throw new Exception();
}
@ -1223,13 +1223,13 @@ internal abstract class MapLogic
internal static ReadOnlyDictionary<int, List<int>> ConvertSkipNotSkip(Dictionary<int, List<(string, int)>> skipNotSkipCollection)
{
Dictionary<int, List<int>> results = new();
Dictionary<int, List<int>> results = [];
List<int>? wholePercentagesCollection;
foreach (KeyValuePair<int, List<(string, int)>> keyValuePair in skipNotSkipCollection)
{
if (!results.TryGetValue(keyValuePair.Key, out wholePercentagesCollection))
{
results.Add(keyValuePair.Key, new());
results.Add(keyValuePair.Key, []);
if (!results.TryGetValue(keyValuePair.Key, out wholePercentagesCollection))
throw new Exception();
}
@ -1241,11 +1241,11 @@ internal abstract class MapLogic
internal static ReadOnlyDictionary<int, List<LocationContainer<MetadataExtractor.Directory>>> ConvertLocationContainers(List<LocationContainer<MetadataExtractor.Directory>> locationContainers)
{
Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>> results = new();
Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>> results = [];
foreach (LocationContainer<MetadataExtractor.Directory> locationContainer in locationContainers)
{
if (!results.ContainsKey(locationContainer.Id))
results.Add(locationContainer.Id, new());
results.Add(locationContainer.Id, []);
results[locationContainer.Id].Add(locationContainer);
}
return new(results);

View File

@ -14,7 +14,7 @@ internal abstract class RelationLogic
{
List<LocationContainer<MetadataExtractor.Directory>>? collection;
Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>>? yearTo;
Dictionary<long, Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>>> personKeyTo = new();
Dictionary<long, Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>>> personKeyTo = [];
foreach (LocationContainer<MetadataExtractor.Directory> locationContainer in locationContainers)
{
if (!locationContainer.FromDistanceContent)
@ -23,13 +23,13 @@ internal abstract class RelationLogic
continue;
if (!personKeyTo.TryGetValue(locationContainer.PersonKey, out yearTo))
{
personKeyTo.Add(locationContainer.PersonKey, new());
personKeyTo.Add(locationContainer.PersonKey, []);
if (!personKeyTo.TryGetValue(locationContainer.PersonKey, out yearTo))
throw new Exception();
}
if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
{
yearTo.Add(locationContainer.CreationDateOnly.Year, new());
yearTo.Add(locationContainer.CreationDateOnly.Year, []);
if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
throw new Exception();
}
@ -40,13 +40,13 @@ internal abstract class RelationLogic
private static ReadOnlyCollection<Group> GetGroups(Configuration configuration, List<LocationContainer<MetadataExtractor.Directory>> locationContainers)
{
List<Group> results = new();
List<Group> results = [];
string key;
int lastIndex;
List<int> years = new();
List<int> indices = new();
List<(int Index, int Year)> sort = new();
List<LocationContainer<MetadataExtractor.Directory>> collection = new();
List<int> years = [];
List<int> indices = [];
List<(int Index, int Year)> sort = [];
List<LocationContainer<MetadataExtractor.Directory>> collection = [];
KeyValuePair<int, List<LocationContainer<MetadataExtractor.Directory>>> keyValue;
Dictionary<long, Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>>> personKeyTo = GetPersonKeyTo(configuration, locationContainers);
foreach (KeyValuePair<long, Dictionary<int, List<LocationContainer<MetadataExtractor.Directory>>>> keyValuePair in personKeyTo)
@ -77,7 +77,7 @@ internal abstract class RelationLogic
if (collection.Count == 0)
continue;
results.Add(new(key, collection[0].PersonKey, new(collection)));
collection = new();
collection = [];
years.Clear();
}
}
@ -86,7 +86,7 @@ internal abstract class RelationLogic
private static ReadOnlyDictionary<string, string> MoveFiles(Configuration configuration, string key, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers, List<string> linked1, List<string> linked2, List<string> linked3, List<string> linked4, List<string> linked5, List<string> linked6, List<string> linked7, List<string> linked8, List<string> linked9)
{
Dictionary<string, string> results = new();
Dictionary<string, string> results = [];
string value;
string checkFile;
string debugFile;
@ -231,15 +231,15 @@ internal abstract class RelationLogic
private static ReadOnlyDictionary<string, string> GetMoveFiles(Configuration configuration, string key, int take, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers)
{
ReadOnlyDictionary<string, string> results;
List<string> linked1 = new();
List<string> linked2 = new();
List<string> linked3 = new();
List<string> linked4 = new();
List<string> linked5 = new();
List<string> linked6 = new();
List<string> linked7 = new();
List<string> linked8 = new();
List<string> linked9 = new();
List<string> linked1 = [];
List<string> linked2 = [];
List<string> linked3 = [];
List<string> linked4 = [];
List<string> linked5 = [];
List<string> linked6 = [];
List<string> linked7 = [];
List<string> linked8 = [];
List<string> linked9 = [];
foreach ((FileHolder fileHolder, ReadOnlyCollection<Relation> relations) in relationContainers)
{
foreach (Relation relation in relations.Take(take))
@ -306,7 +306,7 @@ internal abstract class RelationLogic
string markDownFile;
FileHolder fileHolder;
string originalString;
List<string> lines = new();
List<string> lines = [];
string fileNameWithoutExtension;
foreach ((FileHolder relationFileHolder, ReadOnlyCollection<Relation> relations) in relationContainers)
{