Improved determination of indexes path when indexBase use parent path syntax (eg. "../indexes")

Author: ecortese

src/NHibernate.Search.Tests/Util/DirectoryHelperTest.cs

@@ -2,7 +2,9 @@
 
 namespace NHibernate.Search.Tests.Util
 {
+    using System;
     using System.IO;
+    using System.Linq;
     using System.Threading;
 
     using NUnit.Framework;
@@ -55,6 +57,22 @@ public void CreateViaRelative()
             Assert.IsTrue(info.Exists);
         }
 
+        [Test]
+        public void CreateViaParent()
+        {
+            var properties = new Dictionary<string, string>();            
+            properties["indexBase"] = "../Wilma";
+            properties["indexName"] = "fakeIndex";
+
+            DirectoryInfo info = DirectoryProviderHelper.DetermineIndexDir(null, properties);
+
+            // get process execution path
+            DirectoryInfo targetParentDir = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory);
+
+            // check if a directory info object was returned and "Wilma" folder was created into parent folder of execution process
+            Assert.IsTrue(targetParentDir.Parent.GetDirectories().Any(d => d.Name.Equals(info.Parent.Name)));
+        }
+
         #region Helper methods
 
         [SetUp]

src/NHibernate.Search/Util/DirectoryProviderHelper.cs

@@ -88,11 +88,37 @@ public static string GetSourceDirectory(string rootPropertyName, string relative
 
         public static DirectoryInfo DetermineIndexDir(String directoryProviderName, IDictionary properties)
         {
-            string indexBase = (string) properties["indexBase"] ?? ".";
-            string indexName = (string) properties["indexName"] ?? directoryProviderName;
+            string indexBase = (string)properties["indexBase"];
+
+            if (indexBase == null)
+            {
+                indexBase = ".";
+            }
+            else if (indexBase.StartsWith("~"))
+            {
+                // We need this to allow using the search from the web, where the "." directory is somewhere in the system root.
+                indexBase = indexBase.Replace("~", AppDomain.CurrentDomain.BaseDirectory);
+            }
+            else if (indexBase.StartsWith(".."))
+            {
+                // determine the indexBase path when using parent directory (eg. "../indexes")
+
+                DirectoryInfo targetParentDir = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory);
+
+                string path = indexBase;
+
+                while (path.StartsWith(".."))
+                {
+                    if (targetParentDir.Parent == null)
+                        throw new HibernateException("IndexBase path not valid");
+
+                    targetParentDir = targetParentDir.Parent;
+                    path = path.Remove(0, 3);
+                }
+
+                indexBase = Path.Combine(targetParentDir.FullName, path);
+            }
 
-            // We need this to allow using the search from the web, where the "." directory is somewhere in the system root.
-            indexBase = indexBase.Replace("~", AppDomain.CurrentDomain.BaseDirectory);
             DirectoryInfo indexDir = new DirectoryInfo(indexBase);
             if (!indexDir.Exists)
             {
@@ -105,8 +131,9 @@ public static DirectoryInfo DetermineIndexDir(String directoryProviderName, IDic
                 throw new HibernateException("Cannot write into index directory: " + indexBase);
             }
 
-            indexDir = new DirectoryInfo(Path.Combine(indexDir.FullName, indexName));
-            return indexDir;
+            string indexName = (string)properties["indexName"] ?? directoryProviderName;
+
+            return new DirectoryInfo(Path.Combine(indexDir.FullName, indexName));
         }
 
         private static bool HasWriteAccess(DirectoryInfo indexDir)