Merge pull request #3967 from duplicati/feature/fix_exclude_regexp

Possible fix for issue #2220

1 files changed, 10 insertions, 2 deletions

diff --git a/Duplicati/Server/webroot/ngax/scripts/services/AppUtils.js b/Duplicati/Server/webroot/ngax/scripts/services/AppUtils.js
index e6ac393fe..728d1456a 100644
--- a/Duplicati/Server/webroot/ngax/scripts/services/AppUtils.js
+++ b/Duplicati/Server/webroot/ngax/scripts/services/AppUtils.js
@@ -131,8 +131,8 @@ backupApp.service('AppUtils', function($rootScope, $timeout, $cookies, DialogSer
             name: gettextCatalog.getString('Exclude files whose names contain'),
             key: '-file*',
             prefix: '-[.*',
-            suffix: '.*[^!]]',
-            rx: '\\-\\[\\.\\*([^\\!]+)\\.\\*\\[\\^\\!\\]\\]'
+            suffix: '[^!]*]',
+            rx: '\\-\\[\\.\\*[\\^\\!\\]\\*\\]'
         }, {
             name: gettextCatalog.getString('Exclude folder'),
             key: '-folder',
@@ -545,6 +545,10 @@ backupApp.service('AppUtils', function($rootScope, $timeout, $cookies, DialogSer
         }
 
         function matches(txt, n) {
+            // We need to escape dirsep if it is the backslash character
+            if (dirsep == '\\')
+                dirsep = '\\\\';
+
             var pre = apputils.replace_all(n.prefix || '', '!', dirsep);
             var suf = apputils.replace_all(n.suffix || '', '!', dirsep);
 
@@ -583,6 +587,10 @@ backupApp.service('AppUtils', function($rootScope, $timeout, $cookies, DialogSer
 
         body = body || '';
 
+        // We need to escape dirsep if it is the backslash character
+        if (dirsep == '\\')
+            dirsep = '\\\\';
+
         var f = this.filterTypeMap[type];
         var pre = this.replace_all(f.prefix || '', '!', dirsep);
         var suf = this.replace_all(f.suffix || '', '!', dirsep);