From 47bc010b3cfbde0a6bd33cb01e6497a3490d2603 Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@hexad.dk>
Date: Sat, 7 Dec 2013 15:22:51 +0100
Subject: [PATCH] Added test-filters command

---
 Duplicati/CommandLine/Commands.cs             |  20 +
 Duplicati/CommandLine/Program.cs              |   1 +
 Duplicati/CommandLine/help.txt                | 813 +++++++++---------
 .../Library/Interface/ResultInterfaces.cs     |   7 +
 Duplicati/Library/Main/Controller.cs          |  11 +
 .../Main/Duplicati.Library.Main.csproj        |   1 +
 Duplicati/Library/Main/Enums.cs               |   3 +-
 .../Library/Main/Operation/BackupHandler.cs   | 115 ++-
 .../Main/Operation/TestFilterHandler.cs       |  93 ++
 Duplicati/Library/Main/ResultClasses.cs       |   9 +
 .../Modules/Builtin/ConsolePasswordInput.cs   |   2 +-
 Duplicati/Library/Utility/FilterExpression.cs |  50 +-
 Duplicati/Library/Utility/IFilter.cs          |  11 +-
 .../Library/Utility/JoinedFilterExpression.cs |  14 +-
 Duplicati/Library/Utility/Utility.cs          |   3 +-
 15 files changed, 694 insertions(+), 459 deletions(-)
 create mode 100644 Duplicati/Library/Main/Operation/TestFilterHandler.cs

diff --git a/Duplicati/CommandLine/Commands.cs b/Duplicati/CommandLine/Commands.cs
index 8fbed1b63..f569d9ed9 100644
--- a/Duplicati/CommandLine/Commands.cs
+++ b/Duplicati/CommandLine/Commands.cs
@@ -695,6 +695,26 @@ namespace Duplicati.CommandLine
             
             return 0;
         }
+        
+        public static int TestFilters(List<string> args, Dictionary<string, string> options, Library.Utility.IFilter filter)
+        {
+            if (args == null || args.Count < 1)
+            {
+                Console.WriteLine("No source paths given");
+                return 200;
+            }
+        
+            options["verbose"] = "true";
+        
+            using(var i = new Library.Main.Controller("dummy://", options, new ConsoleOutput(options)))
+            {
+                var result = i.TestFilter(args.ToArray(), filter);
+                
+                Console.WriteLine("Matched {0} files ({1})", result.FileCount, Duplicati.Library.Utility.Utility.FormatSizeString(result.FileSize));
+            }
+            
+            return 0;
+        }
     }
 }
 
diff --git a/Duplicati/CommandLine/Program.cs b/Duplicati/CommandLine/Program.cs
index 5d430f17b..e3406ffc5 100644
--- a/Duplicati/CommandLine/Program.cs
+++ b/Duplicati/CommandLine/Program.cs
@@ -183,6 +183,7 @@ namespace Duplicati.CommandLine
                 knownCommands["compare"] = Commands.ListChanges;
                 knownCommands["test"] = Commands.Test;
                 knownCommands["verify"] = Commands.Test;
+                knownCommands["test-filters"] = Commands.TestFilters;
 
                 if (verbose)
                 {
diff --git a/Duplicati/CommandLine/help.txt b/Duplicati/CommandLine/help.txt
index 195181e42..4919d9796 100644
--- a/Duplicati/CommandLine/help.txt
+++ b/Duplicati/CommandLine/help.txt
@@ -1,403 +1,412 @@
-# This file is the help for the Duplicati Command Line Client. It shows what 
-# commands the CLI understands and what the outputs are. Sometimes we used
-# placeholders for options. In that case descriptions are taken directly from
-# the modules. Sometimes we described options here. The reason for that is, 
-# that we found the new description much better but did not want to create a 
-# need for translation as many options are described in the UI as well and 
-# they are translated there.
-# =============================================================================
-> duplicati.commandline.exe
-> duplicati.commandline.exe help
-
-See duplicati.commandline.exe help <topic> for more information.
-  Examples: example
-  Commands: backup, find, restore, delete, compact, test, compare, repair
-  Debugging: debug, logging, create-report
-  Targets: %BACKENDS%
-  Modules: %ENCRYPTIONMODULES%, %COMPRESSIONMODULES%, %GENERICMODULES%
-  Formats: date, time, size, encryption, compression
-  Advanced: mail, advanced, returncodes, filter, <option>
-
-http://www.duplicati.com/              Version: %VERSION%
-
-
-
-# =============================================================================
-> duplicati.commandline.exe help example
-> duplicati.commandline.exe help examples
-
-Make an encrypted backup
-========================
-  The following command will make an encrypted backup and store it on an FTP server. As no passphrase is specified, the user is prompted for a password. The upload speed is throttled to 500kB/s. Backups older than onemonth are considered old. Old backups are deleted automatically. The maximum file size is limited to 50MB (default). 
-  
-  %MONO%"%APP_PATH%" backup ftp://me:example.com@ftp.example.com/target "%EXAMPLE_SOURCE_PATH%" --throttle=500kB
-  
-Search for files in a backup
-============================
-  The backup can be searched for specific files. The following command returns all files "%EXAMPLE_SOURCE_FILE%" of the last backup. File names can also contain the wildcards * and ?. 
-  
-  %MONO%"%APP_PATH%" find ftp://me:example.com@ftp.example.com/target "%EXAMPLE_SOURCE_FILE%"
-
-Restore a specific file
-=======================
-  The following command will restore "%EXAMPLE_SOURCE_FILE%" from the backup in the latest version to its original destination and overwrite an existing file.
-  
-  %MONO%"%APP_PATH%" restore ftp://me:example.com@ftp.example.com/target "%EXAMPLE_SOURCE_FILE%" --overwrite
-    
-
-# =============================================================================
-> duplicati.commandline.exe help backup
-  
-Usage: backup <storage-URL> "<source-path>" [<options>]
-
-  Makes a backup of <source-path> and stores it in <storage-URL>. The format for <storage-URL> is protocol://username:password@hostname:port/path?backend
-  _option1=value1&backend_option2=value2. Multiple source paths can be specified if they are separated by a space. Defaults are: The maximum file size is 100MB, backups are deleted when they are older than one month.
-
-  <username> must not contain : and <password> must not contain @. If they do, specify username and password using --auth-username and --auth-password.
-
-  --auth-password=<string>
-    The password that is required to authenticate with the server the backup is stored on.
-  --auth-username=<string>
-    The username that is required to authenticate with the server the backup is stored on.
-  --no-encryption=<boolean>
-    Use this to make an unencrypted backup.
-  --passphrase
-    This is the passphrase that is used to encrypt all data before it is uploaded. If an empty passphrase is specified, the backup will not be encrypted. This is the same as using --no-encryption.
-  --prefix=<string>
-    Replaces the default "duplicati" with <string> in the file names of the backup files. It is required to specify different prefixes if multiple backups are stored in the same target folder.
-
-
-# =============================================================================
-> duplicati.commandline.exe help find
-
-Usage: find <storage-URL> ["<filename>"] [<options>]
-
-  Finds specific files in specific backups. If <filename> is specified, all occurrences of <filename> in the backup are listed. <filename> can contain * and ? as wildcards. File names in [brackets] are interpreted as regular expression. Latest backup is searched by default. If entire path is specified, all available versions of the file are listed. If no <filename> is specified, a list of all available backups is shown.
-
-  --time=<time>
-    Shows what the files looked like at a specific time. Absolute and relative times can be specified.
-  --version=<int>
-    Shows what the files looked like in a specific backup. If no version is specified the latest backup (version=0) will be used. If nothing is found, older backups will besearched automatically.
-  --include=<string>
-    Reduces the list of files in a backup to those that match the provided string. This is applied before the search is executed. 
-  --exclude=<string>
-    Removes matching files from the list of files in a backup. This is applied before the search is executed. 
-
-
-
-# =============================================================================
-> duplicati.commandline.exe help restore
-
-Usage: restore <storage-URL> ["<filename>"] [<options>]
-  
-  Restores <filename> to its original destination. If <filename> exists already, <filename> is changed to <filename-timestamp.extension>. To restore all files use "*" or leave empty.
-
-  --overwrite=<boolen>
-    Overwrites existing files.
-  --restore-path=<string>
-    Restores files to <restore-path> instead of their original destination. Top folders are removed if possible.
-  --time=<time>
-    Restore files that are older than the specified time.
-  --version=<int>
-    Restore files from a specific backup.
-
-
-	
-# =============================================================================
-> duplicati.commandline.exe help delete
-
-Usage: delete <storage-URL> [<options>]
-  
-  Marks old data deleted and removes outdated dlist files. A backup is deleted when it is older than <keep-time> or when there are more newer versions than <keep-versions>. Data is considered old, when it is not required from any existing backup anymore.
-  
-  --keep-time=<time>
-    Marks data outdated that is older than <time>.
-  --keep-versions=<int>
-    Marks data outdated that is older than <int> versions.
-  --version=<int>
-    Deletes all files that belong to the specified version(s).
-  
-  
-  
-# =============================================================================
-> duplicati.commandline.exe help compact
-
-Usage: compact <storage-URL> [<options>]
-  
-  Old data is not deleted immediately as in most cases only small parts of a dblock file are old data. When the amount of old data in a dblock file grows it might be worth to replace it. This is especially the case when the number of dblock files and thus the required storage space can be reduced. When backups are frequently made and only few files have changed, the uploaded dblock files are small. At some point it might make sense to replace a large number of small files with one large file. This is what compacting does.
-  
-  --small-file-max-count=<int>
-    The maximum allowed number of small files.
-  --small-file-size=<int>
-    Files smaller than this size are considered to be small and will be compacted with other small files as soon as there are <small-file-max-count> of them. --small-file-size=20 means 20% of <dblock-size>. 
-  --threshold=<percent_value>	
-	  The amount of old data that a dblock file can contain before it is considered to be replaced.
-	
-	
-
-  
-# =============================================================================
-> duplicati.commandline.exe help compare
-
-Usage: compare <storage-URL> [<base-version>] [<compare-to>] [<options>]
-
-  Compares two backups and shows differences. If no versions are given, changes are shown between the two latest backups. The versions can either be timestamps or backup version numbers. If only one version is given, the most recent backup is compared to that version.
-
-  --verbose
-    Shows names of files
-  --include=<filter>
-    Adds an include filter (for verbose output)
-  --exclude=<filter>
-    Adds an exclude filter (for verbose output)
-
-
-
-# =============================================================================
-> duplicati.commandline.exe help create-report
-
-Usage: create-report <storage-URL> <output-file> [<options>]
-
-  Analyses the backup and prepares a report with anonymous information. This report can be sent to the developers for a better analysis in case something went wrong.
-
-
-
-
-# =============================================================================
-> duplicati.commandline.exe help repair
-
-Usage: repair <storage-URL> [<options>]
-  
-  Tries to repair the backup. If no local db is found or the db is empty, the db is re-created with data from the storage. If the db is in place but the remote storage is corrupt, the remote storage gets repaired with local data (if available).
-
-
-
-
-# =============================================================================
-> duplicati.commandline.exe help test
-> duplicati.commandline.exe help verify
-
-Usage: test <storage-URL> [<samples>] [<options>]
-  
-  Verifies integrity of a backup. A random sample of dlist, dindex, dblock files is downloaded, decrypted and the content is checked against recorded size values and data hashes. <samples> specifies the number of samples to be tested. If "all” is specified, all files in the backup will be tested. This is a rolling check, i.e. when executed another time different samples are verified than in the first run. A sample consists of 1 dlist, 1 dindex, 1 dblock.
-  
-  --time=<time>
-    Checks samples from a specific time.
-  --version=<int>
-    Checks samples from specific versions. Delimiters are , -
-  
-  
-  
-  
-# =============================================================================
-> duplicati.commandline.exe help debug
-> duplicati.commandline.exe help logging
-
-Duplicati provides information for debugging and logging purposes. By default, all debugging and logging is turned off.
-
-  --debug-output
-    Error messages are more verbose.
-  --debug-retry-errors
-    If something needs to be retried (e.g. upload failed) this will cause an entry in the log file.
-  --log-file = <path>
-    The path to the log file e.g. "D:\duplicati\log.txt".
-  --log-level = Profiling | Information | Warning | Error 
-    Specifies the log level.
-  --backend-log-database = <path>
-    Duplicati can log all actions related to storing, deleting files on the backend. <path> specifies where this log is written e.g. "D:\duplicati\backend.xml".
-
-    
-# =============================================================================
-> duplicati.commandline.exe help encryption
-> duplicati.commandline.exe help compression
-
-Duplicati offers various options for the used compression and encryption modules.
-
-  --encryption-module = %ENCRYPTIONMODULES%
-    The encryption module that is used to encrypt backups. Default is %DEFAULTENCRYPTIONMODULE%.
-  --compression-module = %COMPRESSIONMODULES%
-    The compression module that is used. Default is %DEFAULTCOMPRESSIONMODULE%.
-  --enable-module = %GENERICMODULES%
-    Enable a built-in generic module that is not enabled by default
-  --disable-module = %GENERICMODULES%
-    Disable a built-in generic module that is enabled by default
-%OPTION:passphrase%
-%OPTION:no-encryption%
-
-# =============================================================================
-> duplicati.commandline.exe help gpg
-
-Duplicati is shipped with an interface to GNU Privary Guard. It requires that the gpg executable is available on the system. On Windows it is assumed that this is in the default installation folder under program files, under Linux and OSX it is assumed that the program is available via the PATH environment variable. It is possible to supply the path to GPG using the --gpg-program-path switch.
-
-Options:
-%MODULEOPTIONS%
-
-
-# =============================================================================
-> duplicati.commandline.exe help file
-
-Duplicati can use the local file system to store backups. The following target URL formats can be used:
-
-  file://hostname/folder%20for%20backup
-  file://\\server\folder%20for%20backup (UNC path)
-  "C:\folder for backup"
-  file://c:\folder%20for%20backup (Windows)
-  file:///usr/pub/folder%20for%20backup (Linux)
-
-Options:
-%MODULEOPTIONS%
-
-
-# =============================================================================
-> duplicati.commandline.exe help tahoe
-> duplicati.commandline.exe help tahoelafs
-
-Duplicati can use the TahoeLAFS to store backups. The following target URL format is used:
-  tahoe://hostname:port/uri/$DIRCAP
-
-Options:
-%MODULEOPTIONS%
-
-# =============================================================================
-> duplicati.commandline.exe help ftp
-
-Duplicati can use FTP servers to store backups. The following target URL formats can be used:
-  ftp://hostname/folder
-  
-Options:
-%MODULEOPTIONS%
-
-
-# =============================================================================
-> duplicati.commandline.exe help ssh
-
-Duplicati can use SSH servers to store backups. The following target URL formats can be used:
-  ssh://hostname/folder
- 
-Options:
-%MODULEOPTIONS%
-
-
-# =============================================================================
-> duplicati.commandline.exe help webdav
-
-Duplicati can use WebDAV servers to store backups. The following target URL formats can be used:
-  webdav://hostname/folder"
-  
-Options:
-%MODULEOPTIONS%
-
-
-# =============================================================================
-> duplicati.commandline.exe help s3
-
-Duplicati can use S3-compatible servers to store backups. The following target URL format is used:
-  s3://bucketname/prefix
-
-Options:
-%MODULEOPTIONS%
-
-
-# =============================================================================
-> duplicati.commandline.exe help skydrive
-
-Duplicati can use Windows Live Skydrive to store backups. The following target URL format is used:
-  skydrive://folder/subfolder
-Please note that there is no official API and accessing SkyDrive through this backend may violate the ToS and may stop to work if Microsoft decides to change the API.
-
-Options:
-%MODULEOPTIONS%
-
-# =============================================================================
-> duplicati.commandline.exe help date
-> duplicati.commandline.exe help time
-
-Duplicati supports absolute and relative dates and times:
-
-  now --> The current time
-  
-  1234567890 --> A timestamp, seconds since 1970.
-  
-  "2009-03-26T08:30:00+01:00" --> An absolute date and time. You can also use the local date and time format of your system like e.g. "01-14-2000" or "01 jan. 2004".
-  
-  Y, M, D, W, h, m, s --> Relative date and time: year, month, day, week, hour, minute, second. Example: 2M10D5h is now + 2 months + 10 days + 5 hours.
-
-# =============================================================================
-> duplicati.commandline.exe help size
-
-Whenever a size is required, you can use any of the following suffixes:
-
-  B - Bytes
-  kB - Kilobytes
-  MB - Megabytes
-  GB - Gigabytes
-  
-For speed limits, use the same format. If you enter 1MB this will be 1MB/sec.
-
-# =============================================================================
-> duplicati.commandline.exe help filter
-> duplicati.commandline.exe help filters
-
-Duplicati can apply globbing and regex filter rules to backup and restore specific files only. Globbing filters can be used in file names. To specify a regex filter put the file name in [brackets]. 
-  Globbing: *.txt
-  Regex: [.*test\.txt]
-
-
-
-# =============================================================================
-> duplicati.commandline.exe help mail
-> duplicati.commandline.exe help email
-
-Duplicati can send email notifications.
-
-  --send-mail-to=<email-address>
-    After a backup an email is sent to <email-address>. Valid formats are "Name <test@example.com>, Other <test2@example.com>, test3@example.com". Multiple addresses must be separated with a comma. 
-  --send-mail-from=<email-address>
-    This is the sender address of an email.
-  --send-mail-subject=<subject>
-    This is the subject line of the email that is sent. E.g. this can be "Duplicati %OPERATIONNAME% Report"
-  --send-mail-body=<body>
-    The content of the email message. This should contain "%RESULT%".
-  --send-mail-url=<smtp-url>
-    An URL to connect to an SMTP server to send out an email. Example: "tls://smtp.example.com:587"
-  --send-mail-username=<username>
-    Required username to authenticate with SMTP server.
-  --send-mail-password=<password>
-    Required password to authenticate with SMTP server.
-  --send-mail-level=<level>
-    When email messages are sent: "Success", "Warning", "Error" are possible.
-  --send-mail-any-operation=true
-    Also send emails after other operations like restore etc.
-	
-  Allowed placeholders are:
-    %RESULT%
-	  The result/log of the backup
-    %OPERATIONNAME%
-	  The name of the operation, usually "backup", but could also be "restore" etc.
-    %REMOTEURL%
-	  The backend url
-    %LOCALPATH%
-	  The path to the local folders involved (i.e. the folders being backed up)
-
-
-  
-# =============================================================================
-> duplicati.commandline.exe help advanced
-> duplicati.commandline.exe help option
-> duplicati.commandline.exe help options
-
-Duplicati offers more options than listed in the other topics. Those additional options should only be used with care. For normal operation none of them should ever be required. Here is a complete list of options supported by Duplicati:
-
-%MAINOPTIONS%
-
-# =============================================================================
-> duplicati.commandline.exe help returncodes
-> duplicati.commandline.exe help exitcodes
-> duplicati.commandline.exe help statuscodes
-
-Duplicati reports the following return/exit codes:
-  0 - Success
-  1 - Successful backup, but no files were changed
-  2 - Successful backup, with warnings
-  50 - Backup uploaded some files, but did not finish
-  100 - An error occurred
+# This file is the help for the Duplicati Command Line Client. It shows what 
+# commands the CLI understands and what the outputs are. Sometimes we used
+# placeholders for options. In that case descriptions are taken directly from
+# the modules. Sometimes we described options here. The reason for that is, 
+# that we found the new description much better but did not want to create a 
+# need for translation as many options are described in the UI as well and 
+# they are translated there.
+# =============================================================================
+> duplicati.commandline.exe
+> duplicati.commandline.exe help
+
+See duplicati.commandline.exe help <topic> for more information.
+  Examples: example
+  Commands: backup, find, restore, delete, compact, test, compare, repair
+  Debugging: debug, logging, create-report, test-filters
+  Targets: %BACKENDS%
+  Modules: %ENCRYPTIONMODULES%, %COMPRESSIONMODULES%, %GENERICMODULES%
+  Formats: date, time, size, encryption, compression
+  Advanced: mail, advanced, returncodes, filter, <option>
+
+http://www.duplicati.com/              Version: %VERSION%
+
+
+
+# =============================================================================
+> duplicati.commandline.exe help example
+> duplicati.commandline.exe help examples
+
+Make an encrypted backup
+========================
+  The following command will make an encrypted backup and store it on an FTP server. As no passphrase is specified, the user is prompted for a password. The upload speed is throttled to 500kB/s. Backups older than onemonth are considered old. Old backups are deleted automatically. The maximum file size is limited to 50MB (default). 
+  
+  %MONO%"%APP_PATH%" backup ftp://me:example.com@ftp.example.com/target "%EXAMPLE_SOURCE_PATH%" --throttle=500kB
+  
+Search for files in a backup
+============================
+  The backup can be searched for specific files. The following command returns all files "%EXAMPLE_SOURCE_FILE%" of the last backup. File names can also contain the wildcards * and ?. 
+  
+  %MONO%"%APP_PATH%" find ftp://me:example.com@ftp.example.com/target "%EXAMPLE_SOURCE_FILE%"
+
+Restore a specific file
+=======================
+  The following command will restore "%EXAMPLE_SOURCE_FILE%" from the backup in the latest version to its original destination and overwrite an existing file.
+  
+  %MONO%"%APP_PATH%" restore ftp://me:example.com@ftp.example.com/target "%EXAMPLE_SOURCE_FILE%" --overwrite
+    
+
+# =============================================================================
+> duplicati.commandline.exe help backup
+  
+Usage: backup <storage-URL> "<source-path>" [<options>]
+
+  Makes a backup of <source-path> and stores it in <storage-URL>. The format for <storage-URL> is protocol://username:password@hostname:port/path?backend
+  _option1=value1&backend_option2=value2. Multiple source paths can be specified if they are separated by a space. Defaults are: The maximum file size is 100MB, backups are deleted when they are older than one month.
+
+  <username> must not contain : and <password> must not contain @. If they do, specify username and password using --auth-username and --auth-password.
+
+  --auth-password=<string>
+    The password that is required to authenticate with the server the backup is stored on.
+  --auth-username=<string>
+    The username that is required to authenticate with the server the backup is stored on.
+  --no-encryption=<boolean>
+    Use this to make an unencrypted backup.
+  --passphrase
+    This is the passphrase that is used to encrypt all data before it is uploaded. If an empty passphrase is specified, the backup will not be encrypted. This is the same as using --no-encryption.
+  --prefix=<string>
+    Replaces the default "duplicati" with <string> in the file names of the backup files. It is required to specify different prefixes if multiple backups are stored in the same target folder.
+
+
+# =============================================================================
+> duplicati.commandline.exe help find
+
+Usage: find <storage-URL> ["<filename>"] [<options>]
+
+  Finds specific files in specific backups. If <filename> is specified, all occurrences of <filename> in the backup are listed. <filename> can contain * and ? as wildcards. File names in [brackets] are interpreted as regular expression. Latest backup is searched by default. If entire path is specified, all available versions of the file are listed. If no <filename> is specified, a list of all available backups is shown.
+
+  --time=<time>
+    Shows what the files looked like at a specific time. Absolute and relative times can be specified.
+  --version=<int>
+    Shows what the files looked like in a specific backup. If no version is specified the latest backup (version=0) will be used. If nothing is found, older backups will besearched automatically.
+  --include=<string>
+    Reduces the list of files in a backup to those that match the provided string. This is applied before the search is executed. 
+  --exclude=<string>
+    Removes matching files from the list of files in a backup. This is applied before the search is executed. 
+
+
+
+# =============================================================================
+> duplicati.commandline.exe help restore
+
+Usage: restore <storage-URL> ["<filename>"] [<options>]
+  
+  Restores <filename> to its original destination. If <filename> exists already, <filename> is changed to <filename-timestamp.extension>. To restore all files use "*" or leave empty.
+
+  --overwrite=<boolen>
+    Overwrites existing files.
+  --restore-path=<string>
+    Restores files to <restore-path> instead of their original destination. Top folders are removed if possible.
+  --time=<time>
+    Restore files that are older than the specified time.
+  --version=<int>
+    Restore files from a specific backup.
+
+
+	
+# =============================================================================
+> duplicati.commandline.exe help delete
+
+Usage: delete <storage-URL> [<options>]
+  
+  Marks old data deleted and removes outdated dlist files. A backup is deleted when it is older than <keep-time> or when there are more newer versions than <keep-versions>. Data is considered old, when it is not required from any existing backup anymore.
+  
+  --keep-time=<time>
+    Marks data outdated that is older than <time>.
+  --keep-versions=<int>
+    Marks data outdated that is older than <int> versions.
+  --version=<int>
+    Deletes all files that belong to the specified version(s).
+  
+  
+  
+# =============================================================================
+> duplicati.commandline.exe help compact
+
+Usage: compact <storage-URL> [<options>]
+  
+  Old data is not deleted immediately as in most cases only small parts of a dblock file are old data. When the amount of old data in a dblock file grows it might be worth to replace it. This is especially the case when the number of dblock files and thus the required storage space can be reduced. When backups are frequently made and only few files have changed, the uploaded dblock files are small. At some point it might make sense to replace a large number of small files with one large file. This is what compacting does.
+  
+  --small-file-max-count=<int>
+    The maximum allowed number of small files.
+  --small-file-size=<int>
+    Files smaller than this size are considered to be small and will be compacted with other small files as soon as there are <small-file-max-count> of them. --small-file-size=20 means 20% of <dblock-size>. 
+  --threshold=<percent_value>	
+	  The amount of old data that a dblock file can contain before it is considered to be replaced.
+	
+	
+
+  
+# =============================================================================
+> duplicati.commandline.exe help compare
+
+Usage: compare <storage-URL> [<base-version>] [<compare-to>] [<options>]
+
+  Compares two backups and shows differences. If no versions are given, changes are shown between the two latest backups. The versions can either be timestamps or backup version numbers. If only one version is given, the most recent backup is compared to that version.
+
+  --verbose
+    Shows names of files
+  --include=<filter>
+    Adds an include filter (for verbose output)
+  --exclude=<filter>
+    Adds an exclude filter (for verbose output)
+
+
+
+# =============================================================================
+> duplicati.commandline.exe help create-report
+
+Usage: create-report <storage-URL> <output-file> [<options>]
+
+  Analyses the backup and prepares a report with anonymous information. This report can be sent to the developers for a better analysis in case something went wrong.
+
+
+
+
+# =============================================================================
+> duplicati.commandline.exe help repair
+
+Usage: repair <storage-URL> [<options>]
+  
+  Tries to repair the backup. If no local db is found or the db is empty, the db is re-created with data from the storage. If the db is in place but the remote storage is corrupt, the remote storage gets repaired with local data (if available).
+
+
+
+
+# =============================================================================
+> duplicati.commandline.exe help test
+> duplicati.commandline.exe help verify
+
+Usage: test <storage-URL> [<samples>] [<options>]
+  
+  Verifies integrity of a backup. A random sample of dlist, dindex, dblock files is downloaded, decrypted and the content is checked against recorded size values and data hashes. <samples> specifies the number of samples to be tested. If "all” is specified, all files in the backup will be tested. This is a rolling check, i.e. when executed another time different samples are verified than in the first run. A sample consists of 1 dlist, 1 dindex, 1 dblock.
+  
+  --time=<time>
+    Checks samples from a specific time.
+  --version=<int>
+    Checks samples from specific versions. Delimiters are , -
+  
+
+
+  
+# =============================================================================
+> duplicati.commandline.exe help test-filters
+
+Usage: test-filters <source-path> [<options>]
+  
+  Scans the source files and tests against the filters specified, the console output shows which files and folders are examined and the result.
+    
+  
+  
+# =============================================================================
+> duplicati.commandline.exe help debug
+> duplicati.commandline.exe help logging
+
+Duplicati provides information for debugging and logging purposes. By default, all debugging and logging is turned off.
+
+  --debug-output
+    Error messages are more verbose.
+  --debug-retry-errors
+    If something needs to be retried (e.g. upload failed) this will cause an entry in the log file.
+  --log-file = <path>
+    The path to the log file e.g. "D:\duplicati\log.txt".
+  --log-level = Profiling | Information | Warning | Error 
+    Specifies the log level.
+  --backend-log-database = <path>
+    Duplicati can log all actions related to storing, deleting files on the backend. <path> specifies where this log is written e.g. "D:\duplicati\backend.xml".
+
+    
+# =============================================================================
+> duplicati.commandline.exe help encryption
+> duplicati.commandline.exe help compression
+
+Duplicati offers various options for the used compression and encryption modules.
+
+  --encryption-module = %ENCRYPTIONMODULES%
+    The encryption module that is used to encrypt backups. Default is %DEFAULTENCRYPTIONMODULE%.
+  --compression-module = %COMPRESSIONMODULES%
+    The compression module that is used. Default is %DEFAULTCOMPRESSIONMODULE%.
+  --enable-module = %GENERICMODULES%
+    Enable a built-in generic module that is not enabled by default
+  --disable-module = %GENERICMODULES%
+    Disable a built-in generic module that is enabled by default
+%OPTION:passphrase%
+%OPTION:no-encryption%
+
+# =============================================================================
+> duplicati.commandline.exe help gpg
+
+Duplicati is shipped with an interface to GNU Privary Guard. It requires that the gpg executable is available on the system. On Windows it is assumed that this is in the default installation folder under program files, under Linux and OSX it is assumed that the program is available via the PATH environment variable. It is possible to supply the path to GPG using the --gpg-program-path switch.
+
+Options:
+%MODULEOPTIONS%
+
+
+# =============================================================================
+> duplicati.commandline.exe help file
+
+Duplicati can use the local file system to store backups. The following target URL formats can be used:
+
+  file://hostname/folder%20for%20backup
+  file://\\server\folder%20for%20backup (UNC path)
+  "C:\folder for backup"
+  file://c:\folder%20for%20backup (Windows)
+  file:///usr/pub/folder%20for%20backup (Linux)
+
+Options:
+%MODULEOPTIONS%
+
+
+# =============================================================================
+> duplicati.commandline.exe help tahoe
+> duplicati.commandline.exe help tahoelafs
+
+Duplicati can use the TahoeLAFS to store backups. The following target URL format is used:
+  tahoe://hostname:port/uri/$DIRCAP
+
+Options:
+%MODULEOPTIONS%
+
+# =============================================================================
+> duplicati.commandline.exe help ftp
+
+Duplicati can use FTP servers to store backups. The following target URL formats can be used:
+  ftp://hostname/folder
+  
+Options:
+%MODULEOPTIONS%
+
+
+# =============================================================================
+> duplicati.commandline.exe help ssh
+
+Duplicati can use SSH servers to store backups. The following target URL formats can be used:
+  ssh://hostname/folder
+ 
+Options:
+%MODULEOPTIONS%
+
+
+# =============================================================================
+> duplicati.commandline.exe help webdav
+
+Duplicati can use WebDAV servers to store backups. The following target URL formats can be used:
+  webdav://hostname/folder"
+  
+Options:
+%MODULEOPTIONS%
+
+
+# =============================================================================
+> duplicati.commandline.exe help s3
+
+Duplicati can use S3-compatible servers to store backups. The following target URL format is used:
+  s3://bucketname/prefix
+
+Options:
+%MODULEOPTIONS%
+
+
+# =============================================================================
+> duplicati.commandline.exe help skydrive
+
+Duplicati can use Windows Live Skydrive to store backups. The following target URL format is used:
+  skydrive://folder/subfolder
+Please note that there is no official API and accessing SkyDrive through this backend may violate the ToS and may stop to work if Microsoft decides to change the API.
+
+Options:
+%MODULEOPTIONS%
+
+# =============================================================================
+> duplicati.commandline.exe help date
+> duplicati.commandline.exe help time
+
+Duplicati supports absolute and relative dates and times:
+
+  now --> The current time
+  
+  1234567890 --> A timestamp, seconds since 1970.
+  
+  "2009-03-26T08:30:00+01:00" --> An absolute date and time. You can also use the local date and time format of your system like e.g. "01-14-2000" or "01 jan. 2004".
+  
+  Y, M, D, W, h, m, s --> Relative date and time: year, month, day, week, hour, minute, second. Example: 2M10D5h is now + 2 months + 10 days + 5 hours.
+
+# =============================================================================
+> duplicati.commandline.exe help size
+
+Whenever a size is required, you can use any of the following suffixes:
+
+  B - Bytes
+  kB - Kilobytes
+  MB - Megabytes
+  GB - Gigabytes
+  
+For speed limits, use the same format. If you enter 1MB this will be 1MB/sec.
+
+# =============================================================================
+> duplicati.commandline.exe help filter
+> duplicati.commandline.exe help filters
+
+Duplicati can apply globbing and regex filter rules to backup and restore specific files only. Globbing filters can be used in file names. To specify a regex filter put the file name in [brackets]. 
+  Globbing: *.txt
+  Regex: [.*test\.txt]
+
+
+
+# =============================================================================
+> duplicati.commandline.exe help mail
+> duplicati.commandline.exe help email
+
+Duplicati can send email notifications.
+
+  --send-mail-to=<email-address>
+    After a backup an email is sent to <email-address>. Valid formats are "Name <test@example.com>, Other <test2@example.com>, test3@example.com". Multiple addresses must be separated with a comma. 
+  --send-mail-from=<email-address>
+    This is the sender address of an email.
+  --send-mail-subject=<subject>
+    This is the subject line of the email that is sent. E.g. this can be "Duplicati %OPERATIONNAME% Report"
+  --send-mail-body=<body>
+    The content of the email message. This should contain "%RESULT%".
+  --send-mail-url=<smtp-url>
+    An URL to connect to an SMTP server to send out an email. Example: "tls://smtp.example.com:587"
+  --send-mail-username=<username>
+    Required username to authenticate with SMTP server.
+  --send-mail-password=<password>
+    Required password to authenticate with SMTP server.
+  --send-mail-level=<level>
+    When email messages are sent: "Success", "Warning", "Error" are possible.
+  --send-mail-any-operation=true
+    Also send emails after other operations like restore etc.
+	
+  Allowed placeholders are:
+    %RESULT%
+	  The result/log of the backup
+    %OPERATIONNAME%
+	  The name of the operation, usually "backup", but could also be "restore" etc.
+    %REMOTEURL%
+	  The backend url
+    %LOCALPATH%
+	  The path to the local folders involved (i.e. the folders being backed up)
+
+
+  
+# =============================================================================
+> duplicati.commandline.exe help advanced
+> duplicati.commandline.exe help option
+> duplicati.commandline.exe help options
+
+Duplicati offers more options than listed in the other topics. Those additional options should only be used with care. For normal operation none of them should ever be required. Here is a complete list of options supported by Duplicati:
+
+%MAINOPTIONS%
+
+# =============================================================================
+> duplicati.commandline.exe help returncodes
+> duplicati.commandline.exe help exitcodes
+> duplicati.commandline.exe help statuscodes
+
+Duplicati reports the following return/exit codes:
+  0 - Success
+  1 - Successful backup, but no files were changed
+  2 - Successful backup, with warnings
+  50 - Backup uploaded some files, but did not finish
+  100 - An error occurred
   200 - Invalid commandline arguments found
\ No newline at end of file
diff --git a/Duplicati/Library/Interface/ResultInterfaces.cs b/Duplicati/Library/Interface/ResultInterfaces.cs
index f04b798bb..ededa6bac 100644
--- a/Duplicati/Library/Interface/ResultInterfaces.cs
+++ b/Duplicati/Library/Interface/ResultInterfaces.cs
@@ -249,5 +249,12 @@ namespace Duplicati.Library.Interface
     {
         IEnumerable<KeyValuePair<string, IEnumerable<KeyValuePair<TestEntryStatus, string>>>> Changes { get; }
     }
+    
+    public interface ITestFilterResults : IBasicResults
+    {
+        long FileSize { get; set; }
+        long FileCount { get; set; }
+    }
+    
 }
 
diff --git a/Duplicati/Library/Main/Controller.cs b/Duplicati/Library/Main/Controller.cs
index 639a5a4ea..6a93e451f 100644
--- a/Duplicati/Library/Main/Controller.cs
+++ b/Duplicati/Library/Main/Controller.cs
@@ -220,6 +220,17 @@ namespace Duplicati.Library.Main
             });
         }
         
+        public Library.Interface.ITestFilterResults TestFilter(string[] paths, Library.Utility.IFilter filter = null)
+        {
+            m_options.RawOptions["verbose"] = "true";
+            m_options.RawOptions["dry-run"] = "true";
+            m_options.RawOptions["dbpath"] = "INVALID!";
+            
+            return RunAction(new TestFilterResults(), ref paths, (result) => {
+                new Operation.TestFilterHandler(m_options, result).Run(paths, filter);
+            });
+        }
+        
         private T RunAction<T>(T result, Action<T> method)
             where T : ISetCommonOptions
         {
diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj
index e17c04042..e146f0e6d 100644
--- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj
+++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj
@@ -118,6 +118,7 @@
     <Compile Include="OperationPhase.cs" />
     <Compile Include="Database\PathLookupHelper.cs" />
     <Compile Include="Database\HashLookupHelper.cs" />
+    <Compile Include="Operation\TestFilterHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Utility\Duplicati.Library.Utility.csproj">
diff --git a/Duplicati/Library/Main/Enums.cs b/Duplicati/Library/Main/Enums.cs
index e9cd53c41..1c96a3355 100644
--- a/Duplicati/Library/Main/Enums.cs
+++ b/Duplicati/Library/Main/Enums.cs
@@ -39,7 +39,8 @@ namespace Duplicati.Library.Main
         Repair,
         CreateLogDb,
         Compact,
-        Test
+        Test,
+        TestFilters
     }
 
     /// <summary>
diff --git a/Duplicati/Library/Main/Operation/BackupHandler.cs b/Duplicati/Library/Main/Operation/BackupHandler.cs
index 5ef7bf6f3..e86354c9a 100644
--- a/Duplicati/Library/Main/Operation/BackupHandler.cs
+++ b/Duplicati/Library/Main/Operation/BackupHandler.cs
@@ -76,8 +76,75 @@ namespace Duplicati.Library.Main.Operation
             if (options.AllowPassphraseChange)
                 throw new Exception(Strings.Foresthash.PassphraseChangeUnsupported);
         }
+        
+        
+        public class FilterHandler
+        {
+            private Snapshots.ISnapshotService m_snapshot;
+            private FileAttributes m_attributeFilter;
+            private Duplicati.Library.Utility.IFilter m_filter;
+            private Options.SymlinkStrategy m_symlinkPolicy;
+            private ILogWriter m_logWriter;
+            
+            public FilterHandler(Snapshots.ISnapshotService snapshot,FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter filter, Options.SymlinkStrategy symlinkPolicy, ILogWriter logWriter)
+            {
+                m_snapshot = snapshot;
+                m_attributeFilter = attributeFilter;
+                m_filter = filter;
+                m_symlinkPolicy = symlinkPolicy;
+                m_logWriter = logWriter;
+            }
+        
+            public bool AttributeFilter(string rootpath, string path, FileAttributes attributes)
+            {
+                try
+                {
+                    if (m_snapshot.IsBlockDevice(path))
+                    {
+                        if (m_logWriter != null)
+                            m_logWriter.AddVerboseMessage("Excluding block device: {0}", path);
+                        return false;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    if (m_logWriter != null)
+                        m_logWriter.AddWarning(string.Format("Failed to process path: ", path), ex);
+                    return false;
+                }            
+            
+                if ((m_attributeFilter & attributes) != 0)
+                {
+                    if (m_logWriter != null)
+                        m_logWriter.AddVerboseMessage("Excluding path due to attribute filter: {0}", path);
+                    return false;
+                }
+                            
+                Library.Utility.IFilter match;
+                if (!Library.Utility.FilterExpression.Matches(m_filter, path, out match))
+                {
+                    if (m_logWriter != null)
+                        m_logWriter.AddVerboseMessage("Excluding path due to filter: {0} => {1}", path, match == null ? "null" : match.ToString());
+                    return false;
+                }
+                else if (match != null)
+                {
+                    if (m_logWriter != null)
+                        m_logWriter.AddVerboseMessage("Including path due to filter: {0} => {1}", path, match.ToString());
+                }
+                
+                if (m_symlinkPolicy != Options.SymlinkStrategy.Follow && (attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint)
+                {
+                    if (m_logWriter != null)
+                        m_logWriter.AddVerboseMessage("Excluding symlink: {0}", path);
+                    return false;
+                }
+                                
+                return true;
+            }
+        }
 
-        private static Snapshots.ISnapshotService GetSnapshot(string[] sources, Options options, ILogWriter log)
+        public static Snapshots.ISnapshotService GetSnapshot(string[] sources, Options options, ILogWriter log)
         {
             try
             {
@@ -100,44 +167,6 @@ namespace Duplicati.Library.Main.Operation
                 (Library.Snapshots.ISnapshotService)new Duplicati.Library.Snapshots.NoSnapshotWindows(sources, options.RawOptions);
         }
 
-        private bool AttributeFilter(string rootpath, string path, FileAttributes attributes)
-        {
-            try
-            {
-                if (m_snapshot.IsBlockDevice(path))
-                {
-                    m_result.AddVerboseMessage("Excluding block device: {0}", path);
-                    return false;
-                }
-            }
-            catch (Exception ex)
-            {
-                m_result.AddWarning(string.Format("Failed to process path: ", path), ex);
-                return false;
-            }            
-        
-            if ((m_attributeFilter & attributes) != 0)
-            {
-                m_result.AddVerboseMessage("Excluding path due to attribute filter: {0}", path);
-                return false;
-            }
-                        
-            if (!Library.Utility.FilterExpression.Matches(m_filter, path))
-            {
-                m_result.AddVerboseMessage("Excluding path due to filter: {0}", path);
-                return false;
-            }
-            
-            if (m_symlinkPolicy != Options.SymlinkStrategy.Follow && (attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint)
-            {
-                m_result.AddVerboseMessage("Excluding symlink: {0}", path);
-                return false;
-            }
-                            
-            return true;
-        }
-
-
         private void CountFilesThread()
         {
             var updater = m_result.OperationProgressUpdater;
@@ -145,7 +174,7 @@ namespace Duplicati.Library.Main.Operation
             var size = 0L;
             var followSymlinks = m_options.SymlinkPolicy != Duplicati.Library.Main.Options.SymlinkStrategy.Follow;
             
-            foreach(var path in m_snapshot.EnumerateFilesAndFolders(AttributeFilter))
+            foreach(var path in m_snapshot.EnumerateFilesAndFolders(new FilterHandler(m_snapshot, m_attributeFilter, m_filter, m_symlinkPolicy, null).AttributeFilter))
             {
                 var fa = FileAttributes.Normal;
                 try { fa = m_snapshot.GetAttributes(path); }
@@ -315,6 +344,8 @@ namespace Duplicati.Library.Main.Operation
                             m_indexvolume = new IndexVolumeWriter(m_options);
                             m_indexvolume.VolumeID = m_database.RegisterRemoteVolume(m_indexvolume.RemoteFilename, RemoteVolumeType.Index, RemoteVolumeState.Temporary, m_transaction);
                         }
+                        
+                        var filterhandler = new FilterHandler(m_snapshot, m_attributeFilter, m_filter, m_symlinkPolicy, null);
     		                		                        	
                         using(new Logging.Timer("BackupMainOperation"))
                         {
@@ -335,7 +366,7 @@ namespace Duplicati.Library.Main.Operation
                                         m_result.AddWarning(string.Format("Failed to read attributes: {0}, message: {1}", p, ex.Message), ex);
                                     }
     		
-                                    if (AttributeFilter(null, p, fa))
+                                    if (filterhandler.AttributeFilter(null, p, fa))
                                     {                                        
                                         try
                                         {
@@ -352,7 +383,7 @@ namespace Duplicati.Library.Main.Operation
                             }
                             else
                             {                                    
-                                foreach(var path in m_snapshot.EnumerateFilesAndFolders(AttributeFilter))
+                                foreach(var path in m_snapshot.EnumerateFilesAndFolders(filterhandler.AttributeFilter))
                                     this.HandleFilesystemEntry(path, m_snapshot.GetAttributes(path));
                                 
                             }
diff --git a/Duplicati/Library/Main/Operation/TestFilterHandler.cs b/Duplicati/Library/Main/Operation/TestFilterHandler.cs
new file mode 100644
index 000000000..ef4cc0a30
--- /dev/null
+++ b/Duplicati/Library/Main/Operation/TestFilterHandler.cs
@@ -0,0 +1,93 @@
+//  Copyright (C) 2011, Kenneth Skovhede
+
+//  http://www.hexad.dk, opensource@hexad.dk
+//
+//  This library is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as
+//  published by the Free Software Foundation; either version 2.1 of the
+//  License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+using System;
+using System.IO;
+
+namespace Duplicati.Library.Main.Operation
+{
+    internal class TestFilterHandler : IDisposable
+    {
+        private readonly Options m_options;
+        private TestFilterResults m_result;
+        
+        public TestFilterHandler(Options options, TestFilterResults results)
+        {
+            m_options = options;
+            m_result = results;
+        }
+        
+        public void Run(string[] sources, Library.Utility.IFilter filter)
+        {
+            var storeSymlinks = m_options.SymlinkPolicy == Duplicati.Library.Main.Options.SymlinkStrategy.Store;
+            
+            using(var snapshot = BackupHandler.GetSnapshot(sources, m_options, m_result))
+            {
+                foreach(var path in snapshot.EnumerateFilesAndFolders(new BackupHandler.FilterHandler(snapshot, m_options.FileAttributeFilter, filter, m_options.SymlinkPolicy, m_result).AttributeFilter))
+                {
+                    var fa = FileAttributes.Normal;
+                    try
+                    {
+                        fa = snapshot.GetAttributes(path);
+                    }
+                    catch
+                    {
+                    }
+                    
+                    if (storeSymlinks && ((fa & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint))
+                    {
+                        m_result.AddVerboseMessage("Including symlink: {0}", path);
+                    
+                    }
+                    else if ((fa & FileAttributes.Directory) == FileAttributes.Directory)
+                    {
+                        m_result.AddVerboseMessage("Including folder: {0}", path);
+                    }
+                    else
+                    {
+                        m_result.FileCount++;
+                        var size = -1L;
+                    
+                        try
+                        {
+                            size = snapshot.GetFileSize(path);
+                            m_result.FileSize += size;
+                        }
+                        catch
+                        {
+                        }
+                    
+                    
+                        if (m_options.SkipFilesLargerThan == long.MaxValue || size < m_options.SkipFilesLargerThan)                
+                            m_result.AddVerboseMessage("Including file: {0} ({1})", path, size <= 0 ? "unknown" : Duplicati.Library.Utility.Utility.FormatSizeString(size));
+                        else
+                            m_result.AddVerboseMessage("Excluding file due to size: {0} ({1})", path, size <= 0 ? "unknown" : Duplicati.Library.Utility.Utility.FormatSizeString(size));                    
+                    }
+                    
+                }
+            }
+        }
+        
+        #region IDisposable implementation
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}
+
diff --git a/Duplicati/Library/Main/ResultClasses.cs b/Duplicati/Library/Main/ResultClasses.cs
index 5d1c9c88e..9a543e1da 100644
--- a/Duplicati/Library/Main/ResultClasses.cs
+++ b/Duplicati/Library/Main/ResultClasses.cs
@@ -741,6 +741,15 @@ namespace Duplicati.Library.Main
             m_changes.Add(new KeyValuePair<string, IEnumerable<KeyValuePair<TestEntryStatus, string>>>(volume, changes));
         }
     }
+    
+    internal class TestFilterResults : BasicResults, ITestFilterResults
+    {
+        public long FileCount { get; set; }
+        public long FileSize { get; set; }
+        public override OperationMode MainOperation { get { return OperationMode.TestFilters; } }
+
+    }
+
 
 }
 
diff --git a/Duplicati/Library/Modules/Builtin/ConsolePasswordInput.cs b/Duplicati/Library/Modules/Builtin/ConsolePasswordInput.cs
index a5f53ca12..10aebbd9e 100644
--- a/Duplicati/Library/Modules/Builtin/ConsolePasswordInput.cs
+++ b/Duplicati/Library/Modules/Builtin/ConsolePasswordInput.cs
@@ -29,7 +29,7 @@ namespace Duplicati.Library.Modules.Builtin
         /// These actions only use the local database and do not require access to the data inside the files.
         /// For List and ListChanges this may not be true if there is no local database
         /// </summary>
-        private readonly static string[] PASSPHRASELESS_ACTIONS = { "CreateLogDb" };
+        private readonly static string[] PASSPHRASELESS_ACTIONS = { "CreateLogDb", "TestFilters" };
 
         #region IGenericModule Members
 
diff --git a/Duplicati/Library/Utility/FilterExpression.cs b/Duplicati/Library/Utility/FilterExpression.cs
index d3ed4ba93..7d37e795e 100644
--- a/Duplicati/Library/Utility/FilterExpression.cs
+++ b/Duplicati/Library/Utility/FilterExpression.cs
@@ -84,7 +84,7 @@ namespace Duplicati.Library.Utility
                 else
                 {
                     this.Type = (filter.Contains(MULTIPLE_WILDCARD) || filter.Contains(SINGLE_WILDCARD)) ? FilterType.Wildcard : FilterType.Simple;
-                    this.Filter = Utility.IsFSCaseSensitive ? filter.ToUpper() : filter;
+                    this.Filter = (!Utility.IsFSCaseSensitive && this.Type == FilterType.Wildcard) ? filter.ToUpper() : filter;
                     this.Regexp = new System.Text.RegularExpressions.Regex(Library.Utility.Utility.ConvertGlobbingToRegExp(filter), REGEXP_OPTIONS);
                 }
             }
@@ -180,7 +180,7 @@ namespace Duplicati.Library.Utility
                     case FilterType.Simple:
                         return string.Equals(this.Filter, path, Library.Utility.Utility.ClientFilenameStringComparision);
                     case FilterType.Wildcard:
-                        return IsWildcardMatch(Utility.IsFSCaseSensitive ? path.ToUpper() : path, this.Filter);
+                        return IsWildcardMatch(!Utility.IsFSCaseSensitive ? path.ToUpper() : path, this.Filter);
                     case FilterType.Regexp:
                         var m = this.Regexp.Match(path);
                         return m.Success && m.Length == path.Length;
@@ -226,19 +226,26 @@ namespace Duplicati.Library.Utility
         /// <summary>
         /// Gets a value indicating if the filter matches the path
         /// </summary>
-        /// <param name="path">The path to match</param>
-        public bool Matches(string path, out bool result)
+        /// <param name="result">The match result</param>
+        /// <param name="result">The match result</param>
+        /// <param name="match">The filter that matched</param>
+        public bool Matches(string path, out bool result, out IFilter match)
         {
             result = false;
             if (this.Type == FilterType.Empty)
+            {
+                match = null;
                 return false;
+            }
             
             if (m_filters.Where(x => x.Matches(path)).Any())
             {
+                match = this;
                 result = this.Result;
                 return true;
             }
             
+            match = null;
             return false;
         }
 
@@ -335,12 +342,27 @@ namespace Duplicati.Library.Utility
         /// <param name="filter">The filter to evaluate</param>
         /// <param name="path">The path to evaluate</param>
         public static bool Matches(IFilter filter, string path)
+        {
+            IFilter match;
+            return Matches(filter, path, out match);
+        }
+        
+        /// <summary>
+        /// Utility function to match a filter with a default fall-through value
+        /// </summary>
+        /// <param name="filter">The filter to evaluate</param>
+        /// <param name="path">The path to evaluate</param>
+        /// <param name="match">The filter that matched</param>
+        public static bool Matches(IFilter filter, string path, out IFilter match)
         {
             if (filter == null || filter.Empty)
+            {
+                match = null;
                 return true;
+            }
         
             bool result;
-            if (filter.Matches(path, out result))
+            if (filter.Matches(path, out result, out match))
                 return result;
 
             // If we only exclude files, choose to include by default
@@ -353,7 +375,10 @@ namespace Duplicati.Library.Utility
                 if (p == null || p.Empty)
                     continue;
                 else if (p is FilterExpression && ((FilterExpression)filter).Result)
+                {
+                    match = p;
                     return false; // We have an include filter, so we exclude by default
+                }
                 else if (p is JoinedFilterExpression)
                 {
                     q.Enqueue(((JoinedFilterExpression)p).First);
@@ -362,6 +387,7 @@ namespace Duplicati.Library.Utility
             }
                     
             // Only excludes, we return true
+            match = null;
             return true;
         }
         
@@ -374,6 +400,20 @@ namespace Duplicati.Library.Utility
         {
             return new FilterExpression(first.m_filters.Union(second.m_filters).Select(x => x.Type == FilterType.Regexp ? ("[" + x.Filter + "]") : x.Filter), first.Result);
         }
+        
+        public override string ToString()
+        {
+            if (this.Empty)
+                return "";
+            
+            return 
+                "(" +
+                string.Join(") || (",
+                    (from n in m_filters
+                        select n.Type == FilterType.Regexp ? "[" + n.Filter + "]" : n.Filter)
+                ) +
+                ")";
+        }
     }
 }
 
diff --git a/Duplicati/Library/Utility/IFilter.cs b/Duplicati/Library/Utility/IFilter.cs
index 189c096e6..b9e29651e 100644
--- a/Duplicati/Library/Utility/IFilter.cs
+++ b/Duplicati/Library/Utility/IFilter.cs
@@ -29,12 +29,13 @@ namespace Duplicati.Library.Utility
 		/// </summary>
 		/// <value><c>true</c> if empty; otherwise, <c>false</c>.</value>
 		bool Empty { get; }
-		/// <summary>
-		/// Performs a test to see if the entry matches the filter
-		/// </summary>
-		/// <param name="entry">The entry to match</param>
+        /// <summary>
+        /// Performs a test to see if the entry matches the filter
+        /// </summary>
+        /// <param name="entry">The entry to match</param>
         /// <param name="result">The match result</param>
-		bool Matches(string entry, out bool result);
+        /// <param name="match">The filter that matched</param>
+        bool Matches(string entry, out bool result, out IFilter match);
 	}
 }
 
diff --git a/Duplicati/Library/Utility/JoinedFilterExpression.cs b/Duplicati/Library/Utility/JoinedFilterExpression.cs
index 08c3ef823..c7b733394 100644
--- a/Duplicati/Library/Utility/JoinedFilterExpression.cs
+++ b/Duplicati/Library/Utility/JoinedFilterExpression.cs
@@ -30,9 +30,9 @@ namespace Duplicati.Library.Utility
             this.Second = second ?? new FilterExpression();
         }
 
-        public bool Matches(string entry, out bool result)
+        public bool Matches(string entry, out bool result, out IFilter match)
         {
-            return First.Matches(entry, out result) || Second.Matches(entry, out result);
+            return First.Matches(entry, out result, out match) || Second.Matches(entry, out result, out match);
         }
 
         public bool Empty { get { return First.Empty && Second.Empty; } }
@@ -51,6 +51,16 @@ namespace Duplicati.Library.Utility
                 return new JoinedFilterExpression(first, second);
             }
         }
+        
+        public override string ToString()
+        {
+            if (this.First.Empty)
+                return this.Second.ToString();
+            else if (this.Second.Empty)
+                return this.First.ToString();
+            else
+                return "(" + this.First.ToString() + ") || (" + this.Second.ToString() + ")";
+        }
     }
 }
 
diff --git a/Duplicati/Library/Utility/Utility.cs b/Duplicati/Library/Utility/Utility.cs
index 1d98ac8ac..956e6e387 100644
--- a/Duplicati/Library/Utility/Utility.cs
+++ b/Duplicati/Library/Utility/Utility.cs
@@ -194,10 +194,11 @@ namespace Duplicati.Library.Utility
         /// <returns>A list of the full filenames and foldernames. Foldernames ends with the directoryseparator char</returns>
         public static IEnumerable<string> EnumerateFileSystemEntries(string basepath, IFilter filter)
         {
+            IFilter match;
             filter = filter ?? new FilterExpression();
             return EnumerateFileSystemEntries(basepath, (rootpath, path, attributes) => { 
                 bool result;
-                if (!filter.Matches(path, out result))
+                if (!filter.Matches(path, out result, out match))
                     result = true;
 
                 return result;