Create directory, check files and RecycleOption
This commit is contained in:
parent
fbaafe0137
commit
c5986b5cba
@ -116,6 +116,8 @@ public class DateGroup
|
|||||||
// }
|
// }
|
||||||
string aResultsFullGroupDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(A_Property));
|
string aResultsFullGroupDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(A_Property));
|
||||||
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
||||||
|
if (!Directory.Exists(aPropertySingletonDirectory))
|
||||||
|
_ = Directory.CreateDirectory(aPropertySingletonDirectory);
|
||||||
(int f, Container[] containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(propertyConfiguration, aPropertySingletonDirectory);
|
(int f, Container[] containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(propertyConfiguration, aPropertySingletonDirectory);
|
||||||
A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory, aResultsFullGroupDirectory);
|
A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory, aResultsFullGroupDirectory);
|
||||||
if (propertyLogic.ExceptionsDirectories.Any())
|
if (propertyLogic.ExceptionsDirectories.Any())
|
||||||
|
@ -61,9 +61,11 @@ public class DeleteByDistinct
|
|||||||
fileInfo = new(file);
|
fileInfo = new(file);
|
||||||
if (fileInfo.Length < 100)
|
if (fileInfo.Length < 100)
|
||||||
continue;
|
continue;
|
||||||
|
if (appSettings.RecycleOption)
|
||||||
|
checkLength = 1;
|
||||||
|
else
|
||||||
checkLength = fileInfo.Length;
|
checkLength = fileInfo.Length;
|
||||||
// checkLength = (long)Math.Round((double)(fileInfo.Length / 1000));
|
// checkLength = (long)Math.Round((double)(fileInfo.Length / 1000));
|
||||||
// checkLength = 1;
|
|
||||||
if (!fileSizeToCollection.TryGetValue(checkLength, out fileTicksToNames))
|
if (!fileSizeToCollection.TryGetValue(checkLength, out fileTicksToNames))
|
||||||
{
|
{
|
||||||
fileSizeToCollection.Add(checkLength, new());
|
fileSizeToCollection.Add(checkLength, new());
|
||||||
@ -76,9 +78,11 @@ public class DeleteByDistinct
|
|||||||
// if (!fileTicksToNames.TryGetValue(fileInfo.LastWriteTime.Ticks, out fileNames))
|
// if (!fileTicksToNames.TryGetValue(fileInfo.LastWriteTime.Ticks, out fileNames))
|
||||||
// throw new Exception();
|
// throw new Exception();
|
||||||
// }
|
// }
|
||||||
|
if (appSettings.RecycleOption)
|
||||||
|
checkTicks = 1;
|
||||||
|
else
|
||||||
checkTicks = new DateTime(ticks).Ticks;
|
checkTicks = new DateTime(ticks).Ticks;
|
||||||
// checkTicks = new DateTime(fileInfo.LastWriteTime.Year, fileInfo.LastWriteTime.Month, fileInfo.LastWriteTime.Day).Ticks;
|
// checkTicks = new DateTime(fileInfo.LastWriteTime.Year, fileInfo.LastWriteTime.Month, fileInfo.LastWriteTime.Day).Ticks;
|
||||||
// checkTicks = 1;
|
|
||||||
if (!fileTicksToNames.TryGetValue(checkTicks, out fileNames))
|
if (!fileTicksToNames.TryGetValue(checkTicks, out fileNames))
|
||||||
{
|
{
|
||||||
fileTicksToNames.Add(checkTicks, new());
|
fileTicksToNames.Add(checkTicks, new());
|
||||||
@ -112,11 +116,20 @@ public class DeleteByDistinct
|
|||||||
if (consoleKey is not null && consoleKey.Value == ConsoleKey.Y)
|
if (consoleKey is not null && consoleKey.Value == ConsoleKey.Y)
|
||||||
{
|
{
|
||||||
foreach (string file in deletedFiles)
|
foreach (string file in deletedFiles)
|
||||||
|
{
|
||||||
|
if (!appSettings.RecycleOption)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{ File.Delete(file); }
|
{ File.Delete(file); }
|
||||||
catch (Exception) { }
|
catch (Exception) { }
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{ Microsoft.VisualBasic.FileIO.FileSystem.DeleteFile(file, Microsoft.VisualBasic.FileIO.UIOption.OnlyErrorDialogs, Microsoft.VisualBasic.FileIO.RecycleOption.SendToRecycleBin); }
|
||||||
|
catch (Exception) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
|
totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
|
||||||
message = $") Looking for empty directories from <{directory}> - {totalSeconds} total second(s)";
|
message = $") Looking for empty directories from <{directory}> - {totalSeconds} total second(s)";
|
||||||
progressBar = new(4, message, options);
|
progressBar = new(4, message, options);
|
||||||
|
@ -10,16 +10,24 @@ public class AppSettings
|
|||||||
public string CompareRootDirectory { init; get; }
|
public string CompareRootDirectory { init; get; }
|
||||||
public int MaxDegreeOfParallelism { init; get; }
|
public int MaxDegreeOfParallelism { init; get; }
|
||||||
public string OutputExtension { init; get; }
|
public string OutputExtension { init; get; }
|
||||||
|
public bool RecycleOption { init; get; }
|
||||||
public string SearchPattern { init; get; }
|
public string SearchPattern { init; get; }
|
||||||
public string WorkingDirectoryName { init; get; }
|
public string WorkingDirectoryName { init; get; }
|
||||||
|
|
||||||
[JsonConstructor]
|
[JsonConstructor]
|
||||||
public AppSettings(string company, string compareRootDirectory, int maxDegreeOfParallelism, string outputExtension, string searchPattern, string workingDirectoryName)
|
public AppSettings(string company,
|
||||||
|
string compareRootDirectory,
|
||||||
|
int maxDegreeOfParallelism,
|
||||||
|
string outputExtension,
|
||||||
|
bool recycleOption,
|
||||||
|
string searchPattern,
|
||||||
|
string workingDirectoryName)
|
||||||
{
|
{
|
||||||
Company = company;
|
Company = company;
|
||||||
CompareRootDirectory = compareRootDirectory;
|
CompareRootDirectory = compareRootDirectory;
|
||||||
MaxDegreeOfParallelism = maxDegreeOfParallelism;
|
MaxDegreeOfParallelism = maxDegreeOfParallelism;
|
||||||
OutputExtension = outputExtension;
|
OutputExtension = outputExtension;
|
||||||
|
RecycleOption = recycleOption;
|
||||||
SearchPattern = searchPattern;
|
SearchPattern = searchPattern;
|
||||||
WorkingDirectoryName = workingDirectoryName;
|
WorkingDirectoryName = workingDirectoryName;
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,7 @@ public class AppSettings
|
|||||||
public string CompareRootDirectory { get; set; }
|
public string CompareRootDirectory { get; set; }
|
||||||
public int? MaxDegreeOfParallelism { get; set; }
|
public int? MaxDegreeOfParallelism { get; set; }
|
||||||
public string OutputExtension { get; set; }
|
public string OutputExtension { get; set; }
|
||||||
|
public bool? RecycleOption { get; set; }
|
||||||
public string SearchPattern { get; set; }
|
public string SearchPattern { get; set; }
|
||||||
public string WorkingDirectoryName { get; set; }
|
public string WorkingDirectoryName { get; set; }
|
||||||
|
|
||||||
@ -28,11 +29,14 @@ public class AppSettings
|
|||||||
Models.AppSettings result;
|
Models.AppSettings result;
|
||||||
if (appSettings?.MaxDegreeOfParallelism is null)
|
if (appSettings?.MaxDegreeOfParallelism is null)
|
||||||
throw new NullReferenceException(nameof(appSettings.MaxDegreeOfParallelism));
|
throw new NullReferenceException(nameof(appSettings.MaxDegreeOfParallelism));
|
||||||
|
if (appSettings?.RecycleOption is null)
|
||||||
|
throw new NullReferenceException(nameof(appSettings.RecycleOption));
|
||||||
result = new(
|
result = new(
|
||||||
appSettings.Company,
|
appSettings.Company,
|
||||||
appSettings.CompareRootDirectory,
|
appSettings.CompareRootDirectory,
|
||||||
appSettings.MaxDegreeOfParallelism.Value,
|
appSettings.MaxDegreeOfParallelism.Value,
|
||||||
appSettings.OutputExtension,
|
appSettings.OutputExtension,
|
||||||
|
appSettings.RecycleOption.Value,
|
||||||
appSettings.SearchPattern,
|
appSettings.SearchPattern,
|
||||||
appSettings.WorkingDirectoryName
|
appSettings.WorkingDirectoryName
|
||||||
);
|
);
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MaxDegreeOfParallelism": 6,
|
"MaxDegreeOfParallelism": 6,
|
||||||
|
"RecycleOption": true,
|
||||||
"SearchPattern": "*.*",
|
"SearchPattern": "*.*",
|
||||||
"Serilog": {
|
"Serilog": {
|
||||||
"MinimumLevel": "Debug"
|
"MinimumLevel": "Debug"
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MaxDegreeOfParallelism": 6,
|
"MaxDegreeOfParallelism": 6,
|
||||||
|
"RecycleOption": false,
|
||||||
"SearchPattern": "*.jpg",
|
"SearchPattern": "*.jpg",
|
||||||
"Serilog": {
|
"Serilog": {
|
||||||
"Using": [
|
"Using": [
|
||||||
|
@ -1044,6 +1044,8 @@ public partial class DlibDotNet
|
|||||||
{
|
{
|
||||||
progressBar.Tick();
|
progressBar.Tick();
|
||||||
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
||||||
|
if (!Directory.Exists(aPropertySingletonDirectory))
|
||||||
|
_ = Directory.CreateDirectory(aPropertySingletonDirectory);
|
||||||
(t, containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(_Configuration.PropertyConfiguration, aPropertySingletonDirectory);
|
(t, containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(_Configuration.PropertyConfiguration, aPropertySingletonDirectory);
|
||||||
progressBar.Tick();
|
progressBar.Tick();
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,24 @@ public class Rename
|
|||||||
foreach (string file in files)
|
foreach (string file in files)
|
||||||
{
|
{
|
||||||
progressBar.Tick();
|
progressBar.Tick();
|
||||||
|
// else if (file.EndsWith(".del") && !file.Contains(".jpg"))
|
||||||
|
// {
|
||||||
|
// checkFile = string.Concat(file[..^4], ".jpg");
|
||||||
|
// if (File.Exists(checkFile))
|
||||||
|
// continue;
|
||||||
|
// File.Move(file, checkFile);
|
||||||
|
// continue;
|
||||||
|
// }
|
||||||
|
if (!file.EndsWith(".jpg.del"))
|
||||||
fileHolder = new(file);
|
fileHolder = new(file);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
checkFile = file[..^4];
|
||||||
|
if (File.Exists(checkFile))
|
||||||
|
continue;
|
||||||
|
File.Move(file, checkFile);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (fileHolder.ExtensionLowered == ".id" || fileHolder.DirectoryName is null)
|
if (fileHolder.ExtensionLowered == ".id" || fileHolder.DirectoryName is null)
|
||||||
continue;
|
continue;
|
||||||
if (files.Contains($"{fileHolder.FullName}.id"))
|
if (files.Contains($"{fileHolder.FullName}.id"))
|
||||||
@ -127,8 +144,16 @@ public class Rename
|
|||||||
if (fileHolder.ExtensionLowered == jpeg)
|
if (fileHolder.ExtensionLowered == jpeg)
|
||||||
{
|
{
|
||||||
if (File.Exists($"{fileHolder.FullName}.id"))
|
if (File.Exists($"{fileHolder.FullName}.id"))
|
||||||
File.Move($"{fileHolder.FullName}.id", Path.Combine(fileHolder.DirectoryName, $"{fileHolder.NameWithoutExtension}{jpg}.id"));
|
{
|
||||||
File.Move(fileHolder.FullName, Path.Combine(fileHolder.DirectoryName, $"{fileHolder.NameWithoutExtension}{jpg}"));
|
checkFile = Path.Combine(fileHolder.DirectoryName, $"{fileHolder.NameWithoutExtension}{jpg}.id");
|
||||||
|
if (File.Exists(checkFile))
|
||||||
|
continue;
|
||||||
|
File.Move($"{fileHolder.FullName}.id", checkFile);
|
||||||
|
}
|
||||||
|
checkFile = Path.Combine(fileHolder.DirectoryName, $"{fileHolder.NameWithoutExtension}{jpg}");
|
||||||
|
if (File.Exists(checkFile))
|
||||||
|
continue;
|
||||||
|
File.Move(fileHolder.FullName, checkFile);
|
||||||
}
|
}
|
||||||
if (nameWithoutExtensionIsIdFormat)
|
if (nameWithoutExtensionIsIdFormat)
|
||||||
continue;
|
continue;
|
||||||
|
@ -38,7 +38,7 @@ internal abstract partial class XDirectory
|
|||||||
string[] directories = Directory.GetDirectories(directory, directorySearchFilter, SearchOption.TopDirectoryOnly);
|
string[] directories = Directory.GetDirectories(directory, directorySearchFilter, SearchOption.TopDirectoryOnly);
|
||||||
foreach (string innerDirectory in directories)
|
foreach (string innerDirectory in directories)
|
||||||
results.Add(Directory.GetFiles(innerDirectory, fileSearchFilter, SearchOption.AllDirectories));
|
results.Add(Directory.GetFiles(innerDirectory, fileSearchFilter, SearchOption.AllDirectories));
|
||||||
int ceilingAverage = GetCeilingAverage(results);
|
int ceilingAverage = results.Any() ? GetCeilingAverage(results) : 0;
|
||||||
results = GetFilesCollection(results, ceilingAverage);
|
results = GetFilesCollection(results, ceilingAverage);
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
@ -150,6 +150,8 @@ public class UnitTestResize
|
|||||||
_Logger.Information(_Configuration.ModelDirectory);
|
_Logger.Information(_Configuration.ModelDirectory);
|
||||||
A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory);
|
A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory);
|
||||||
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
||||||
|
if (!Directory.Exists(aPropertySingletonDirectory))
|
||||||
|
_ = Directory.CreateDirectory(aPropertySingletonDirectory);
|
||||||
(ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) = C_Resize.GetTuple(_Configuration.OutputExtension, _Configuration.OutputQuality);
|
(ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) = C_Resize.GetTuple(_Configuration.OutputExtension, _Configuration.OutputQuality);
|
||||||
B_Metadata metadata = new(_Configuration.PropertyConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata, bResultsFullGroupDirectory);
|
B_Metadata metadata = new(_Configuration.PropertyConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata, bResultsFullGroupDirectory);
|
||||||
_ = metadata.ToString();
|
_ = metadata.ToString();
|
||||||
|
@ -225,6 +225,8 @@ public class UnitTestFace
|
|||||||
_Logger.Information(_Configuration.ModelDirectory);
|
_Logger.Information(_Configuration.ModelDirectory);
|
||||||
A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory);
|
A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory);
|
||||||
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
|
||||||
|
if (!Directory.Exists(aPropertySingletonDirectory))
|
||||||
|
_ = Directory.CreateDirectory(aPropertySingletonDirectory);
|
||||||
(ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) = C_Resize.GetTuple(_Configuration.OutputExtension, _Configuration.OutputQuality);
|
(ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) = C_Resize.GetTuple(_Configuration.OutputExtension, _Configuration.OutputQuality);
|
||||||
B_Metadata metadata = new(_Configuration.PropertyConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata, bResultsFullGroupDirectory);
|
B_Metadata metadata = new(_Configuration.PropertyConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata, bResultsFullGroupDirectory);
|
||||||
_ = metadata.ToString();
|
_ = metadata.ToString();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user