net7.0
This commit is contained in:
@ -150,13 +150,18 @@ public class Container
|
||||
private static Item GetNewItem(Configuration configuration, A_Property propertyLogic, string relativePath, FileHolder sourceDirectoryFileHolder)
|
||||
{
|
||||
Item result;
|
||||
List<string> parseExceptions = new();
|
||||
Shared.Models.Property? property = null;
|
||||
List<Tuple<string, DateTime>> subFileTuples = new();
|
||||
bool isValidImageFormatExtension = configuration.ValidImageFormatExtensions.Contains(sourceDirectoryFileHolder.ExtensionLowered);
|
||||
Item item = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, property, null, null);
|
||||
property = propertyLogic.GetProperty(item, subFileTuples, parseExceptions);
|
||||
result = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, property, null, null);
|
||||
if (configuration.PopulatePropertyId)
|
||||
result = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, property, null, null, null);
|
||||
else
|
||||
{
|
||||
List<string> parseExceptions = new();
|
||||
List<Tuple<string, DateTime>> subFileTuples = new();
|
||||
Item item = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, property, null, null, null);
|
||||
property = propertyLogic.GetProperty(item, subFileTuples, parseExceptions);
|
||||
result = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, property, null, null, null);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -171,10 +176,12 @@ public class Container
|
||||
List<Item> items;
|
||||
string keyWithJson;
|
||||
string relativePath;
|
||||
bool fileSizeChanged;
|
||||
FileHolder keyFileHolder;
|
||||
bool lastWriteTimeChanged;
|
||||
bool isValidImageFormatExtension;
|
||||
Shared.Models.Container container;
|
||||
List<string> keySourceDirectories;
|
||||
Shared.Models.Container container;
|
||||
Dictionary<string, Shared.Models.Container> keyValuePairs = new();
|
||||
Dictionary<string, (string SourceDirectory, FileHolder FileHolder)> fileHolderKeyValuePairs = new();
|
||||
length = configuration.RootDirectory.Length;
|
||||
@ -205,7 +212,7 @@ public class Container
|
||||
continue;
|
||||
keySourceDirectories.Add(string.Concat(keyFileHolder.DirectoryName));
|
||||
isValidImageFormatExtension = configuration.ValidImageFormatExtensions.Contains(keyFileHolder.ExtensionLowered);
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, true, null);
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, true, null, null);
|
||||
items.Add(item);
|
||||
}
|
||||
else
|
||||
@ -218,11 +225,13 @@ public class Container
|
||||
continue;
|
||||
isValidImageFormatExtension = configuration.ValidImageFormatExtensions.Contains(keyFileHolder.ExtensionLowered);
|
||||
if (property?.Id is null || property?.Width is null || property?.Height is null)
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, null);
|
||||
else if (configuration.PropertiesChangedForProperty || property.LastWriteTime != keyFileHolder.LastWriteTime || property.FileSize != keyFileHolder.Length)
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, true);
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, null, null);
|
||||
else
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, false);
|
||||
{
|
||||
fileSizeChanged = property.FileSize != keyFileHolder.Length;
|
||||
lastWriteTimeChanged = configuration.PropertiesChangedForProperty || property.LastWriteTime != keyFileHolder.LastWriteTime;
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, fileSizeChanged, lastWriteTimeChanged);
|
||||
}
|
||||
items.Add(item);
|
||||
}
|
||||
}
|
||||
@ -239,6 +248,7 @@ public class Container
|
||||
foreach ((int g, string sourceDirectory, FileHolder[] sourceDirectoryFileHolderCollection) in fileHolderGroupCollection)
|
||||
{
|
||||
items = new();
|
||||
propertyLogic.SetAngleBracketCollection(sourceDirectory);
|
||||
foreach (FileHolder sourceDirectoryFileHolder in sourceDirectoryFileHolderCollection)
|
||||
{
|
||||
relativePath = Shared.Models.Stateless.Methods.IPath.GetRelativePath(sourceDirectoryFileHolder.FullName, length, forceExtensionToLower: true);
|
||||
|
Reference in New Issue
Block a user