Deleted Method Get
This commit is contained in:
@ -58,31 +58,21 @@ public class DateGroup
|
||||
_ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(propertyConfiguration.RootDirectory);
|
||||
if (true || appSettings.MaxDegreeOfParallelism < 2)
|
||||
ticks = LogDelta(ticks, nameof(Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories));
|
||||
(int j, int f, int t, Shared.Models.Container[] containers) = A_Property.Get(propertyConfiguration, propertyLogic);
|
||||
(int j, int f, int t, Shared.Models.Container[] containers) = Property.Models.Stateless.Container.GetContainers(propertyConfiguration, propertyLogic);
|
||||
if (propertyLogic.ExceptionsDirectories.Any())
|
||||
throw new Exception();
|
||||
if (propertyConfiguration.PopulatePropertyId && (configuration.ByCreateDateShortcut.Value || configuration.ByHash.Value) && Shared.Models.Stateless.Methods.IProperty.Any(containers))
|
||||
{
|
||||
propertyLogic.SavePropertyParallelWork(ticks, containers);
|
||||
if (appSettings.MaxDegreeOfParallelism < 2)
|
||||
ticks = LogDelta(ticks, nameof(A_Property.SavePropertyParallelWork));
|
||||
if (propertyLogic.ExceptionsDirectories.Any())
|
||||
throw new Exception();
|
||||
}
|
||||
if (configuration.ByCreateDateShortcut.HasValue && configuration.ByCreateDateShortcut.Value)
|
||||
CreateDateShortcut(propertyConfiguration, containers);
|
||||
else
|
||||
{
|
||||
List<string> topDirectories = new();
|
||||
List<Property.Models.DirectoryInfo> directoryInfoCollection = new();
|
||||
propertyLogic.ParallelWork(ticks, containers, firstPass: true);
|
||||
if (appSettings.MaxDegreeOfParallelism < 2)
|
||||
ticks = LogDelta(ticks, nameof(A_Property.ParallelWork));
|
||||
if (propertyLogic.ExceptionsDirectories.Any())
|
||||
throw new Exception();
|
||||
if (propertyConfiguration.PopulatePropertyId && (configuration.ByCreateDateShortcut.Value || configuration.ByHash.Value))
|
||||
{
|
||||
if (Shared.Models.Stateless.Methods.IProperty.Any(containers))
|
||||
propertyLogic.ParallelWork(ticks, containers, firstPass: false);
|
||||
if (appSettings.MaxDegreeOfParallelism < 2)
|
||||
ticks = LogDelta(ticks, nameof(A_Property.ParallelWork));
|
||||
if (propertyLogic.ExceptionsDirectories.Any())
|
||||
throw new Exception();
|
||||
}
|
||||
if ((from l in directoryInfoCollection where l.Moved.Any(a => a) select true).Any())
|
||||
throw new Exception();
|
||||
MoveFiles(topDirectories, directoryInfoCollection);
|
||||
}
|
||||
MoveFiles(propertyConfiguration, containers);
|
||||
}
|
||||
|
||||
private static void Verify(Models.Configuration configuration)
|
||||
@ -154,9 +144,9 @@ public class DateGroup
|
||||
return result;
|
||||
}
|
||||
|
||||
private List<(string Source, string[] Destination)> GetMoveFileCollection(string destinationDirectory, string topDirectory, Property.Models.DirectoryInfo group)
|
||||
private List<(long MinimumDateTimeTicks, string Source, string[] Destination)> GetMoveFileCollection(string destinationDirectory, string topDirectory, Shared.Models.Item[] filteredItems)
|
||||
{
|
||||
List<(string Source, string[] Destination)> results = new();
|
||||
List<(long MinimumDateTimeTicks, string Source, string[] Destination)> results = new();
|
||||
if (_Configuration.ByCreateDateShortcut is null)
|
||||
throw new NullReferenceException(nameof(_Configuration.ByCreateDateShortcut));
|
||||
if (_Configuration.ByDay is null)
|
||||
@ -179,21 +169,18 @@ public class DateGroup
|
||||
string? pathRoot;
|
||||
string seasonName;
|
||||
string weekOfYear;
|
||||
string? directory;
|
||||
bool? isWrongYear;
|
||||
string seasonValue;
|
||||
string directoryName;
|
||||
bool? propertyWrongYear;
|
||||
string topDirectoryName;
|
||||
string[]? matches = null;
|
||||
string[] directorySegments;
|
||||
Shared.Models.Property? property;
|
||||
DateTime? minimumDateTime = null;
|
||||
List<string> destinationCollection;
|
||||
List<string> directoryNames = new();
|
||||
List<string> topDirectorySegments = new();
|
||||
StringBuilder destinationDirectoryName = new();
|
||||
Calendar calendar = new CultureInfo("en-US").Calendar;
|
||||
Shared.Models.FileHolder filteredSourceDirectoryFileHolder;
|
||||
for (int z = 1; z < 3; z++)
|
||||
{
|
||||
if (z == 1)
|
||||
@ -227,31 +214,26 @@ public class DateGroup
|
||||
}
|
||||
if (matches is null)
|
||||
matches = Array.Empty<string>();
|
||||
for (int i = 0; i < group.SourceDirectoryFileHolderCollection.Length; i++)
|
||||
foreach (Shared.Models.Item item in filteredItems)
|
||||
{
|
||||
destinationCollection = new();
|
||||
if (item.Property?.Id is null || item.ImageFileHolder is null)
|
||||
continue;
|
||||
directoryNames.Clear();
|
||||
destinationCollection = new();
|
||||
_ = destinationDirectoryName.Clear();
|
||||
property = group.PropertyCollection[i];
|
||||
if (property is null)
|
||||
continue;
|
||||
filteredSourceDirectoryFileHolder = group.SourceDirectoryFileHolderCollection[i];
|
||||
minimumDateTime = Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(property);
|
||||
directory = filteredSourceDirectoryFileHolder.DirectoryName;
|
||||
if (string.IsNullOrEmpty(directory))
|
||||
continue;
|
||||
minimumDateTime = Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(item.Property);
|
||||
day = minimumDateTime.Value.ToString("MM-dd");
|
||||
month = minimumDateTime.Value.ToString("MMMM");
|
||||
(propertyWrongYear, _) = property.IsWrongYear(filteredSourceDirectoryFileHolder.FullName, minimumDateTime);
|
||||
if (propertyWrongYear is null)
|
||||
(isWrongYear, _) = item.Property.IsWrongYear(item.ImageFileHolder, minimumDateTime);
|
||||
if (isWrongYear is null)
|
||||
flag = '#';
|
||||
else
|
||||
{
|
||||
if (propertyWrongYear.Value)
|
||||
if (isWrongYear.Value)
|
||||
flag = '~';
|
||||
else
|
||||
{
|
||||
if (property.DateTimeOriginal.HasValue && minimumDateTime.Value.DayOfYear != property.DateTimeOriginal.Value.DayOfYear && Math.Abs(new TimeSpan(minimumDateTime.Value.Ticks - property.DateTimeOriginal.Value.Ticks).TotalHours) > 8)
|
||||
if (item.Property.DateTimeOriginal.HasValue && minimumDateTime.Value.DayOfYear != item.Property.DateTimeOriginal.Value.DayOfYear && Math.Abs(new TimeSpan(minimumDateTime.Value.Ticks - item.Property.DateTimeOriginal.Value.Ticks).TotalHours) > 8)
|
||||
flag = '^';
|
||||
else
|
||||
flag = '=';
|
||||
@ -262,7 +244,7 @@ public class DateGroup
|
||||
seasonValue = string.Empty;
|
||||
else
|
||||
seasonValue = $".{season}";
|
||||
if (propertyWrongYear is null || !propertyWrongYear.Value)
|
||||
if (isWrongYear is null || !isWrongYear.Value)
|
||||
year = $"{flag}{minimumDateTime.Value:yyyy}{seasonValue}";
|
||||
else
|
||||
{
|
||||
@ -310,14 +292,14 @@ public class DateGroup
|
||||
throw new Exception();
|
||||
}
|
||||
}
|
||||
if (!_Configuration.ByHash.Value || property.Id is null)
|
||||
fileName = filteredSourceDirectoryFileHolder.Name;
|
||||
if (!_Configuration.ByHash.Value || item.Property.Id is null)
|
||||
fileName = item.ImageFileHolder.Name;
|
||||
else
|
||||
fileName = $"{property.Id.Value}{filteredSourceDirectoryFileHolder.ExtensionLowered}";
|
||||
fileName = $"{item.Property.Id.Value}{item.ImageFileHolder.ExtensionLowered}";
|
||||
destinationCollection.Add(destinationDirectory);
|
||||
destinationCollection.AddRange(directoryNames);
|
||||
destinationCollection.Add(fileName);
|
||||
results.Add(new(filteredSourceDirectoryFileHolder.FullName, destinationCollection.ToArray()));
|
||||
results.Add(new(minimumDateTime.Value.Ticks, item.ImageFileHolder.FullName, destinationCollection.ToArray()));
|
||||
}
|
||||
return results;
|
||||
}
|
||||
@ -331,30 +313,42 @@ public class DateGroup
|
||||
return result;
|
||||
}
|
||||
|
||||
private List<(string Source, string[] Destination)> GetFileMoveCollectionAll(List<string> topDirectories, List<Property.Models.DirectoryInfo> groupCollection)
|
||||
private static Shared.Models.Item[] GetFilterItems(Shared.Models.Container container)
|
||||
{
|
||||
List<(string Source, string[] Destination)> results = new();
|
||||
List<Shared.Models.Item> results = new();
|
||||
foreach (Shared.Models.Item item in container.Items)
|
||||
{
|
||||
if (item.ImageFileHolder is not null
|
||||
&& (item.Abandoned is null || !item.Abandoned.Value)
|
||||
&& item.ValidImageFormatExtension)
|
||||
results.Add(item);
|
||||
}
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private (long MinimumDateTimeTicks, string Source, string[] Destination)[] GetFileMoveCollectionAll(Property.Models.Configuration configuration, Shared.Models.Container[] containers, string destinationRoot)
|
||||
{
|
||||
(long MinimumDateTimeTicks, string Source, string[] Destination)[] results;
|
||||
if (_Configuration.KeepFullPath is null)
|
||||
throw new NullReferenceException(nameof(_Configuration.KeepFullPath));
|
||||
if (_Configuration?.PropertyConfiguration is null)
|
||||
throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
|
||||
string? topDirectory;
|
||||
string? checkDirectory;
|
||||
string sourceDirectory;
|
||||
string destinationDirectory;
|
||||
string destinationRoot = Property.Models.Stateless.IResult.GetResultsGroupDirectory(_Configuration.PropertyConfiguration, "Z) Moved");
|
||||
List<(string Source, string[] Destination)> fileMoveCollectionDirectory;
|
||||
foreach (Property.Models.DirectoryInfo group in groupCollection)
|
||||
Shared.Models.Item[] filteredItems;
|
||||
List<(long MinimumDateTimeTicks, string Source, string[] Destination)> fileMoveCollection = new();
|
||||
List<(long MinimumDateTimeTicks, string Source, string[] Destination)> fileMoveCollectionDirectory;
|
||||
foreach (Shared.Models.Container container in containers)
|
||||
{
|
||||
sourceDirectory = group.SourceDirectory;
|
||||
if (!container.Items.Any())
|
||||
continue;
|
||||
if (!_Configuration.KeepFullPath.Value)
|
||||
destinationDirectory = destinationRoot;
|
||||
else
|
||||
destinationDirectory = string.Concat(destinationRoot, sourceDirectory[_Configuration.PropertyConfiguration.RootDirectory.Length..]);
|
||||
checkDirectory = Path.GetFullPath(sourceDirectory);
|
||||
destinationDirectory = string.Concat(destinationRoot, container.SourceDirectory[configuration.RootDirectory.Length..]);
|
||||
checkDirectory = Path.GetFullPath(container.SourceDirectory);
|
||||
for (int z = 0; z < int.MaxValue; z++)
|
||||
{
|
||||
if (checkDirectory == _Configuration.PropertyConfiguration.RootDirectory || topDirectories.Contains(checkDirectory))
|
||||
if (checkDirectory == configuration.RootDirectory)
|
||||
break;
|
||||
checkDirectory = Path.GetDirectoryName(checkDirectory);
|
||||
if (string.IsNullOrEmpty(checkDirectory))
|
||||
@ -363,22 +357,28 @@ public class DateGroup
|
||||
if (string.IsNullOrEmpty(checkDirectory))
|
||||
continue;
|
||||
topDirectory = checkDirectory;
|
||||
fileMoveCollectionDirectory = GetMoveFileCollection(destinationDirectory, topDirectory, group);
|
||||
results.AddRange(fileMoveCollectionDirectory);
|
||||
filteredItems = GetFilterItems(container);
|
||||
if (!filteredItems.Any())
|
||||
continue;
|
||||
fileMoveCollectionDirectory = GetMoveFileCollection(destinationDirectory, topDirectory, filteredItems);
|
||||
fileMoveCollection.AddRange(fileMoveCollectionDirectory);
|
||||
}
|
||||
results = (from l in fileMoveCollection orderby l.MinimumDateTimeTicks descending select l).ToArray();
|
||||
return results;
|
||||
}
|
||||
|
||||
private void MoveFiles(List<string> topDirectories, List<Property.Models.DirectoryInfo> groupCollection)
|
||||
private void MoveFiles(Property.Models.Configuration configuration, Shared.Models.Container[] containers)
|
||||
{
|
||||
if (_Log is null)
|
||||
throw new NullReferenceException(nameof(_Log));
|
||||
if (_Configuration?.PropertyConfiguration is null)
|
||||
throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
|
||||
if (_Configuration.ByHash is null)
|
||||
throw new NullReferenceException(nameof(_Configuration.ByHash));
|
||||
string directoryName;
|
||||
List<string> distinct = new();
|
||||
List<(string Source, string[] Destination)> fileMoveCollectionAll = GetFileMoveCollectionAll(topDirectories, groupCollection);
|
||||
foreach ((string source, string[] destination) in fileMoveCollectionAll)
|
||||
string duplicate = "-Duplicate";
|
||||
string destinationRoot = Property.Models.Stateless.IResult.GetResultsGroupDirectory(configuration, "Z) Moved");
|
||||
(long MinimumDateTimeTicks, string Source, string[] Destination)[] fileMoveCollectionAll = GetFileMoveCollectionAll(configuration, containers, destinationRoot);
|
||||
foreach ((long _, string source, string[] destination) in fileMoveCollectionAll)
|
||||
{
|
||||
directoryName = Path.Combine(destination.Take(destination.Length - 1).ToArray());
|
||||
if (distinct.Contains(directoryName))
|
||||
@ -386,44 +386,63 @@ public class DateGroup
|
||||
distinct.Add(directoryName);
|
||||
if (!Directory.Exists(directoryName))
|
||||
_ = Directory.CreateDirectory(directoryName);
|
||||
if (_Configuration.ByHash.Value)
|
||||
{
|
||||
if (!Directory.Exists(string.Concat(directoryName, duplicate)))
|
||||
_ = Directory.CreateDirectory(string.Concat(directoryName, duplicate));
|
||||
}
|
||||
}
|
||||
_Log.Information("Ready to move files?");
|
||||
for (int y = 0; y < int.MaxValue; y++)
|
||||
{
|
||||
_Log.Information("Press \"Y\" key to move files back or close console to not move files");
|
||||
_Log.Information("Press \"Y\" key to move file(s) or close console to not move files");
|
||||
if (Console.ReadKey().Key == ConsoleKey.Y)
|
||||
break;
|
||||
}
|
||||
_Log.Information(". . .");
|
||||
int moved = 0;
|
||||
string fullFileName;
|
||||
foreach ((string source, string[] destination) in fileMoveCollectionAll)
|
||||
foreach ((long _, string source, string[] destination) in fileMoveCollectionAll)
|
||||
{
|
||||
fullFileName = Path.Combine(destination);
|
||||
if (File.Exists(fullFileName))
|
||||
continue;
|
||||
{
|
||||
if (!_Configuration.ByHash.Value)
|
||||
continue;
|
||||
else
|
||||
{
|
||||
destination[1] = string.Concat(destination[1], duplicate);
|
||||
fullFileName = Path.Combine(destination);
|
||||
if (File.Exists(fullFileName))
|
||||
continue;
|
||||
}
|
||||
}
|
||||
File.Move(source, fullFileName);
|
||||
moved += 1;
|
||||
}
|
||||
if (_Configuration.ByHash.Value)
|
||||
_ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(destinationRoot);
|
||||
_Log.Information($"{moved} file(s) moved");
|
||||
for (int y = 0; y < int.MaxValue; y++)
|
||||
{
|
||||
_Log.Information("Press \"Y\" key to move files back or close console to leave them moved");
|
||||
_Log.Information("Press \"Y\" key to move file(s) back or close console to leave them moved");
|
||||
if (Console.ReadKey().Key == ConsoleKey.Y)
|
||||
break;
|
||||
}
|
||||
_Log.Information(". . .");
|
||||
foreach ((string source, string[] destination) in fileMoveCollectionAll)
|
||||
foreach ((long _, string source, string[] destination) in fileMoveCollectionAll)
|
||||
{
|
||||
fullFileName = Path.Combine(destination);
|
||||
if (File.Exists(source))
|
||||
continue;
|
||||
if (!File.Exists(fullFileName))
|
||||
continue;
|
||||
File.Move(fullFileName, source);
|
||||
moved += 1;
|
||||
}
|
||||
_Log.Information($"Done moving back {moved} file(s)");
|
||||
for (int i = 1; i < 10; i++)
|
||||
_ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(_Configuration.PropertyConfiguration.RootDirectory);
|
||||
_ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(configuration.RootDirectory);
|
||||
}
|
||||
|
||||
private static void CreateDateShortcut(Property.Models.Configuration configuration, Shared.Models.Container[] containers)
|
||||
@ -433,13 +452,13 @@ public class DateGroup
|
||||
string directory;
|
||||
int selectedTotal;
|
||||
const int minimum = 3;
|
||||
List<Shared.Models.Item> selectedItems;
|
||||
List<DateTime> dateTimes;
|
||||
DateTime? minimumDateTime;
|
||||
const int maximumHours = 24;
|
||||
string? relativePathDirectory;
|
||||
WindowsShortcut windowsShortcut;
|
||||
TimeSpan threeStandardDeviationHigh;
|
||||
List<Shared.Models.Item> selectedItems;
|
||||
string aPropertyContentDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "()");
|
||||
foreach (Shared.Models.Container container in containers)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user