Working on job export import to storage.

1 files changed, 7 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.Explorer/ExplorerFolderItem.cs b/Software/Visual_Studio/Tango.Explorer/ExplorerFolderItem.cs
index 48f870b20..dde105767 100644
--- a/Software/Visual_Studio/Tango.Explorer/ExplorerFolderItem.cs
+++ b/Software/Visual_Studio/Tango.Explorer/ExplorerFolderItem.cs
@@ -12,7 +12,7 @@ namespace Tango.Explorer
 {
     public class ExplorerFolderItem : ExplorerItem
     {
-        private static List<String> extensions = ExplorerFileDefinition.GetSupportedExtensions().Select(x => x.Replace(".","")).ToList();
+        private static List<String> extensions = ExplorerFileDefinition.GetSupportedExtensions().Select(x => x.Replace(".", "")).ToList();
 
         public List<ExplorerItem> Items { get; set; }
 
@@ -21,7 +21,7 @@ namespace Tango.Explorer
             Items = new List<ExplorerItem>();
         }
 
-        public static ExplorerFolderItem LoadFromPath(String path)
+        public static ExplorerFolderItem LoadFromPath(String path, String filter)
         {
             ExplorerFolderItem folderItem = new ExplorerFolderItem();
 
@@ -38,9 +38,12 @@ namespace Tango.Explorer
                 folderItem.Items.Add(fItem);
             }
 
-            foreach (var file in Directory.GetFiles(path,"*.*").Where(f => extensions.Contains(f.Split('.').Last().ToLower())).ToArray())
+            foreach (var file in Directory.GetFiles(path, "*.*").Where(f => extensions.Contains(f.Split('.').Last().ToLower())).ToArray())
             {
-                folderItem.Items.Add(ExplorerFileItem.LoadFromPath(file));
+                if (filter == null || filter.ToLower().Replace("*", "").Replace(";", "").Split('|').Contains(System.IO.Path.GetExtension(file).ToLower()))
+                {
+                    folderItem.Items.Add(ExplorerFileItem.LoadFromPath(file));
+                }
             }
 
             return folderItem;