Deleted Method Get
This commit is contained in:
@ -147,7 +147,7 @@ public class Container
|
||||
return results;
|
||||
}
|
||||
|
||||
private static (int, Shared.Models.Container[]) GetContainers(Configuration configuration, bool firstRun, string aPropertySingletonDirectory, List<(int, string, FileHolder[])> fileHolderGroupCollection, List<(int, string, List<(string, Shared.Models.Property?)>)> collectionFromJson)
|
||||
private static (int, Shared.Models.Container[]) GetContainers(Configuration configuration, string aPropertySingletonDirectory, List<(int, string, FileHolder[])> fileHolderGroupCollection, List<(int, string, List<(string, Shared.Models.Property?)>)> collectionFromJson)
|
||||
{
|
||||
int result = 0;
|
||||
Shared.Models.Container[] results;
|
||||
@ -236,12 +236,7 @@ public class Container
|
||||
if (sourceDirectoryFileHolder.ExtensionLowered is ".json")
|
||||
continue;
|
||||
isValidImageFormatExtension = configuration.ValidImageFormatExtensions.Contains(sourceDirectoryFileHolder.ExtensionLowered);
|
||||
if (firstRun)
|
||||
item = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, null, null, null);
|
||||
else if (!isValidImageFormatExtension)
|
||||
item = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, null, null, null);
|
||||
else
|
||||
item = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, null, null, null);
|
||||
item = new(sourceDirectoryFileHolder.FullName, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, null, null, null);
|
||||
items.Add(item);
|
||||
}
|
||||
if (sourceDirectory == configuration.RootDirectory || items.Any())
|
||||
@ -262,13 +257,13 @@ public class Container
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!firstRun && fileHolderKeyValuePairs.Any())
|
||||
throw new Exception();
|
||||
if (fileHolderKeyValuePairs.Any())
|
||||
throw new NotSupportedException("Unmapped left!");
|
||||
results = (from l in keyValuePairs orderby l.Value.G, l.Value.Items.Count select l.Value).ToArray();
|
||||
return new(result, results);
|
||||
}
|
||||
|
||||
public static (int, int, int, Shared.Models.Container[]) GetContainers(Configuration configuration, bool firstRun, A_Property propertyLogic)
|
||||
public static (int, int, int, Shared.Models.Container[]) GetContainers(Configuration configuration, A_Property propertyLogic)
|
||||
{
|
||||
Shared.Models.Container[] results;
|
||||
string searchPattern = "*";
|
||||
@ -280,7 +275,7 @@ public class Container
|
||||
(int j, jsonCollection) = GetJsonGroupCollection(configuration, propertyLogic, aPropertySingletonDirectory);
|
||||
(int f, fileHolderGroupCollection) = GetFileHolderGroupCollection(configuration, propertyLogic, searchPattern, topDirectories);
|
||||
collectionFromJson = GetCollection(aPropertySingletonDirectory, jsonCollection);
|
||||
(int t, results) = GetContainers(configuration, firstRun, aPropertySingletonDirectory, fileHolderGroupCollection, collectionFromJson);
|
||||
(int t, results) = GetContainers(configuration, aPropertySingletonDirectory, fileHolderGroupCollection, collectionFromJson);
|
||||
return (j, f, t, results);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user