Added FileHolder

This commit is contained in:
2022-08-08 19:23:48 -07:00
parent daf5f428b9
commit 3aeab88384
15 changed files with 448 additions and 288 deletions

View File

@ -196,7 +196,7 @@ public class DateGroup
DateTime? minimumDateTime = null;
List<string> destinationCollection;
List<string> directoryNames = new();
FileInfo filteredSourceDirectoryFileInfo;
FileHolder filteredSourceDirectoryFileHolder;
List<string> topDirectorySegments = new();
StringBuilder destinationDirectoryName = new();
Calendar calendar = new CultureInfo("en-US").Calendar;
@ -233,7 +233,7 @@ public class DateGroup
}
if (matches is null)
matches = Array.Empty<string>();
for (int i = 0; i < group.SourceDirectoryFileInfoCollection.Length; i++)
for (int i = 0; i < group.SourceDirectoryFileHolderCollection.Length; i++)
{
destinationCollection = new();
directoryNames.Clear();
@ -241,14 +241,14 @@ public class DateGroup
property = group.PropertyCollection[i];
if (property is null)
continue;
filteredSourceDirectoryFileInfo = group.SourceDirectoryFileInfoCollection[i];
filteredSourceDirectoryFileHolder = group.SourceDirectoryFileHolderCollection[i];
minimumDateTime = Property.Models.Stateless.A_Property.GetMinimumDateTime(property);
directory = filteredSourceDirectoryFileInfo.DirectoryName;
directory = filteredSourceDirectoryFileHolder.DirectoryName;
if (string.IsNullOrEmpty(directory))
continue;
day = minimumDateTime.Value.ToString("MM-dd");
month = minimumDateTime.Value.ToString("MMMM");
(propertyWrongYear, _) = property.IsWrongYear(filteredSourceDirectoryFileInfo.FullName, minimumDateTime);
(propertyWrongYear, _) = property.IsWrongYear(filteredSourceDirectoryFileHolder.FullName, minimumDateTime);
if (propertyWrongYear is null)
flag = '#';
else
@ -317,13 +317,13 @@ public class DateGroup
}
}
if (!_Configuration.ByHash.Value || property.Id is null)
fileName = filteredSourceDirectoryFileInfo.Name;
fileName = filteredSourceDirectoryFileHolder.Name;
else
fileName = $"{property.Id.Value}{filteredSourceDirectoryFileInfo.Extension.ToLower()}";
fileName = $"{property.Id.Value}{filteredSourceDirectoryFileHolder.Extension.ToLower()}";
destinationCollection.Add(destinationDirectory);
destinationCollection.AddRange(directoryNames);
destinationCollection.Add(fileName);
results.Add(new(filteredSourceDirectoryFileInfo.FullName, destinationCollection.ToArray()));
results.Add(new(filteredSourceDirectoryFileHolder.FullName, destinationCollection.ToArray()));
}
return results;
}