yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'U4-8198_file_system' of https://github.com/yannisgu/Umbraco-CMS into yannisgu-U4-8198_file_system

Browse Source 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2016-03-30 16:07:45 +02:00
parent 3c697436b1
commit 74e1078c31
25 changed files with 476 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
src/Umbraco.Web/Trees/FileSystemTreeController.cs
View File

@@ -2,35 +2,50 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net.Http.Formatting;
using System.Text;
using System.Threading.Tasks;
using ClientDependency.Core;
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Web.Models.Trees;
using Umbraco.Web._Legacy.Actions;
using Constants = Umbraco.Core.Constants;
namespace Umbraco.Web.Trees
{
public abstract class FileSystemTreeController : TreeController
{
protected abstract string FilePath { get; }
protected abstract string FileSearchPattern { get; }
protected abstract IEnumerable<string> FileSearchPattern { get; }
protected abstract string EditFormUrl { get; }
protected abstract bool EnableCreateOnFolder { get; }
/// <summary>
/// Inheritors can override this method to modify the file node that is created.
/// </summary>
/// <param name="xNode"></param>
protected virtual void OnRenderFileNode(ref TreeNode treeNode) { }
protected virtual void OnRenderFileNode(TreeNode treeNode, FileInfo file)
{
}
/// <summary>
/// Inheritors can override this method to modify the folder node that is created.
/// </summary>
/// <param name="xNode"></param>
protected virtual void OnRenderFolderNode(ref TreeNode treeNode) { }
protected override Models.Trees.TreeNodeCollection GetTreeNodes(string id, System.Net.Http.Formatting.FormDataCollection queryStrings)
protected virtual void OnRenderFolderNode(TreeNode treeNode)
{
}
protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
{
var nodes = new TreeNodeCollection();
string orgPath = "";
string path = "";
if (!string.IsNullOrEmpty(id) && id != "-1")
if (!string.IsNullOrEmpty(id) && id != Constants.System.Root.ToInvariantString())
{
orgPath = id;
path = IOHelper.MapPath(FilePath + "/" + orgPath);
@@ -41,54 +56,124 @@ namespace Umbraco.Web.Trees
path = IOHelper.MapPath(FilePath);
}
DirectoryInfo dirInfo = new DirectoryInfo(path);
DirectoryInfo[] dirInfos = dirInfo.GetDirectories();
if (!Directory.Exists(path) && !System.IO.File.Exists(path))
{
return nodes;
}
if (System.IO.File.Exists(path))
{
return GetTreeNodesForFile(path, id, queryStrings);
}
DirectoryInfo dirInfo = new DirectoryInfo(path);
DirectoryInfo[] dirInfos = new DirectoryInfo(path).GetDirectories();
var nodes = new TreeNodeCollection();
foreach (DirectoryInfo dir in dirInfos)
{
if ((dir.Attributes & FileAttributes.Hidden) == 0)
if ((dir.Attributes.HasFlag(FileAttributes.Hidden)) == false)
{
var HasChildren = dir.GetFiles().Length > 0 || dir.GetDirectories().Length > 0;
var node = CreateTreeNode(orgPath + dir.Name, orgPath, queryStrings, dir.Name, "icon-folder", HasChildren);
var hasChildren = dir.GetFiles().Length > 0 || dir.GetDirectories().Length > 0;
var node = CreateTreeNode(orgPath + dir.Name, orgPath, queryStrings, dir.Name, "icon-folder",
hasChildren);
OnRenderFolderNode(ref node);
if(node != null)
nodes.Add(node);
//TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
node.AdditionalData["jsClickCallback"] = "javascript:void(0);";
OnRenderFolderNode(node);
nodes.Add(node);
}
}
//this is a hack to enable file system tree to support multiple file extension look-up
//so the pattern both support *.* *.xml and xml,js,vb for lookups
string[] allowedExtensions = new string[0];
bool filterByMultipleExtensions = FileSearchPattern.Contains(",");
FileInfo[] fileInfo;
var files = FileSearchPattern
.SelectMany(p => dirInfo.GetFiles("*." + p))
.Where(f => !f.Attributes.HasFlag(FileAttributes.Hidden));
if (filterByMultipleExtensions)
foreach (FileInfo file in files)
{
fileInfo = dirInfo.GetFiles();
allowedExtensions = FileSearchPattern.ToLower().Split(',');
}
else
fileInfo = dirInfo.GetFiles(FileSearchPattern);
var nodeId = orgPath + file.Name;
foreach (FileInfo file in fileInfo)
{
if ((file.Attributes & FileAttributes.Hidden) == 0)
{
if (filterByMultipleExtensions && Array.IndexOf<string>(allowedExtensions, file.Extension.ToLower().Trim('.')) < 0)
continue;
var node = CreateTreeNode(
nodeId,
orgPath, queryStrings,
file.Name.StripFileExtension(),
"icon-file",
false,
"/" + queryStrings.GetValue<string>("application") + "/framed/" +
Uri.EscapeDataString(string.Format(EditFormUrl, nodeId)));
var node = CreateTreeNode(orgPath + file.Name, orgPath, queryStrings, file.Name, "icon-file", false);
OnRenderFileNode(node, file);
OnRenderFileNode(ref node);
if(node != null)
nodes.Add(node);
}
nodes.Add(node);
}
return nodes;
}
}
protected virtual TreeNodeCollection GetTreeNodesForFile(string path, string id, FormDataCollection queryStrings)
{
return new TreeNodeCollection();
}
protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
{
var menu = new MenuItemCollection();
OnBeforeRenderMenu(menu, id, queryStrings);
if (id == Constants.System.Root.ToInvariantString())
{
//Create the normal create action
menu.Items.Add<ActionNew>(Services.TextService.Localize("actions", ActionNew.Instance.Alias))
//Since we haven't implemented anything for file systems in angular, this needs to be converted to
//use the legacy format
.ConvertLegacyFileSystemMenuItem("", "init" + TreeAlias, queryStrings.GetValue<string>("application"));
//refresh action
menu.Items.Add<RefreshNode, ActionRefresh>(
Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true);
return menu;
}
if (Directory.Exists(IOHelper.MapPath(FilePath + "/" + id)))
{
if (EnableCreateOnFolder)
{
//Create the normal create action
menu.Items.Add<ActionNew>(Services.TextService.Localize("actions", ActionNew.Instance.Alias))
//Since we haven't implemented anything for file systems in angular, this needs to be converted to
//use the legacy format
.ConvertLegacyFileSystemMenuItem(id, TreeAlias + "Folder",
queryStrings.GetValue<string>("application"));
}
//refresh action
menu.Items.Add<RefreshNode, ActionRefresh>(
Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true);
}
//add delete option for all languages
menu.Items.Add<ActionDelete>(Services.TextService.Localize("actions", ActionDelete.Instance.Alias), true)
.ConvertLegacyFileSystemMenuItem(
id, TreeAlias, queryStrings.GetValue<string>("application"));
OnAfterRenderMenu(menu, id, queryStrings);
return menu;
}
protected virtual void OnBeforeRenderMenu(MenuItemCollection menu, string id, FormDataCollection queryStrings)
{
}
protected virtual void OnAfterRenderMenu(MenuItemCollection menu, string id, FormDataCollection queryStrings)
{
}
}
}