Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 24 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
index c8b2fce32..c78a11732 100644
--- a/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
@@ -25,6 +25,8 @@ namespace Tango.FileSystem
 
         public DateTime DateModified { get; set; }
 
+        public DateTime DateCreated { get; set; }
+
         public long Size { get; set; }
 
         public String Name
@@ -75,11 +77,33 @@ namespace Tango.FileSystem
             }
 
             item.DateModified = dto.DateModified;
+            item.DateCreated = dto.DateCreated;
             item.Path = dto.Path;
             item.Size = dto.Size;
             item.Type = dto.Type;
 
             return item;
         }
+
+        public String GetParent()
+        {
+            if (Path == "/") return null;
+
+            String root = System.IO.Path.GetPathRoot(Path);
+            var parent = Directory.GetParent(Path);
+
+            if (root == "\\")
+            {
+                return parent.FullName.Replace(parent.Root.FullName, "/").Replace("\\", "/");
+            }
+            else if (parent != null)
+            {
+                return parent.FullName;
+            }
+            else
+            {
+                return null;
+            }
+        }
     }
 }