phares3757/aa
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed time-span and directory-dictionary

Browse Source
This commit is contained in:
Mike Phares
2025-10-22 18:54:05 -07:00
parent 2b13c8c198
commit 69285cac1c
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rename/AA.Rename.csproj
View File

@ -44,7 +44,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CliWrap" Version="3.8.2" /> <PackageReference Include="CliWrap" Version="3.8.2" />
<PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.12" /> <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />

1
Rename/Models/RenameSettings.cs
View File

@ -7,7 +7,6 @@ namespace View_by_Distance.Rename.Models;
public record RenameSettings(string Company, public record RenameSettings(string Company,
string DefaultMaker, string DefaultMaker,
Dictionary<string, string?> DirectoryDictionary,
string? FirstPassFile, string? FirstPassFile,
bool ForceNewId, bool ForceNewId,
bool InPlace, bool InPlace,

14
Rename/Rename.cs
View File

@ -273,7 +273,6 @@ public partial class Rename : IRename, IDisposable
{ {
List<FirstPass> results = []; List<FirstPass> results = [];
int index = -1; int index = -1;
TimeSpan timeSpan;
foreach (KeyValuePair<string, List<FileHolder>> keyValuePair in keyValuePairs) foreach (KeyValuePair<string, List<FileHolder>> keyValuePair in keyValuePairs)
{ {
index += 1; index += 1;
@ -287,9 +286,6 @@ public partial class Rename : IRename, IDisposable
if (keyValuePair.Value.Count > 2) if (keyValuePair.Value.Count > 2)
throw new NotSupportedException("Too many sidecar files!"); throw new NotSupportedException("Too many sidecar files!");
SetFirstPassCollection(logger, appSettings, rename, ids, metadata, index, keyValuePair, results); 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; return results;
} }
@ -643,7 +639,6 @@ public partial class Rename : IRename, IDisposable
{ {
if (record.ExifDirectory.FilePath.FullName[..2] != directoryInfo.FullName[..2]) if (record.ExifDirectory.FilePath.FullName[..2] != directoryInfo.FullName[..2])
isWrongYear = null; isWrongYear = null;
string directoryName;
string tfw = GetTFW(record, isWrongYear); string tfw = GetTFW(record, isWrongYear);
string? maker = IMetaBase.GetMaker(record.ExifDirectory); string? maker = IMetaBase.GetMaker(record.ExifDirectory);
string rootDirectory = appSettings.ResultSettings.RootDirectory; 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? 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 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]}"; 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) string directoryName = GetDirectoryName(year, tfw, segments[0], splat, seasonValue, seasonName, makerSplit);
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;
}
result = Path.GetFullPath(Path.Combine(rootDirectory, contains, directoryName)); result = Path.GetFullPath(Path.Combine(rootDirectory, contains, directoryName));
} }
} }