Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
fix(naming): don't expand tokens inside the source file name
Bortlesboatcc1f13b31c0d
diff --git a/src/Filee.Core/Presets/OutputPathResolver.cs b/src/Filee.Core/Presets/OutputPathResolver.csindex afbda408..57fa8d12 100644--- a/src/Filee.Core/Presets/OutputPathResolver.cs+++ b/src/Filee.Core/Presets/OutputPathResolver.cs@@ -7,7 +7,7 @@ using Filee.Core.Formats;namespace Filee.Core.Presets;/// <summary>Resolves output file paths from <see cref="OutputRule"/>s.</summary>-public static class OutputPathResolver+public static partial class OutputPathResolver{/// <summary>Values available to file name pattern tokens.</summary>public readonly record struct Tokens(string SourcePath, string PresetName, int Index, DateTime Now);@@ -119,16 +119,22 @@ public static class OutputPathResolverif (string.IsNullOrWhiteSpace(pattern))pattern = "{name}";- var ext = FormatRegistry.ExtensionOf(tokens.SourcePath);- return pattern- .Replace("{name}", FormatRegistry.NameWithoutExtension(tokens.SourcePath), StringComparison.OrdinalIgnoreCase)- .Replace("{ext}", ext, StringComparison.OrdinalIgnoreCase)- .Replace("{preset}", tokens.PresetName, StringComparison.OrdinalIgnoreCase)- .Replace("{date}", tokens.Now.ToString("yyyyMMdd"), StringComparison.OrdinalIgnoreCase)- .Replace("{time}", tokens.Now.ToString("HHmmss"), StringComparison.OrdinalIgnoreCase)- .Replace("{index}", tokens.Index.ToString(), StringComparison.OrdinalIgnoreCase);+ // One pass over the pattern only: a source named "Minutes {date}.docx" keeps "{date}" in its name instead of+ // having the token inside the inserted name expanded too.+ return Token().Replace(pattern, match => match.Groups[1].Value.ToLowerInvariant() switch+ {+ "name" => FormatRegistry.NameWithoutExtension(tokens.SourcePath),+ "ext" => FormatRegistry.ExtensionOf(tokens.SourcePath),+ "preset" => tokens.PresetName,+ "date" => tokens.Now.ToString("yyyyMMdd"),+ "time" => tokens.Now.ToString("HHmmss"),+ _ => tokens.Index.ToString(),+ });}+ [GeneratedRegex(@"\{(name|ext|preset|date|time|index)\}", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]+ private static partial Regex Token();+/// <summary>Removes characters that are invalid in file names on any supported OS.</summary>public static string Sanitize(string name, string fallback){diff --git a/tests/Filee.Core.Tests/OutputPathResolverTests.cs b/tests/Filee.Core.Tests/OutputPathResolverTests.csindex cf98df7d..178c8b8a 100644--- a/tests/Filee.Core.Tests/OutputPathResolverTests.cs+++ b/tests/Filee.Core.Tests/OutputPathResolverTests.cs@@ -106,6 +106,15 @@ public class OutputPathResolverTestsAssert.Equal("a_PNG_20260930_3__.png", Path.GetFileName(path));}+ [Fact]+ public void Tokens_in_the_source_name_are_kept_as_they_are()+ {+ var rule = new OutputRule { FileNamePattern = "{name}_{index}" };+ var path = OutputPathResolver.Resolve(rule, Tokens(Path.Combine("C:", "x", "Minutes {date} {Index}.docx"), 3), "pdf", _ => false);++ Assert.Equal("Minutes {date} {Index}_3.pdf", Path.GetFileName(path));+ }+[Fact]public void Subfolder_name_supports_tokens(){