diff --git a/PrepareForOld/PrepareForOld.cs b/PrepareForOld/PrepareForOld.cs deleted file mode 100644 index fdaeab1..0000000 --- a/PrepareForOld/PrepareForOld.cs +++ /dev/null @@ -1,54 +0,0 @@ - - -// public class PrepareForOld - - -// public PrepareForOld(List args, IsEnvironment isEnvironment, IConfigurationRoot configurationRoot, AppSettings appSettings, string workingDirectory, bool isSilent, IConsole console) - -// private static void Verify(Configuration configuration) - -// private static List GetExifCollection(string infoDirectory, string infoDirectoryExtra, bool checkDistinct) - -// private List<(int Index, long Ticks, string RelativeDirectory, string FileNameWithoutExtension, string Extension, string RegexResult)> GetIndexCollection(string infoDirectory, string infoDirectoryExtra, bool checkDistinct) -// else - -// private static List GetUseTabSeparatedValueIndices(string useDirectory) - -// private void SaveTabSeparatedValues(Property.Models.Configuration configuration, string aPropertySingletonDirectory) -// from l -// in duplicates -// select $"{l.Property.FileId}\t{l.RegexResult}\t{l.MinimumDateTime:yyyy-MM-dd_HH-mm-ss}\t{l.MinimumDateTime}\t{l.RelativeDirectory}\t{l.FileNameWithoutExtension}{l.Extension}.___" -// from l -// in matched -// select $"{l.Index}\t{l.PropertyId}\t{l.RegexResult}\t{new DateTime(l.Ticks):yyyy-MM-dd_HH-mm-ss}\t{l.PropertyTicks}\t{l.RelativeDirectory}\t{l.FileName}" -// from l -// in notMatched -// where !mappedIndices.Contains(l.Index) -// select $"{l.Index}\t______________\t{l.RegexResult}\t{new DateTime(l.Ticks):yyyy-MM-dd_HH-mm-ss}\t_________________\t{l.RelativeDirectory}\t{l.FileName}" - -// private static void GetUseTabSeparatedValueLines(string useDirectory, Dictionary> mappedLines) - -// private static void Populate(Dictionary> keyValuePairs, Dictionary> mappedLines) - -// private static Dictionary GetUseTabSeparatedValue(string useEqualsDirectory, string use18HoursDirectory, string useAnyDateDirectory, Dictionary> keyValuePairs, List lines) - -// private static void ReSaveExifFiles(string infoDirectory, string infoDirectoryIgnore, Dictionary findReplace, List missingIndices) - -// private static void ReSaveNamedFaceInfoFile(string namedFaceInfoFile, Dictionary findReplace, List missingIndices) - -// private static void ReSaveIndexFiles(string infoDirectory, string infoDirectoryIgnore, Dictionary findReplace, List missingIndices) - -// private void ReSaveJsonFiles() - -// private void CopyMissingImagesLogs() - -// private static Dictionary> GetKeyValuePairs(PropertyCompare.Models.PropertyCompare[] propertyCompares) - -// private void VerifyAgainstIndexInfoJsonFiles(Property.Models.Configuration configuration, string aPropertySingletonDirectory) -// from l -// in matched -// select $"{l.Index}\t{l.PropertyId}\t{l.RegexResult}\t{new DateTime(l.Ticks):yyyy-MM-dd_HH-mm-ss}\t{l.PropertyTicks}\t{l.RelativeDirectory}\t{l.FileName}" -// from l -// in notMatched -// select $"{l.Index}\t______________\t{l.RegexResult}\t{new DateTime(l.Ticks):yyyy-MM-dd_HH-mm-ss}\t_________________\t{l.RelativeDirectory}\t{l.FileName}" - diff --git a/Property-Compare/Models/PropertyCompare.cs b/Property-Compare/Models/PropertyCompare.cs index d00f4e9..5153461 100644 --- a/Property-Compare/Models/PropertyCompare.cs +++ b/Property-Compare/Models/PropertyCompare.cs @@ -44,7 +44,6 @@ public partial class PropertyCompare return result; } - #nullable disable public string GetSelect() => string.Concat(_RelativeDirectory, _FileNameWithoutExtension, _Extension, '\t', _Property.CreationTime.Ticks, '\t', Shared.Models.Stateless.Methods.IProperty.GetDateTime(_Property).ToString("yyyy-MM-dd_HH-mm-ss"), '\t', _Property.Id, '\t', _Property.FileSize, '\t', _Property.Width, '\t', _Property.Height); diff --git a/Property-Compare/Models/PropertyCompareItem.cs b/Property-Compare/Models/PropertyCompareItem.cs deleted file mode 100644 index 140bb3f..0000000 --- a/Property-Compare/Models/PropertyCompareItem.cs +++ /dev/null @@ -1,6 +0,0 @@ - -// internal class PropertyCompareItem - - -// public PropertyCompareItem(string imageFileName, bool isArg, string jsonFileNameWithoutExtension, long[] numbers, Shared.Models.Property property, string[] strings) - diff --git a/Property-Compare/Models/PropertyCompareLogic.cs b/Property-Compare/Models/PropertyCompareLogic.cs deleted file mode 100644 index 86029b9..0000000 --- a/Property-Compare/Models/PropertyCompareLogic.cs +++ /dev/null @@ -1,69 +0,0 @@ - - -// public class PropertyCompareLogic - - -// public PropertyCompareLogic(int maxDegreeOfParallelism, Configuration configuration, List<(string Find, string Replace)>? spellingFindReplace = null, string? diffRootDirectory = null) - -// public override string ToString() - -// private List GetDuplicates(PropertyCompare[] propertyCompares, int i, PropertyCompare[]? diffPropertyCompares) - -// private (string[] ToDirectories, List FromThenToCollection) Get(string aPropertyCollectionDirectory, PropertyCompare[] propertyCompares, int i, PropertyCompare[]? diffPropertyCompares) -// else -// else -// else -// else - -// private void ParallelGet(List? duplicates, List results, List ids, List collection, int loadLessThan, string directory, object @lock, string relativeDirectory, string[] files, List filesWithoutExtension, bool isArg, string jsonFile) -// else -// else -// n = i switch -// 0 => property.FileId.Value, -// 1 => property.FileId.Value, -// 2 => property.FileId.Value, -// 3 => property.FileId.Value, -// 4 => property.FileId.Value, -// 5 => Shared.Models.Stateless.Methods.IProperty.GetDateTime(property).Ticks, -// 6 => property.CreationTime.Ticks, -// 7 => property.FileSize, -// 8 => Shared.Models.Stateless.Methods.IProperty.GetDateTime(property).Ticks, -// 9 => property.FileSize, -// _ => throw new Exception() -// s = i switch -// 0 => $"{jsonFileNameWithoutExtension.ToLower()}", -// 1 => $"{property.FileSize}{Shared.Models.Stateless.Methods.IProperty.GetDateTime(property).Ticks}", -// 2 => $"{property.FileSize}{property.CreationTime:yyyy-MM-dd_HH-mm-ss}", -// 3 => $"{property.FileSize}{property.Width}{property.Height}", -// 4 => string.Empty, -// 5 => $"{property.FileSize}", -// 6 => $"{property.FileSize}", -// 7 => $"{property.Width}{property.Height}", -// 8 => string.Empty, -// 9 => string.Empty, -// _ => throw new Exception() -// lock (@lock) -// lock (@lock) -// lock (@lock) - -// public PropertyCompare[] Get(string aPropertySingletonDirectory, int loadLessThan = 7, List? duplicates = null, bool deleteExtension = false) -// else -// else -// _ = Parallel.For(0, filteredSourceDirectoryFiles.Length, parallelOptions, (i, state) => -// try -// catch (Exception ex) - -// private void MoveFiles(string[] directories, List fromThenToCollection) - -// public void SaveDiffFiles(string aPropertyCollectionDirectory, int loadLessThan, PropertyCompare[] propertyCompares, PropertyCompare[]? diffPropertyCompares) -// else - -// public void SaveLogAndMoveFiles(string aPropertyCollectionDirectory, int loadLessThan, PropertyCompare[] propertyCompares, PropertyCompare[]? diffPropertyCompares, int i) -// else - -// public void WithSubdirectory(string propertyDirectory, bool subDirectoriesAny, string fileName, bool renameCompare, bool deleteArg) -// else -// else -// else -// else - diff --git a/Property/Models/A_Property.cs b/Property/Models/A_Property.cs index da0ae91..296d8e2 100644 --- a/Property/Models/A_Property.cs +++ b/Property/Models/A_Property.cs @@ -489,7 +489,7 @@ public class A_Property } if (directoryMaximumOfMinimumDateTime != DateTime.MinValue) { - System.IO.DirectoryInfo directoryInfo = new(sourceDirectory); + DirectoryInfo directoryInfo = new(sourceDirectory); if (directoryInfo.LastWriteTime != directoryMaximumOfMinimumDateTime) Directory.SetLastWriteTime(sourceDirectory, directoryMaximumOfMinimumDateTime); } diff --git a/Shared/Models/DirectoryFileSystem.cs b/Shared/Models/DirectoryFileSystem.cs index 425997f..d1c5bdf 100644 --- a/Shared/Models/DirectoryFileSystem.cs +++ b/Shared/Models/DirectoryFileSystem.cs @@ -6,7 +6,6 @@ namespace View_by_Distance.Shared.Models; public class DirectoryFileSystem : FileSystem, Properties.IDirectoryFileSystem { - [JsonConstructor] public DirectoryFileSystem(string className, string dataDisplayFileName, string dataFullFileName, string display, DateTime lastModified) : base(className, dataDisplayFileName, dataFullFileName, display, lastModified) { diff --git a/Shared/Models/Methods/INavigate.cs b/Shared/Models/Methods/INavigate.cs deleted file mode 100644 index 99ba9f5..0000000 --- a/Shared/Models/Methods/INavigate.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace View_by_Distance.Shared.Models.Methods; - -public interface INavigate -{ - -} \ No newline at end of file diff --git a/Shared/Models/Navigate.cs b/Shared/Models/Navigate.cs deleted file mode 100644 index 25e8cfe..0000000 --- a/Shared/Models/Navigate.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace View_by_Distance.Shared.Models; - -public class Navigate : Properties.INavigate -{ - - protected List _Levels; - protected string _SourceDirectory; - protected string _DirectoryRelativePath; - protected string _EncodedSourceDirectory; - protected FaceFileSystem[] _FaceFileSystemCollection; - protected DirectoryFileSystem[] _DirectoryFileSystemCollection; - public List Levels => _Levels; - public string SourceDirectory => _SourceDirectory; - public string DirectoryRelativePath => _DirectoryRelativePath; - public string EncodedSourceDirectory => _EncodedSourceDirectory; - public FaceFileSystem[] FaceFileSystemCollection => _FaceFileSystemCollection; - public DirectoryFileSystem[] DirectoryFileSystemCollection => _DirectoryFileSystemCollection; - - [JsonConstructor] - public Navigate(List levels, string sourceDirectory, string directoryRelativePath, string encodedSourceDirectory, FaceFileSystem[] faceFileSystemCollection, DirectoryFileSystem[] directoryFileSystemCollection) - { - _Levels = levels; - _SourceDirectory = sourceDirectory; - _DirectoryRelativePath = directoryRelativePath; - _EncodedSourceDirectory = encodedSourceDirectory; - _FaceFileSystemCollection = faceFileSystemCollection; - _DirectoryFileSystemCollection = directoryFileSystemCollection; - } - - public override string ToString() - { - string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true }); - return result; - } - -} \ No newline at end of file diff --git a/Shared/Models/Properties/INavigate.cs b/Shared/Models/Properties/INavigate.cs deleted file mode 100644 index d03641b..0000000 --- a/Shared/Models/Properties/INavigate.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace View_by_Distance.Shared.Models.Properties; - -public interface INavigate -{ - - public List Levels { get; } - public string SourceDirectory { get; } - public string DirectoryRelativePath { get; } - public FaceFileSystem[] FaceFileSystemCollection { get; } - public DirectoryFileSystem[] DirectoryFileSystemCollection { get; } - -} \ No newline at end of file