GetLocations update and
NameWithoutExtensionIsIdFormat
This commit is contained in:
@ -181,7 +181,6 @@ public partial class Form : System.Windows.Forms.Form
|
||||
FileHolder fileHolder;
|
||||
bool isIgnoreExtension;
|
||||
string checkFileExtension;
|
||||
bool skipOneAllAreNumbers;
|
||||
DateTime? minimumDateTime;
|
||||
const string jpg = ".jpg";
|
||||
_InnerProgressBar.Step = 1;
|
||||
@ -208,19 +207,15 @@ public partial class Form : System.Windows.Forms.Form
|
||||
continue;
|
||||
isValidImageFormatExtension = _Configuration.PropertyConfiguration.ValidImageFormatExtensions.Contains(fileHolder.ExtensionLowered);
|
||||
isIgnoreExtension = isValidImageFormatExtension && _Configuration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered);
|
||||
if (fileHolder.NameWithoutExtension.Length > 4)
|
||||
if (IProperty.NameWithoutExtensionIsIdFormat(fileHolder))
|
||||
{
|
||||
skipOneAllAreNumbers = fileHolder.NameWithoutExtension[1..].All(l => char.IsNumber(l));
|
||||
if ((skipOneAllAreNumbers && fileHolder.NameWithoutExtension[0] == '-') || (skipOneAllAreNumbers && char.IsNumber(fileHolder.NameWithoutExtension[0])))
|
||||
if (fileHolder.ExtensionLowered == jpeg)
|
||||
{
|
||||
if (fileHolder.ExtensionLowered == jpeg)
|
||||
{
|
||||
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}"));
|
||||
}
|
||||
continue;
|
||||
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}"));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (!isIgnoreExtension && isValidImageFormatExtension)
|
||||
extraLargeBitmapThumbnail = null;
|
||||
|
Reference in New Issue
Block a user