cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-04 19:37:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Expand environment variables in save paths

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2017-05-13 21:55:17 -04:00
parent 7d5a3137f9
commit 8c47db7228
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NAPS2.Core/ImportExport/FileNamePlaceholders.cs
View File

@ -39,8 +39,10 @@ namespace NAPS2.ImportExport
{
return null;
}
// Start with environment variables
string result = Environment.ExpandEnvironmentVariables(fileNameWithPath);
// Most placeholders don't need a special case
string result = Placeholders.Aggregate(fileNameWithPath, (current, ph) => current.Replace(ph.Key, ph.Value(dateTime)));
result = Placeholders.Aggregate(result, (current, ph) => current.Replace(ph.Key, ph.Value(dateTime)));
// One does, however
var match = NumberPlaceholderPattern.Match(result);
if (match.Success)