diff --git a/Rename/Rename.cs b/Rename/Rename.cs index b2b6bb9..57f3573 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -493,7 +493,7 @@ public partial class Rename : IRename, IDisposable if (File.Exists(checkFile)) continue; } - (directoryName, _) = IPath.GetDirectoryNameAndIndex(appSettings.ResultSettings, record.ExifDirectory.FilePath.Id.Value); + (directoryName, _) = IPath.GetDirectoryNameAndIndex(appSettings.ResultSettings, record.ExifDirectory.FilePath); jsonFile = Path.Combine(jsonFileSubDirectory, directoryName, $"{record.ExifDirectory.FilePath.Id.Value}{checkFileExtension}.json"); if (record.JsonFile != jsonFile) { diff --git a/Shared/Models/Stateless/IPath.cs b/Shared/Models/Stateless/IPath.cs index a48af84..fdde4c0 100644 --- a/Shared/Models/Stateless/IPath.cs +++ b/Shared/Models/Stateless/IPath.cs @@ -61,21 +61,11 @@ public interface IPath static string GetDirectory(string sourceDirectory, int level, string directoryName) => XPath.GetDirectory(sourceDirectory, level, directoryName); - (string, int) TestStatic_GetDirectoryNameAndIndex(ResultSettings resultSettings, FileHolder fileHolder) => - GetDirectoryNameAndIndex(resultSettings, fileHolder); - static (string, int) GetDirectoryNameAndIndex(ResultSettings resultSettings, FileHolder fileHolder) => - XPath.GetDirectoryNameAndIndex(resultSettings, fileHolder); - (string, int) TestStatic_GetDirectoryNameAndIndex(ResultSettings resultSettings, FilePath filePath) => GetDirectoryNameAndIndex(resultSettings, filePath); static (string, int) GetDirectoryNameAndIndex(ResultSettings resultSettings, FilePath filePath) => XPath.GetDirectoryNameAndIndex(resultSettings, filePath); - (string, int) TestStatic_GetDirectoryNameAndIndex(ResultSettings resultSettings, int id) => - GetDirectoryNameAndIndex(resultSettings, id); - static (string, int) GetDirectoryNameAndIndex(ResultSettings resultSettings, int id) => - XPath.GetDirectoryNameAndIndex(resultSettings, id); - ReadOnlyDictionary> TestStatic_GetKeyValuePairs(ResultSettings resultSettings, string? resultsFullGroupDirectory, string[]? jsonGroups) => GetKeyValuePairs(resultSettings, resultsFullGroupDirectory, jsonGroups); static ReadOnlyDictionary> GetKeyValuePairs(ResultSettings resultSettings, string? resultsFullGroupDirectory, string[]? jsonGroups) => diff --git a/Shared/Models/Stateless/XPath.cs b/Shared/Models/Stateless/XPath.cs index 2f3fad0..585c00f 100644 --- a/Shared/Models/Stateless/XPath.cs +++ b/Shared/Models/Stateless/XPath.cs @@ -290,12 +290,6 @@ internal abstract class XPath return new(result, converted); } - internal static (string, int) GetDirectoryNameAndIndex(ResultSettings resultSettings, FileHolder fileHolder) - { - (string result, int converted) = GetDirectoryNameAndIndex(resultSettings.ResultAllInOneSubdirectoryLength, fileHolder.NameWithoutExtension); - return new(result, converted); - } - internal static (string, int) GetDirectoryNameAndIndex(ResultSettings resultSettings, FilePath filePath) { string result; diff --git a/global.json b/global.json new file mode 100644 index 0000000..342799f --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "rollForward": "latestMinor", + "version": "9.0.103" + } +} \ No newline at end of file