Mass push
This commit is contained in:
@ -6,126 +6,46 @@ namespace View_by_Distance.Property.Models.Stateless;
|
||||
public class Container
|
||||
{
|
||||
|
||||
public static (int t, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)>) GetGroupCollection(string rootDirectory, int maxImagesInDirectoryForTopLevelFirstPass, bool reverse, string searchPattern, List<string> topDirectories)
|
||||
{
|
||||
int result = 0;
|
||||
List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> results = new();
|
||||
string? parentDirectory;
|
||||
string[] subDirectories;
|
||||
string[] sourceDirectoryFiles;
|
||||
List<string[]> fileCollections = new();
|
||||
if (!topDirectories.Any())
|
||||
{
|
||||
if (!Directory.Exists(rootDirectory))
|
||||
_ = Directory.CreateDirectory(rootDirectory);
|
||||
topDirectories.AddRange(from l in Directory.GetDirectories(rootDirectory, "*", SearchOption.TopDirectoryOnly) select Path.GetFullPath(l));
|
||||
}
|
||||
for (int g = 1; g < 5; g++)
|
||||
{
|
||||
if (g == 4)
|
||||
{
|
||||
for (int i = fileCollections.Count - 1; i > -1; i--)
|
||||
{
|
||||
parentDirectory = Path.GetDirectoryName(fileCollections[i][0]);
|
||||
if (string.IsNullOrEmpty(parentDirectory))
|
||||
continue;
|
||||
results.Add(new(g, parentDirectory, fileCollections[i]));
|
||||
fileCollections.RemoveAt(i);
|
||||
}
|
||||
}
|
||||
else if (g == 2)
|
||||
{
|
||||
for (int i = fileCollections.Count - 1; i > -1; i--)
|
||||
{
|
||||
if (fileCollections[i].Length > maxImagesInDirectoryForTopLevelFirstPass * g)
|
||||
break;
|
||||
parentDirectory = Path.GetDirectoryName(fileCollections[i][0]);
|
||||
if (string.IsNullOrEmpty(parentDirectory))
|
||||
continue;
|
||||
results.Add(new(g, parentDirectory, fileCollections[i]));
|
||||
fileCollections.RemoveAt(i);
|
||||
}
|
||||
}
|
||||
else if (g == 3)
|
||||
{
|
||||
subDirectories = Directory.GetDirectories(rootDirectory, "*", SearchOption.AllDirectories);
|
||||
if (reverse)
|
||||
subDirectories = subDirectories.Reverse().ToArray();
|
||||
foreach (string subDirectory in subDirectories)
|
||||
{
|
||||
sourceDirectoryFiles = Directory.GetFiles(subDirectory, "*", SearchOption.TopDirectoryOnly);
|
||||
result += sourceDirectoryFiles.Length;
|
||||
if (!topDirectories.Contains(subDirectory))
|
||||
results.Add(new(g, subDirectory, sourceDirectoryFiles));
|
||||
}
|
||||
}
|
||||
else if (g == 1)
|
||||
{
|
||||
sourceDirectoryFiles = Directory.GetFiles(rootDirectory, searchPattern, SearchOption.TopDirectoryOnly);
|
||||
result += sourceDirectoryFiles.Length;
|
||||
if (sourceDirectoryFiles.Length > maxImagesInDirectoryForTopLevelFirstPass)
|
||||
fileCollections.Add(sourceDirectoryFiles);
|
||||
else
|
||||
results.Add(new(g, rootDirectory, sourceDirectoryFiles));
|
||||
if (reverse)
|
||||
topDirectories.Reverse();
|
||||
subDirectories = topDirectories.ToArray();
|
||||
foreach (string subDirectory in subDirectories)
|
||||
{
|
||||
sourceDirectoryFiles = Directory.GetFiles(subDirectory, searchPattern, SearchOption.TopDirectoryOnly);
|
||||
result += sourceDirectoryFiles.Length;
|
||||
if (sourceDirectoryFiles.Length > maxImagesInDirectoryForTopLevelFirstPass)
|
||||
fileCollections.Add(sourceDirectoryFiles);
|
||||
else
|
||||
{
|
||||
if (sourceDirectoryFiles.Any() || Directory.GetDirectories(subDirectory, "*", SearchOption.TopDirectoryOnly).Any())
|
||||
results.Add(new(g, subDirectory, sourceDirectoryFiles));
|
||||
else if (searchPattern == "*" && subDirectory != rootDirectory)
|
||||
Directory.Delete(subDirectory);
|
||||
}
|
||||
}
|
||||
fileCollections.Reverse();
|
||||
}
|
||||
else
|
||||
throw new Exception();
|
||||
}
|
||||
return new(result, results);
|
||||
}
|
||||
|
||||
public static (int t, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)>) GetGroupCollection(string rootDirectory, string searchPattern, List<string> topDirectories)
|
||||
{
|
||||
(int t, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)>) results;
|
||||
int maxImagesInDirectoryForTopLevelFirstPass = 50;
|
||||
bool reverse = false;
|
||||
results = GetGroupCollection(rootDirectory, maxImagesInDirectoryForTopLevelFirstPass, reverse, searchPattern, topDirectories);
|
||||
return results;
|
||||
}
|
||||
|
||||
private static (int j, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)>) GetJsonGroupCollection(Configuration configuration, A_Property propertyLogic, string rootDirectory)
|
||||
{
|
||||
(int j, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)>) results;
|
||||
string searchPattern = "*.json";
|
||||
List<string> topDirectories = new();
|
||||
results = GetGroupCollection(rootDirectory, configuration.MaxImagesInDirectoryForTopLevelFirstPass, propertyLogic.Reverse, searchPattern, topDirectories);
|
||||
return results;
|
||||
}
|
||||
|
||||
private static (int f, List<(int g, string sourceDirectory, FileHolder[] sourceDirectoryFiles)>) GetFileHolderGroupCollection(Configuration configuration, A_Property propertyLogic, string searchPattern, List<string> topDirectories)
|
||||
{
|
||||
List<(int g, string sourceDirectory, FileHolder[] sourceDirectoryFiles)> results = new();
|
||||
int? id;
|
||||
int parsedId;
|
||||
string idFile;
|
||||
string[] lines;
|
||||
const int zero = 0;
|
||||
List<(string File, int? Id)> files = new();
|
||||
List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> collection;
|
||||
(int f, collection) = GetGroupCollection(configuration.RootDirectory, configuration.MaxImagesInDirectoryForTopLevelFirstPass, propertyLogic.Reverse, searchPattern, topDirectories);
|
||||
(int f, collection) = Shared.Models.Stateless.Methods.IFileHolder.GetGroupCollection(configuration.RootDirectory, configuration.MaxImagesInDirectoryForTopLevelFirstPass, propertyLogic.Reverse, searchPattern, topDirectories);
|
||||
foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in collection)
|
||||
results.Add(new(g, sourceDirectory, (from l in sourceDirectoryFiles select new FileHolder(l)).ToArray()));
|
||||
{
|
||||
files.Clear();
|
||||
foreach (string sourceDirectoryFile in sourceDirectoryFiles)
|
||||
{
|
||||
if (sourceDirectoryFile.EndsWith(".id"))
|
||||
continue;
|
||||
id = null;
|
||||
idFile = $"{sourceDirectoryFile}.id";
|
||||
if (sourceDirectoryFiles.Contains(idFile))
|
||||
{
|
||||
lines = File.ReadAllLines(idFile);
|
||||
File.Delete(idFile);
|
||||
if (lines.Any() && int.TryParse(lines[zero], out parsedId))
|
||||
id = parsedId;
|
||||
};
|
||||
files.Add(new(sourceDirectoryFile, id));
|
||||
}
|
||||
results.Add(new(g, sourceDirectory, (from l in files select new FileHolder(l.File, l.Id)).ToArray()));
|
||||
}
|
||||
return new(f, results);
|
||||
}
|
||||
|
||||
private static void ParallelFor(List<(int, string, string[])> jsonCollection, int i, int length, List<(int, string, List<(string, Shared.Models.Property?)>)> results)
|
||||
private static void ParallelFor(List<(string, string[])> jsonCollection, int i, int length, List<(string, List<(string, Shared.Models.Property?)>)> results)
|
||||
{
|
||||
string key;
|
||||
string json;
|
||||
Shared.Models.Property? property;
|
||||
(int g, string sourceDirectory, string[] sourceDirectoryFiles) = jsonCollection[i];
|
||||
(string sourceDirectory, string[] sourceDirectoryFiles) = jsonCollection[i];
|
||||
List<(string, Shared.Models.Property?)> collection = new();
|
||||
foreach (string sourceDirectoryFile in sourceDirectoryFiles)
|
||||
{
|
||||
@ -135,37 +55,28 @@ public class Container
|
||||
collection.Add(new(sourceDirectoryFile, property));
|
||||
}
|
||||
lock (results)
|
||||
results.Add(new(g, sourceDirectory, collection));
|
||||
results.Add(new(sourceDirectory, collection));
|
||||
}
|
||||
|
||||
private static List<(int g, string sourceDirectory, List<(string sourceDirectoryFile, Shared.Models.Property? property)> collection)> GetCollection(string rootDirectory, List<(int g, string sourceDirectory, string[] SourceDirectoryFiles)> jsonCollection)
|
||||
private static List<(string sourceDirectory, List<(string sourceDirectoryFile, Shared.Models.Property? property)> collection)> GetCollection(string rootDirectory, List<(string sourceDirectory, string[] SourceDirectoryFiles)> jsonCollection)
|
||||
{
|
||||
List<(int, string, List<(string, Shared.Models.Property?)>)> results = new();
|
||||
List<(string, List<(string, Shared.Models.Property?)>)> results = new();
|
||||
int length = rootDirectory.Length;
|
||||
ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = Environment.ProcessorCount };
|
||||
_ = Parallel.For(0, jsonCollection.Count, parallelOptions, (i, state) => ParallelFor(jsonCollection, i, length, results));
|
||||
return results;
|
||||
}
|
||||
|
||||
private static Item GetNewItem(Configuration configuration, A_Property propertyLogic, string relativePath, FileHolder sourceDirectoryFileHolder)
|
||||
private static Item GetNewItem(Configuration configuration, string relativePath, FileHolder sourceDirectoryFileHolder)
|
||||
{
|
||||
Item result;
|
||||
Shared.Models.Property? property = null;
|
||||
bool isValidImageFormatExtension = configuration.ValidImageFormatExtensions.Contains(sourceDirectoryFileHolder.ExtensionLowered);
|
||||
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);
|
||||
}
|
||||
result = new(sourceDirectoryFileHolder, relativePath, sourceDirectoryFileHolder, isValidImageFormatExtension, property, null, null, null);
|
||||
return result;
|
||||
}
|
||||
|
||||
private static (int, Shared.Models.Container[]) GetContainers(Configuration configuration, A_Property propertyLogic, 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, A_Property propertyLogic, string aPropertySingletonDirectory, List<(int, string, FileHolder[])> fileHolderGroupCollection, List<(string, List<(string, Shared.Models.Property?)>)> collectionFromJson)
|
||||
{
|
||||
int result = 0;
|
||||
Shared.Models.Container[] results;
|
||||
@ -174,9 +85,11 @@ public class Container
|
||||
int additional;
|
||||
string inferred;
|
||||
List<Item> items;
|
||||
const int last = 9;
|
||||
string keyWithJson;
|
||||
string relativePath;
|
||||
bool fileSizeChanged;
|
||||
FileHolder fileHolder;
|
||||
FileHolder keyFileHolder;
|
||||
bool lastWriteTimeChanged;
|
||||
bool isValidImageFormatExtension;
|
||||
@ -190,11 +103,13 @@ public class Container
|
||||
foreach (FileHolder sourceDirectoryFileHolder in sourceDirectoryFileHolderCollection)
|
||||
{
|
||||
relativePath = Shared.Models.Stateless.Methods.IPath.GetRelativePath(sourceDirectoryFileHolder.FullName, length, forceExtensionToLower: true);
|
||||
if (fileHolderKeyValuePairs.ContainsKey(relativePath))
|
||||
throw new NotSupportedException();
|
||||
fileHolderKeyValuePairs.Add(relativePath, new(sourceDirectory, sourceDirectoryFileHolder));
|
||||
}
|
||||
}
|
||||
length = aPropertySingletonDirectory.Length;
|
||||
foreach ((int g, string _, List<(string, Shared.Models.Property?)> collection) in collectionFromJson)
|
||||
foreach ((string _, List<(string, Shared.Models.Property?)> collection) in collectionFromJson)
|
||||
{
|
||||
if (!collection.Any())
|
||||
continue;
|
||||
@ -202,6 +117,7 @@ public class Container
|
||||
keySourceDirectories = new();
|
||||
foreach ((string sourceDirectoryFile, Shared.Models.Property? property) in collection)
|
||||
{
|
||||
fileHolder = new(sourceDirectoryFile);
|
||||
keyWithJson = Shared.Models.Stateless.Methods.IPath.GetRelativePath(sourceDirectoryFile, length, forceExtensionToLower: false);
|
||||
relativePath = keyWithJson[..^5];
|
||||
if (!fileHolderKeyValuePairs.ContainsKey(relativePath))
|
||||
@ -212,7 +128,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, null);
|
||||
item = new(fileHolder, relativePath, keyFileHolder, isValidImageFormatExtension, property, true, null, null);
|
||||
items.Add(item);
|
||||
}
|
||||
else
|
||||
@ -225,12 +141,12 @@ 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, null);
|
||||
item = new(fileHolder, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, null, null);
|
||||
else
|
||||
{
|
||||
fileSizeChanged = property.FileSize != keyFileHolder.Length;
|
||||
lastWriteTimeChanged = configuration.PropertiesChangedForProperty || property.LastWriteTime != keyFileHolder.LastWriteTime;
|
||||
item = new(sourceDirectoryFile, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, fileSizeChanged, lastWriteTimeChanged);
|
||||
item = new(fileHolder, relativePath, keyFileHolder, isValidImageFormatExtension, property, false, fileSizeChanged, lastWriteTimeChanged);
|
||||
}
|
||||
items.Add(item);
|
||||
}
|
||||
@ -240,7 +156,7 @@ public class Container
|
||||
result += items.Count;
|
||||
if (keySourceDirectories.Distinct().Count() != 1)
|
||||
continue;
|
||||
container = new(g, items, keySourceDirectories[0]);
|
||||
container = new(last, items, keySourceDirectories[0]);
|
||||
keyValuePairs.Add(keySourceDirectories[0], container);
|
||||
}
|
||||
}
|
||||
@ -258,7 +174,7 @@ public class Container
|
||||
throw new Exception();
|
||||
if (sourceDirectoryFileHolder.ExtensionLowered is ".json")
|
||||
continue;
|
||||
item = GetNewItem(configuration, propertyLogic, relativePath, sourceDirectoryFileHolder);
|
||||
item = GetNewItem(configuration, relativePath, sourceDirectoryFileHolder);
|
||||
items.Add(item);
|
||||
}
|
||||
if (sourceDirectory == configuration.RootDirectory || items.Any())
|
||||
@ -285,19 +201,54 @@ public class Container
|
||||
return new(result, results);
|
||||
}
|
||||
|
||||
private static void SetCollections(string aPropertySingletonDirectory, List<string> otherCollection, List<(string, string[])> jsonCollection)
|
||||
{
|
||||
string searchPattern = "*";
|
||||
(string, string[])[] collection = Shared.Models.Stateless.Methods.IFileHolder.GetFiles(aPropertySingletonDirectory, searchPattern).ToArray();
|
||||
foreach ((string sourceDirectory, string[] files) in collection)
|
||||
{
|
||||
otherCollection.AddRange(files.Where(l => !l.EndsWith(".json")));
|
||||
jsonCollection.Add(new(sourceDirectory, files.Where(l => l.EndsWith(".json")).ToArray()));
|
||||
}
|
||||
}
|
||||
|
||||
private static void DeleteAbandoned(Configuration configuration, string aPropertySingletonDirectory, List<string> otherCollection, List<(int g, string sourceDirectory, FileHolder[] sourceDirectoryFiles)> fileHolderGroupCollection)
|
||||
{
|
||||
string relativePath;
|
||||
string checkFileName;
|
||||
List<string> checkCollection = new();
|
||||
checkCollection.AddRange(otherCollection);
|
||||
int length = configuration.RootDirectory.Length;
|
||||
foreach ((int g, string sourceDirectory, FileHolder[] sourceDirectoryFiles) in fileHolderGroupCollection)
|
||||
{
|
||||
foreach (FileHolder fileHolder in sourceDirectoryFiles)
|
||||
{
|
||||
relativePath = Shared.Models.Stateless.Methods.IPath.GetRelativePath(fileHolder.FullName, length);
|
||||
checkFileName = Path.GetFullPath(string.Concat(aPropertySingletonDirectory, relativePath));
|
||||
if (!checkCollection.Remove(checkFileName))
|
||||
File.WriteAllText(checkFileName, string.Empty);
|
||||
}
|
||||
}
|
||||
foreach (string file in checkCollection)
|
||||
File.Delete(file);
|
||||
}
|
||||
|
||||
public static (int, int, int, Shared.Models.Container[]) GetContainers(Configuration configuration, A_Property propertyLogic)
|
||||
{
|
||||
Shared.Models.Container[] results;
|
||||
string searchPattern = "*";
|
||||
List<string> topDirectories = new();
|
||||
List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> jsonCollection;
|
||||
List<string> otherCollection = new();
|
||||
List<(string, string[])> jsonCollection = new();
|
||||
List<(int g, string sourceDirectory, FileHolder[] sourceDirectoryFiles)> fileHolderGroupCollection;
|
||||
string aPropertySingletonDirectory = IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "{}");
|
||||
List<(int g, string sourceDirectory, List<(string sourceDirectoryFile, Shared.Models.Property? property)> collection)> collectionFromJson;
|
||||
(int j, jsonCollection) = GetJsonGroupCollection(configuration, propertyLogic, aPropertySingletonDirectory);
|
||||
SetCollections(aPropertySingletonDirectory, otherCollection, jsonCollection);
|
||||
(int f, fileHolderGroupCollection) = GetFileHolderGroupCollection(configuration, propertyLogic, searchPattern, topDirectories);
|
||||
DeleteAbandoned(configuration, aPropertySingletonDirectory, otherCollection, fileHolderGroupCollection);
|
||||
List<(string sourceDirectory, List<(string sourceDirectoryFile, Shared.Models.Property? property)> collection)> collectionFromJson;
|
||||
collectionFromJson = GetCollection(aPropertySingletonDirectory, jsonCollection);
|
||||
(int t, results) = GetContainers(configuration, propertyLogic, aPropertySingletonDirectory, fileHolderGroupCollection, collectionFromJson);
|
||||
int j = jsonCollection.Select(l => l.Item2.Length).Sum();
|
||||
return (j, f, t, results);
|
||||
}
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ internal class Result
|
||||
predictorModelName = PredictorModel.Large.ToString();
|
||||
else
|
||||
predictorModelName = propertyConfiguration.PredictorModelName;
|
||||
string dateGroupDirectory = string.Concat(outputResolution.Replace(" ", string.Empty), " - ", modelName, " - ", predictorModelName);
|
||||
string dateGroupDirectory = string.Concat(outputResolution.Replace(" ", string.Empty), "-", modelName, "-", predictorModelName, "-", propertyConfiguration.NumberOfJitters, "-", propertyConfiguration.NumberOfTimesToUpsample);
|
||||
result = Path.Combine(result, dateGroupDirectory);
|
||||
}
|
||||
else if (includeModel)
|
||||
|
||||
Reference in New Issue
Block a user