Merge pull request #23 from duplicati/master

upstream

Duplicati/Library/Backend/CloudFiles/Strings.cs

@@ -1,7 +1,7 @@
 using Duplicati.Library.Localization.Short;
 namespace Duplicati.Library.Backend.Strings {
     internal static class CloudFiles {
-        public static string DescriptionAuthenticationURLLong_v2(string optionname) { return LC.L(@"CloudFiles use different servers for authentification based on where the account resides, use this option to set an alternate authentication URL. This option overrides --{0}.", optionname); }
+        public static string DescriptionAuthenticationURLLong_v2(string optionname) { return LC.L(@"CloudFiles use different servers for authentication based on where the account resides, use this option to set an alternate authentication URL. This option overrides --{0}.", optionname); }
         public static string DescriptionAuthenticationURLShort { get { return LC.L(@"Provide another authentication URL"); } }
         public static string DescriptionAuthPasswordLong { get { return LC.L(@"The password used to connect to the server. This may also be supplied as the environment variable ""AUTH_PASSWORD""."); } }
         public static string DescriptionAuthPasswordShort { get { return LC.L(@"Supplies the password used to connect to the server"); } }

Duplicati/Library/Main/Options.cs

@@ -482,7 +482,7 @@ namespace Duplicati.Library.Main
                     new CommandLineArgument("changed-files", CommandLineArgument.ArgumentType.Path, Strings.Options.ChangedfilesShort, Strings.Options.ChangedfilesLong),
                     new CommandLineArgument("deleted-files", CommandLineArgument.ArgumentType.Path, Strings.Options.DeletedfilesShort, Strings.Options.DeletedfilesLong("changed-files")),
 
-                    new CommandLineArgument("threshold", CommandLineArgument.ArgumentType.Size, Strings.Options.ThresholdShort, Strings.Options.ThresholdLong, DEFAULT_THRESHOLD.ToString()),
+                    new CommandLineArgument("threshold", CommandLineArgument.ArgumentType.Integer, Strings.Options.ThresholdShort, Strings.Options.ThresholdLong, DEFAULT_THRESHOLD.ToString()),
                     new CommandLineArgument("index-file-policy", CommandLineArgument.ArgumentType.Enumeration, Strings.Options.IndexfilepolicyShort, Strings.Options.IndexfilepolicyLong, IndexFileStrategy.Full.ToString(), null, Enum.GetNames(typeof(IndexFileStrategy))),
                     new CommandLineArgument("no-backend-verification", CommandLineArgument.ArgumentType.Boolean, Strings.Options.NobackendverificationShort, Strings.Options.NobackendverificationLong, "false"),
                     new CommandLineArgument("backup-test-samples", CommandLineArgument.ArgumentType.Integer, Strings.Options.BackendtestsamplesShort, Strings.Options.BackendtestsamplesLong("no-backend-verification"), "1"),

Duplicati/Server/webroot/ngax/less/style.less

@@ -1705,6 +1705,14 @@ div.modal-dialog {
                 &.x-tree-icon-hypervmachine {
                     background-position: -96px 0px;
                 }
+				
+				&.x-tree-icon-mssql {
+                    background-position: -96px -32px;
+                }
+
+                &.x-tree-icon-mssqldb {
+                    background-position: -80px -32px;
+                }
 
                 &.x-tree-icon-mydocuments {
                     background-position: -32px -48px;

Duplicati/Server/webroot/ngax/scripts/directives/sourceFolderPicker.js

@@ -57,6 +57,12 @@ backupApp.directive('sourceFolderPicker', function() {
             }
             else if (n.id.substr(0, 8) == "%HYPERV%")
                 n.iconCls = 'x-tree-icon-hyperv';
+            else if (n.id.substr(0, 8) == "%MSSQL%\\" && n.id.length >= 9) {
+                n.iconCls = 'x-tree-icon-mssqldb';
+                n.tooltip = gettextCatalog.getString("ID:") + " " + n.id.substring(8, n.id.length);
+            }
+            else if (n.id.substr(0, 7) == "%MSSQL%")
+                n.iconCls = 'x-tree-icon-mssql';
             else if (defunctmap[cp])
                 n.iconCls = 'x-tree-icon-broken';
             else if (cp.substr(cp.length - 1, 1) != dirsep)
@@ -222,7 +228,7 @@ backupApp.directive('sourceFolderPicker', function() {
 
                 sourceNodeChildren.push(n);
 
-                if (defunctmap[k] == null && n.iconCls != "x-tree-icon-hyperv" && n.iconCls != "x-tree-icon-hypervmachine") {
+                if (defunctmap[k] == null && n.iconCls != "x-tree-icon-hyperv" && n.iconCls != "x-tree-icon-hypervmachine" && n.iconCls != "x-tree-icon-mssql" && n.iconCls != "x-tree-icon-mssqldb") {
                     defunctmap[k] = true;
 
                     var p = scope.ngSources[i];
@@ -327,7 +333,8 @@ backupApp.directive('sourceFolderPicker', function() {
             node.expanded = !node.expanded;
 
             if (node.root || node.iconCls == 'x-tree-icon-leaf' || node.iconCls == 'x-tree-icon-locked'
-                || node.iconCls == 'x-tree-icon-hyperv' || node.iconCls == 'x-tree-icon-hypervmachine')
+                || node.iconCls == 'x-tree-icon-hyperv' || node.iconCls == 'x-tree-icon-hypervmachine'
+                || node.iconCls == 'x-tree-icon-mssql' || node.iconCls == 'x-tree-icon-mssqldb')
                 return;
 
             if (!node.children && !node.loading) {
@@ -435,6 +442,39 @@ backupApp.directive('sourceFolderPicker', function() {
                 syncTreeWithLists();
             }
         }, AppUtils.connectionError);
+
+        AppService.get('/mssql', { path: '/' }).then(function (data) {
+            if (data.data.length > 0) {
+                var mssqlnode = {
+                    text: gettextCatalog.getString('Microsoft SQL Databases'),
+                    id: "%MSSQL%",
+                    children: []
+                };
+                setIconCls(mssqlnode);
+                var cp = compareablePath(mssqlnode.id);
+                displayMap[cp] = gettextCatalog.getString('All Microsoft SQL Databases');
+
+                // add MS SQL DB at the beginning
+                if (scope.treedata.children.length < 1)
+                    scope.treedata.children.push(mssqlnode);
+                else
+                    scope.treedata.children = [mssqlnode].concat(scope.treedata.children);
+
+                for (var i = 0; i < data.data.length; i++) {
+                    var node = {
+                        leaf: true,
+                        id: "%MSSQL%\\" + data.data[i].id,
+                        text: data.data[i].name
+                    };
+
+                    cp = compareablePath(node.id);
+                    displayMap[cp] = gettextCatalog.getString('Microsoft SQL Database:') + " " + node.text;
+                    setIconCls(node);
+                    mssqlnode.children.push(node);
+                }
+                syncTreeWithLists();
+            }
+        }, AppUtils.connectionError);
     }
   }
 });

Updates/build_version.txt

@@ -1 +1 @@
-30
+31

changelog.txt

@@ -1,3 +1,9 @@
+2016-11-03 - 2.0.1.31_canary_2016-11-03
+==========
+* Fixed autoupdater choosing old update if the base version was replaced
+* Improved the UI for adding a backup, thanks @agrajaghh
+* Added MSSQL to potential backup targets, thanks @mnaiman
+
 2016-11-03 - 2.0.1.30_experimental_2016-11-03
 ==========
 * Experimental release; includes all canary changes