From 057a2a32ad95373864f50e5e75abc9bb68f1545e Mon Sep 17 00:00:00 2001 From: mahsaro Date: Fri, 31 Jul 2015 17:42:44 +0100 Subject: [PATCH] Cleanup --- .../Implementation/Map/AliasMap.cs | 15 +--- .../Implementation/Storage/AliasStorage.cs | 1 - .../Recipes/Builders/AliasStep.cs | 76 +------------------ .../Recipes/Executors/AliasStep.cs | 66 +++------------- .../Orchard.Blogs/Routing/RsdConstraint.CS | 2 - 5 files changed, 16 insertions(+), 144 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Map/AliasMap.cs b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Map/AliasMap.cs index a801872db..93eb18635 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Map/AliasMap.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Map/AliasMap.cs @@ -8,27 +8,20 @@ using System.Collections.Concurrent; namespace Orchard.Alias.Implementation.Map { public class AliasMap { - private readonly string _area; - //private readonly ConcurrentDictionary> _aliases; + private readonly string _area; private readonly ConcurrentDictionary _aliases; private readonly Node _root; public AliasMap(string area) { - _area = area; - //_aliases = new ConcurrentDictionary>(StringComparer.OrdinalIgnoreCase); + _area = area; _aliases = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); _root = new Node(); - //_isManaged = isManaged; } public IEnumerable GetAliases() { return _aliases.Select(x => new AliasInfo { Area = _area, Path = x.Key, RouteValues = x.Value.RouteValues, IsManaged = x.Value.IsManaged }); } - //public bool TryGetAlias(string virtualPath, out IDictionary routeValues) { - // return _aliases.TryGetValue(virtualPath, out routeValues); - //} - public bool TryGetAlias(string virtualPath, out AliasInfo aliasInfo) { return _aliases.TryGetValue(virtualPath, out aliasInfo); @@ -46,8 +39,6 @@ namespace Orchard.Alias.Implementation.Map { if(info == null) { throw new ArgumentNullException(); } - - //_aliases[info.Path] = info.RouteValues; _aliases[info.Path] = info; ExpandTree(_root, info.Path, info.RouteValues); } @@ -57,10 +48,8 @@ namespace Orchard.Alias.Implementation.Map { /// /// public void Remove(AliasInfo info) { - //IDictionary values; AliasInfo aliasInfo; _aliases.TryRemove(info.Path, out aliasInfo); - //_aliases.TryRemove(info.Path, out info); CollapseTree(_root, info.Path, info.RouteValues); } diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Storage/AliasStorage.cs b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Storage/AliasStorage.cs index 7569adb38..ae9d37656 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Storage/AliasStorage.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/Storage/AliasStorage.cs @@ -110,7 +110,6 @@ namespace Orchard.Alias.Implementation.Storage { // Bulk updates might go wrong if we don't flush. _aliasRepository.Flush(); var dict = ToDictionary(aliasRecord); - //TODO: _aliasHolder.RemoveAlias(new AliasInfo() { Path = dict.Item1, Area = dict.Item2, RouteValues = dict.Item3, IsManaged = dict.Item6}); } } diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Builders/AliasStep.cs b/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Builders/AliasStep.cs index 1cb3d0868..d90ef7bb1 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Builders/AliasStep.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Builders/AliasStep.cs @@ -30,8 +30,6 @@ namespace Orchard.Roles.Recipes.Builders { } public override void Build(BuildContext context) { - //var aliases = _aliasRecordepository.Table.ToList(); - var aliases = _aliasHolder.GetMaps().SelectMany(m => m.GetAliases()).Where(m => m.IsManaged== false).ToList(); if (!aliases.Any()) @@ -43,9 +41,7 @@ namespace Orchard.Roles.Recipes.Builders { foreach (var alias in aliases.OrderBy(x => x.Path)) { var aliasElement = new XElement("Alias", new XAttribute("Path", alias.Path)); - //root.Add( - // new XElement("Alias", - // new XAttribute("Path", alias.Path))); + var routeValuesElement = new XElement("RouteValues"); foreach (var routeValue in alias.RouteValues) { @@ -55,75 +51,7 @@ namespace Orchard.Roles.Recipes.Builders { aliasElement.Add(routeValuesElement); root.Add(aliasElement); } - - //add a collection of all the alias paths in this site so that the importing site can remove aliases that don't exist remotely - //var pathsElement = new XElement("Paths"); - //foreach (var aliasInfo in aliases) - //{ - // pathsElement.Add(new XElement("Add", new XAttribute("Path", aliasInfo.Path))); - //} - - //root.Add(pathsElement); - - //var rootElement = context.Document.Descendants("Orchard").FirstOrDefault(); - - //if (rootElement == null) - //{ - // var ex = new OrchardException(T("Could not export this site's Aliases because the document passed via the Export Context did not contain a node called 'Orchard'. The document was malformed.")); - // Logger.Error(ex, ex.Message); - // throw ex; - //} - - //rootElement.Add(xmlElement); } - - //public void Exporting(ExportContext context) - //{ - // if (!context.ExportOptions.CustomSteps.Contains("Aliases")) { return; } - - // var xmlElement = new XElement("Aliases"); - - // var autoroutePaths = _contentManager.Query().List().Select(p => p.Path); - // var allAliasInfos = _aliasHolder.GetMaps().SelectMany(m => m.GetAliases()).ToList(); - - // //we need to remove any aliases that are autoroutes because the remote conent id may not sync up with the local content id. the autoroutes will be imported as part of the content import - // var aliasInfosToExport = allAliasInfos.Where(ai => !autoroutePaths.Contains(ai.Path)); - - // foreach (var aliasInfo in aliasInfosToExport) - // { - // var aliasElement = new XElement("Alias", new XAttribute("Path", aliasInfo.Path)); - - // var routeValuesElement = new XElement("RouteValues"); - // foreach (var routeValue in aliasInfo.RouteValues) - // { - // routeValuesElement.Add(new XElement("Add", new XAttribute("Key", routeValue.Key), new XAttribute("Value", routeValue.Value))); - // } - - // aliasElement.Add(routeValuesElement); - // xmlElement.Add(aliasElement); - // } - - // //add a collection of all the alias paths in this site so that the importing site can remove aliases that don't exist remotely - // var pathsElement = new XElement("Paths"); - // foreach (var aliasInfo in allAliasInfos) - // { - // pathsElement.Add(new XElement("Add", new XAttribute("Path", aliasInfo.Path))); - // } - - // xmlElement.Add(pathsElement); - - // var rootElement = context.Document.Descendants("Orchard").FirstOrDefault(); - - // if (rootElement == null) - // { - // var ex = new OrchardException(T("Could not export this site's Aliases because the document passed via the Export Context did not contain a node called 'Orchard'. The document was malformed.")); - // Logger.Error(ex, ex.Message); - // throw ex; - // } - - // rootElement.Add(xmlElement); - //} - - + } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Executors/AliasStep.cs b/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Executors/AliasStep.cs index 068a95ee4..290e40463 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Executors/AliasStep.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Recipes/Executors/AliasStep.cs @@ -21,6 +21,16 @@ namespace Orchard.Alias.Recipes.Executors { get { return "Aliases"; } } + /* + + + + + + + + + */ public override void Execute(RecipeExecutionContext context) { foreach (var aliasElement in context.RecipeStep.Step.Elements()) { @@ -28,7 +38,6 @@ namespace Orchard.Alias.Recipes.Executors { Logger.Information("Processing alias '{0}'.", aliasPath); - //var path = aliasElement.Attribute("Path").Value; var rvd = new RouteValueDictionary(); var routeValuesElement = aliasElement.Descendants("RouteValues").FirstOrDefault(); @@ -48,60 +57,9 @@ namespace Orchard.Alias.Recipes.Executors { catch (Exception ex) { Logger.Error(ex, "Error while processing alias '{0}'.", aliasPath); throw; - } - + } } } - /* - - - - - - - - - */ - //Enable any features that are in the list, disable features that aren't in the list - //public override void Execute(RecipeExecutionContext context) - //{ - // if (!String.Equals(context.RecipeStep.Name, "Aliases", StringComparison.OrdinalIgnoreCase)) - // { - // return; - // } - - // var aliasElements = context.RecipeStep.Step.Descendants("Alias"); - - // foreach (var aliasElement in aliasElements) - // { - // var path = aliasElement.Attribute("Path").Value; - // var rvd = new RouteValueDictionary(); - - // var routeValuesElement = aliasElement.Descendants("RouteValues").FirstOrDefault(); - - // if (routeValuesElement != null) - // { - // foreach (var routeValue in routeValuesElement.Descendants("Add")) - // { - // rvd.Add(routeValue.Attribute("Key").Value, routeValue.Attribute("Value").Value); - // } - // } - - // _aliasService.Set(path, rvd, "Custom"); - // } - - // //remove all local pathys that are not present in the remote export - // var allRemotePaths = recipeContext.RecipeStep.Step.XPathSelectElements("Paths/Add").Select(e => e.Attribute("Path").Value); - // var allLocalPaths = _aliasService.List().Select(t => t.Item1).ToList(); - - // foreach (var path in allLocalPaths.Where(p => !allRemotePaths.Contains(p))) - // { - // _aliasService.Delete(path); - // } - - - // recipeContext.Executed = true; - //} - } + } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS b/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS index a3676c8c8..c722ec0a7 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS @@ -25,9 +25,7 @@ namespace Orchard.Blogs.Routing { return false; } - //IDictionary routeValues; AliasInfo aliasInfo; - //if (!_aliasHolder.GetMap("Orchard.Blogs").TryGetAlias(path, out routeValues)) { if (!_aliasHolder.GetMap("Orchard.Blogs").TryGetAlias(path, out aliasInfo)) { return false;