From 69285cac1c70e57225d34f20fdb440a94807a279 Mon Sep 17 00:00:00 2001 From: "mikep@034E8FF1ED4D1F6" Date: Wed, 22 Oct 2025 18:54:05 -0700 Subject: [PATCH] Removed time-span and directory-dictionary --- Rename/AA.Rename.csproj | 2 +- Rename/Models/RenameSettings.cs | 1 - Rename/Rename.cs | 14 +------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Rename/AA.Rename.csproj b/Rename/AA.Rename.csproj index a13c2ed..89cec88 100644 --- a/Rename/AA.Rename.csproj +++ b/Rename/AA.Rename.csproj @@ -44,7 +44,7 @@ - + diff --git a/Rename/Models/RenameSettings.cs b/Rename/Models/RenameSettings.cs index f6e9e4e..5cb4530 100644 --- a/Rename/Models/RenameSettings.cs +++ b/Rename/Models/RenameSettings.cs @@ -7,7 +7,6 @@ namespace View_by_Distance.Rename.Models; public record RenameSettings(string Company, string DefaultMaker, - Dictionary DirectoryDictionary, string? FirstPassFile, bool ForceNewId, bool InPlace, diff --git a/Rename/Rename.cs b/Rename/Rename.cs index ae222f9..bea5565 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -273,7 +273,6 @@ public partial class Rename : IRename, IDisposable { List results = []; int index = -1; - TimeSpan timeSpan; foreach (KeyValuePair> keyValuePair in keyValuePairs) { index += 1; @@ -287,9 +286,6 @@ public partial class Rename : IRename, IDisposable if (keyValuePair.Value.Count > 2) throw new NotSupportedException("Too many sidecar files!"); SetFirstPassCollection(logger, appSettings, rename, ids, metadata, index, keyValuePair, results); - timeSpan = new(DateTime.Now.Ticks - rename.Ticks); - if (timeSpan.TotalMilliseconds > appSettings.RenameSettings.MaxMilliSecondsPerCall) - break; } return results; } @@ -643,7 +639,6 @@ public partial class Rename : IRename, IDisposable { if (record.ExifDirectory.FilePath.FullName[..2] != directoryInfo.FullName[..2]) isWrongYear = null; - string directoryName; string tfw = GetTFW(record, isWrongYear); string? maker = IMetaBase.GetMaker(record.ExifDirectory); string rootDirectory = appSettings.ResultSettings.RootDirectory; @@ -652,14 +647,7 @@ public partial class Rename : IRename, IDisposable string? splat = checkDirectoryName.Length > 3 && checkDirectoryName[^3..][1] == '!' ? checkDirectoryName[^3..] : null; string contains = record.ExifDirectory.FilePath.Id is null || ids.Contains(record.ExifDirectory.FilePath.Id.Value) ? "_ Exists _" : "_ New-Destination _"; string makerSplit = string.IsNullOrEmpty(maker) ? string.IsNullOrEmpty(appSettings.RenameSettings.DefaultMaker) ? string.Empty : appSettings.RenameSettings.DefaultMaker : $" {maker.Split(' ')[0]}"; - if (!string.IsNullOrEmpty(splat) || isWrongYear is null || isWrongYear.Value || appSettings.RenameSettings.DirectoryDictionary.Count < 2) - directoryName = GetDirectoryName(year, tfw, segments[0], splat, seasonValue, seasonName, makerSplit); - else - { - directoryName = record.DateTime.ToString("yyyy-MM-dd"); - if (appSettings.RenameSettings.DirectoryDictionary.TryGetValue(directoryName, out string? value) && !string.IsNullOrEmpty(value)) - directoryName = value; - } + string directoryName = GetDirectoryName(year, tfw, segments[0], splat, seasonValue, seasonName, makerSplit); result = Path.GetFullPath(Path.Combine(rootDirectory, contains, directoryName)); } }