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

1 files changed, 34 insertions, 10 deletions

diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs
index c18df97c9..46ca080a2 100644
--- a/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs
@@ -73,15 +73,18 @@ namespace Tango.FileSystem
                 });
             }
 
-            foreach (var file in Directory.GetFiles(request.Path))
+            if (!request.FoldersOnly)
             {
-                items.Add(new FileSystemItemDTO()
+                foreach (var file in Directory.GetFiles(request.Path, request.Filter != null ? request.Filter : "*.*"))
                 {
-                    Path = file,
-                    Type = FileSystemItemType.File,
-                    DateModified = File.GetLastWriteTimeUtc(file),
-                    Size = new FileInfo(file).Length
-                });
+                    items.Add(new FileSystemItemDTO()
+                    {
+                        Path = file,
+                        Type = FileSystemItemType.File,
+                        DateModified = File.GetLastWriteTimeUtc(file),
+                        Size = new FileInfo(file).Length
+                    });
+                }
             }
 
             return new FileSystemItemDTO()
@@ -92,24 +95,28 @@ namespace Tango.FileSystem
             };
         }
 
-        public Task<FileSystemItem> GetFolder(String path)
+        public Task<FileSystemItem> GetFolder(String path, bool foldersOnly = false, String filter = "*.*")
         {
             return Task.Factory.StartNew<FileSystemItem>(() =>
             {
                 return FileSystemItem.FromDTO(GetFolder(new GetFileSystemItemRequest()
                 {
                     Path = path,
+                    FoldersOnly = foldersOnly,
+                    Filter = filter,
                 }));
             });
         }
 
-        public Task<FileSystemItem> GetFolder(Environment.SpecialFolder specialFolder)
+        public Task<FileSystemItem> GetFolder(Environment.SpecialFolder specialFolder, bool foldersOnly = false, String filter = "*.*")
         {
             return Task.Factory.StartNew<FileSystemItem>(() =>
             {
                 return FileSystemItem.FromDTO(GetFolder(new GetFileSystemItemRequest()
                 {
-                    SpecialFolder = specialFolder
+                    SpecialFolder = specialFolder,
+                    FoldersOnly = foldersOnly,
+                    Filter = filter,
                 }));
             });
         }
@@ -174,5 +181,22 @@ namespace Tango.FileSystem
                 throw new FileNotFoundException("Could not locate the source file or folder.");
             }
         }
+
+        public FileSystemItemDTO CreateFolder(String path, String folderName)
+        {
+            String fullPath = Path.Combine(path, folderName);
+
+            if (Directory.Exists(fullPath))
+            {
+                throw new IOException("The specified directory name already exists.");
+            }
+
+            Directory.CreateDirectory(fullPath);
+
+            return GetFolder(new GetFileSystemItemRequest()
+            {
+                Path = fullPath
+            });
+        }
     }
 }