Added "AddFolder" property

Author: ThiBro

NetworkFiles/Binary/NetworkFilesNew.zip

@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using System.Net;
 using Peakboard.ExtensionKit;
 
@@ -19,42 +17,105 @@ protected override CustomListDefinition GetDefinitionOverride()
             PropertyInputDefaults = {
                 new CustomListPropertyDefinition(){ Name = "Domain", Value = "domain"},
                 new CustomListPropertyDefinition(){ Name = "User", Value = "johndoe"},
-                new CustomListPropertyDefinition(){ Name = "Password", Masked = true},
+                new CustomListPropertyDefinition(){ Name = "Password", TypeDefinition = new CustomListPropertyStringTypeDefinition() { Masked = true } },
                 new CustomListPropertyDefinition(){ Name = "UNCFolder", Value = @"\\server\folder"},
-                new CustomListPropertyDefinition(){ Name = "CheckSubfolders", Value = "False", TypeDefinition = new CustomListPropertyBooleanTypeDefinition()}
+                new CustomListPropertyDefinition(){ Name = "CheckSubfolders", Value = "False", TypeDefinition = new CustomListPropertyBooleanTypeDefinition()},
+                new CustomListPropertyDefinition(){ Name = "AddFolders", Value = "False", TypeDefinition = new CustomListPropertyBooleanTypeDefinition()}
             }
         };
     }
 
     protected override CustomListColumnCollection GetColumnsOverride(CustomListData data)
     {
-        return new CustomListColumnCollection
+        data.Properties.TryGetValue("AddFolders", out var addFolders);
+        
+        if (addFolders == "True")
         {
-            new CustomListColumn("Path", CustomListColumnTypes.String),
-            new CustomListColumn("Name", CustomListColumnTypes.String),
-            new CustomListColumn("LastModified", CustomListColumnTypes.String),
-        };
+            return new CustomListColumnCollection
+            {
+                new CustomListColumn("Path", CustomListColumnTypes.String),
+                new CustomListColumn("Name", CustomListColumnTypes.String),
+                new CustomListColumn("LastModified", CustomListColumnTypes.String),
+                new CustomListColumn("IsFolder", CustomListColumnTypes.Boolean),
+            };
+        }
+        else
+        {
+            return new CustomListColumnCollection
+            {
+                new CustomListColumn("Path", CustomListColumnTypes.String),
+                new CustomListColumn("Name", CustomListColumnTypes.String),
+                new CustomListColumn("LastModified", CustomListColumnTypes.String),
+            };
+        }
     }
 
     protected override CustomListObjectElementCollection GetItemsOverride(CustomListData data)
     {
         var items = new CustomListObjectElementCollection();
+
         data.Properties.TryGetValue("UNCFolder", out var folder);
         data.Properties.TryGetValue("User", out var user);
         data.Properties.TryGetValue("Password", out var password);
         data.Properties.TryGetValue("Domain", out var domain);
         data.Properties.TryGetValue("CheckSubfolders", out var checkSubfolders);
+        data.Properties.TryGetValue("AddFolders", out var addFolders);
+
+        var includeSubfolders = string.Equals(checkSubfolders, "True", StringComparison.OrdinalIgnoreCase);
+        var includeFolders = string.Equals(addFolders, "True", StringComparison.OrdinalIgnoreCase);
+
         var credentials = new NetworkCredential(user, password, domain);
 
         using (var nc = new NetworkConnection(folder, credentials))
         {
-            foreach (var file in Directory.GetFiles(nc.NetworkName, "*", checkSubfolders == "True" ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly))
+            var root = nc.NetworkName.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+            AddFolderContent(items, root, includeSubfolders, includeFolders);
+        }
+
+        return items;
+    }
+
+    private void AddFolderContent(CustomListObjectElementCollection items, string folderPath, bool includeSubfolders, bool includeFolders)
+    {
+        if (includeFolders)
+        {
+            var folderName = Path.GetFileName(folderPath);
+
+            var obj = new CustomListObjectElement
+        {
+            { "Path", folderPath },
+            { "Name", folderName },
+            { "LastModified", string.Empty }
+        };
+
+            obj.Add("IsFolder", true);
+
+            items.Add(obj);
+        }
+
+        if (includeSubfolders)
+        {
+            foreach (var subFolder in Directory.GetDirectories(folderPath, "*", SearchOption.TopDirectoryOnly))
             {
-                var modified = File.GetLastWriteTime(file);
-                items.Add(new CustomListObjectElement() { { "Path", file }, { "Name", Path.GetFileName(file) }, { "LastModified", modified.ToString("yyyyMMddHHmmss") } });
+                AddFolderContent(items, subFolder, includeSubfolders, includeFolders);
             }
         }
 
-        return items;
+        foreach (var file in Directory.GetFiles(folderPath, "*", SearchOption.TopDirectoryOnly))
+        {
+            var modified = File.GetLastWriteTime(file);
+
+            var obj = new CustomListObjectElement
+            {
+                { "Path", file },
+                { "Name", Path.GetFileName(file) },
+                { "LastModified", modified.ToString("yyyyMMddHHmmss") }
+            };
+
+            if (includeFolders)
+                obj.Add("IsFolder", false);
+
+            items.Add(obj);
+        }
     }
 }