Added property CurrentGroup

Author: shugaoye

KPCLib.xunit/PxDatabaseTests.cs

@@ -159,6 +159,7 @@ public void DeleteGroupTests(bool permanent)
         [InlineData("General/G1/G21/G21E1")]
         [InlineData("General/G1/G21/")]
         [InlineData("General/G1/G21")]
+        [InlineData("/G1/G21")]
         /// <summary>
         /// Find group or entry test.
         /// </summary>
@@ -171,7 +172,8 @@ public void FindByPathTests(string path)
             }
             else 
             {
-                Debug.WriteLine($"{passxyz.PxDb.FindByPath<PwEntry>(path)}");
+                if(path.StartsWith("/")) { Assert.Null(passxyz.PxDb.FindByPath<PwGroup>(path)); }
+                else Debug.WriteLine($"{passxyz.PxDb.FindByPath<PwEntry>(path)}");
             }
         }
 
@@ -189,21 +191,40 @@ public void FindEntryByPathTests(string path)
 
         [Theory]
         [InlineData("General/G1/G21/G21E1")]
+        [InlineData("/utdb/General/G1/G21")]
+        [InlineData("../..")]
+        [InlineData("..")]
         /// <summary>
         /// Find group using an entry pass.
         /// </summary>
         public void FindGroupByPathTests(string path)
         {
-            passxyz.PxDb.CurrentGroup = passxyz.PxDb.RootGroup;
-            Debug.WriteLine($"{passxyz.PxDb.FindByPath<PwGroup>(path)}");
-            Assert.Null(passxyz.PxDb.FindByPath<PwGroup>(path));
+            PwGroup group;
+
+            if (path.StartsWith("/")) {
+                group = passxyz.PxDb.FindByPath<PwGroup>(path);
+                Assert.NotNull(group);
+            }
+            else if(path.StartsWith(".."))
+            {
+                passxyz.PxDb.CurrentGroup = passxyz.PxDb.FindByPath<PwGroup>("/utdb/General/G1/G21");
+                Debug.WriteLine($"Current group is: {passxyz.PxDb.CurrentGroup}");
+                group = passxyz.PxDb.FindByPath<PwGroup>(path);
+            }
+            else 
+            {
+                passxyz.PxDb.CurrentGroup = passxyz.PxDb.RootGroup;
+                group = passxyz.PxDb.FindByPath<PwGroup>(path);
+                Debug.WriteLine($"Cannot find group {path}");
+                Assert.Null(group);
+            }
         }
 
         [Fact]
         public void FindByPathDefaultTests() 
         {
             Assert.Null(passxyz.PxDb.FindByPath<PwEntry>());
-            Assert.Equal(passxyz.PxDb.FindByPath<PwGroup>().ToString(), passxyz.PxDb.CurrentGroup.ToString());
+            Assert.Equal(passxyz.PxDb.FindByPath<PwGroup>().ToString(), passxyz.PxDb.RootGroup.ToString());
         }
 
         [Fact]
@@ -212,6 +233,13 @@ public void CurrentGroupTests()
             Debug.WriteLine($"{passxyz.PxDb.CurrentGroup}");
             Assert.NotNull(passxyz.PxDb.CurrentGroup);
         }
+
+        [Fact]
+        public void CurrentPathTests()
+        {
+            Debug.WriteLine($"Current path is {passxyz.PxDb.CurrentPath}.");
+            Assert.NotNull(passxyz.PxDb.CurrentPath);
+        }
     }
 
     public class PxLibInfoTests 

PassXYZLib/PxDatabase.cs

@@ -164,6 +164,22 @@ public PwGroup CurrentGroup
 			set { this.LastSelectedGroup = value.Uuid; }
 		}
 
+		public string CurrentPath 
+		{ 
+			get {
+				var group = this.CurrentGroup;
+				string path = this.CurrentGroup.Name + "/";
+
+				while (this.RootGroup.Uuid != group.Uuid)
+				{
+					group = group.ParentGroup;
+					path = group.Name + "/" + path;
+				}
+
+				return path;
+			}
+		}
+
 		private void EnsureRecycleBin(ref PwGroup pgRecycleBin)
 		{
 			if (pgRecycleBin == this.RootGroup)
@@ -195,8 +211,27 @@ private void EnsureRecycleBin(ref PwGroup pgRecycleBin)
 			if (this.IsOpen)
 			{ 
 				if (path == null) throw new ArgumentNullException("path");
+
 				string[] paths = path.Split('/');
 				var lastSelectedGroup = this.CurrentGroup;
+
+				if (path.StartsWith("/"))
+				{
+					//
+					// if the path start with "/", we have to remove "/root" and
+					// search from the root group
+					//
+					if(path.StartsWith("/" + this.RootGroup.Name))
+					{
+						lastSelectedGroup = this.RootGroup;
+						paths = String.Join("/", paths, 2, paths.Length - 2).Split('/');
+					}
+					else 
+					{
+						return default(T);
+					}
+				}
+
 				if(paths.Length > 0) 
 				{
 					if (typeof(T).Name == "PwGroup") 
@@ -263,6 +298,12 @@ PwGroup FindSubgroup(PwGroup group, string name)
 				if (group == null) throw new ArgumentNullException("group");
 				if (name == null) throw new ArgumentNullException("name");
 
+				if(name == "..") 
+				{
+					if (this.RootGroup.Uuid != group.Uuid) { return group.ParentGroup; }
+					else { return null; }
+				}
+
 				foreach (var gp in group.Groups) 
 				{ 
 					if(gp.Name == name)