From bb077c87b355ec72965485a674aabc829d46723f Mon Sep 17 00:00:00 2001 From: n1474335 Date: Wed, 24 Jan 2018 15:50:05 +0000 Subject: [PATCH] 'Extract file paths' operation now handles 8.3 windows file paths correctly. --- src/core/operations/Extract.js | 2 +- src/core/operations/Regex.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/operations/Extract.js b/src/core/operations/Extract.js index 221b2823..da088392 100755 --- a/src/core/operations/Extract.js +++ b/src/core/operations/Extract.js @@ -287,7 +287,7 @@ const Extract = { includeUnixPath = args[1], displayTotal = args[2], winDrive = "[A-Z]:\\\\", - winName = "[A-Z\\d][A-Z\\d\\- '_\\(\\)]{0,61}", + winName = "[A-Z\\d][A-Z\\d\\- '_\\(\\)~]{0,61}", winExt = "[A-Z\\d]{1,6}", winPath = winDrive + "(?:" + winName + "\\\\?)*" + winName + "(?:\\." + winExt + ")?", diff --git a/src/core/operations/Regex.js b/src/core/operations/Regex.js index 9c6b2f8e..fd2b7989 100644 --- a/src/core/operations/Regex.js +++ b/src/core/operations/Regex.js @@ -44,7 +44,7 @@ const Regex = { }, { name: "Windows file path", - value: "([A-Za-z]):\\\\((?:[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)]{0,61}\\\\?)*[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)]{0,61})(\\.[A-Za-z\\d]{1,6})?" + value: "([A-Za-z]):\\\\((?:[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)~]{0,61}\\\\?)*[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)]{0,61})(\\.[A-Za-z\\d]{1,6})?" }, { name: "UNIX file path",