Merge pull request #2011 from duplicati/feature/work_on_homedir_windows

Additional workarounds to support variations in the Windows "Home" folder. This should solve #1913 or at least add enough information that it can be fixed.
duplicati · Oct 14, 2016 · 737976c · 737976c
2 parents bc55763 + f042a46
commit 737976c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 20 deletions.
diff --git a/Duplicati/Library/Utility/FilterExpression.cs b/Duplicati/Library/Utility/FilterExpression.cs
@@ -379,15 +379,16 @@ public static void AnalyzeFilters(IFilter filter, out bool includes, out bool ex
             includes = false;
             excludes = false;
 
-            Tuple<bool, bool> cacheLookup;
+            Tuple<bool, bool> cacheLookup = null;
 
             // Check for cached results
-            lock(_matchLock)
-                if (_matchFallbackLookup.TryGetValue(filter, out cacheLookup))
-                {
-                    includes = cacheLookup.Item1;
-                    excludes = cacheLookup.Item2;
-                }
+            if (filter != null)
+                lock(_matchLock)
+                    if (_matchFallbackLookup.TryGetValue(filter, out cacheLookup))
+                    {
+                        includes = cacheLookup.Item1;
+                        excludes = cacheLookup.Item2;
+                    }
 
             // Figure out what components are in the filter
             if (cacheLookup == null)

diff --git a/Duplicati/Server/SpecialFolders.cs b/Duplicati/Server/SpecialFolders.cs
@@ -30,7 +30,8 @@ public static class SpecialFolders
         public static string ExpandEnvironmentVariables(string path)
         {
             foreach(var n in Nodes)
-                path = path.Replace(n.id, n.resolvedpath);
+                if (path.StartsWith(n.id))
+                    path = path.Replace(n.id, n.resolvedpath);
             return Library.Utility.Utility.ExpandEnvironmentVariables(path);
         }
 
@@ -84,18 +85,22 @@ private static void TryAdd(List<Serializable.TreeNode> lst, string folder, strin
         {
             try
             {
-                if (System.IO.Path.IsPathRooted(folder) && System.IO.Directory.Exists(folder))
+                if (!string.IsNullOrWhiteSpace(folder) && System.IO.Path.IsPathRooted(folder) && System.IO.Directory.Exists(folder))
                 {
-                    lst.Add(new Serializable.TreeNode() {
-                        id = id,
-                        text = display,
-                        leaf = false,
-                        iconCls = "x-tree-icon-special",
-                        resolvedpath = folder
-                    });
-
-                    PathMap[id] = folder;
-                    DisplayMap[id] = display;
+                    if (!PathMap.ContainsKey(id))
+                    {
+                        lst.Add(new Serializable.TreeNode()
+                        {
+                            id = id,
+                            text = display,
+                            leaf = false,
+                            iconCls = "x-tree-icon-special",
+                            resolvedpath = folder
+                        });
+
+                        PathMap[id] = folder;
+                        DisplayMap[id] = display;
+                    }
                 }
             }
             catch
@@ -107,7 +112,7 @@ static SpecialFolders()
         {
             var lst = new List<Serializable.TreeNode>();
 
-            if (!Library.Utility.Utility.IsClientLinux)
+            if (Library.Utility.Utility.IsClientWindows)
             {
                 TryAdd(lst, Environment.SpecialFolder.MyDocuments, "%MY_DOCUMENTS%", "My Documents");
                 TryAdd(lst, Environment.SpecialFolder.MyMusic, "%MY_MUSIC%", "My Music");
@@ -116,13 +121,24 @@ static SpecialFolders()
                 TryAdd(lst, Environment.SpecialFolder.DesktopDirectory, "%DESKTOP%", "Desktop");
                 TryAdd(lst, Environment.SpecialFolder.ApplicationData, "%APPDATA%", "Application Data");
                 TryAdd(lst, Environment.SpecialFolder.UserProfile, "%HOME%", "Home");
+
+                try
+                {
+                    // In case the UserProfile member points to junk
+                    TryAdd(lst, System.IO.Path.Combine(Environment.GetEnvironmentVariable("HOMEDRIVE"), Environment.GetEnvironmentVariable("HOMEPATH")), "%HOME%", "Home");
+                }
+                catch
+                {
+                }
+
             }
             else
             {
                 TryAdd(lst, Environment.SpecialFolder.MyDocuments, "%MY_DOCUMENTS%", "My Documents");
                 TryAdd(lst, Environment.SpecialFolder.MyMusic, "%MY_MUSIC%", "My Music");
                 TryAdd(lst, Environment.SpecialFolder.MyPictures, "%MY_PICTURES%", "My Pictures");
                 TryAdd(lst, Environment.SpecialFolder.DesktopDirectory, "%DESKTOP%", "Desktop");
+                TryAdd(lst, Environment.GetEnvironmentVariable("HOME"), "%HOME%", "Home");
                 TryAdd(lst, Environment.SpecialFolder.Personal, "%HOME%", "Home");
             }
 

diff --git a/Duplicati/Server/WebServer/RESTMethods/SystemInfo.cs b/Duplicati/Server/WebServer/RESTMethods/SystemInfo.cs
@@ -100,6 +100,7 @@ private static object SystemData(RequestInfo info)
                 UsingAlternateUpdateURLs = Duplicati.Library.AutoUpdater.AutoUpdateSettings.UsesAlternateURLs,
                 LogLevels = Enum.GetNames(typeof(Duplicati.Library.Logging.LogMessageType)),
                 SuppressDonationMessages = Duplicati.Library.Main.Utility.SuppressDonationMessages,
+                SpecialFolders = from n in SpecialFolders.Nodes select new { ID = n.id, Path = n.resolvedpath },
                 BrowserLocale = new
                 {
                     Code = browserlanguage.Name,