Merge pull request #5956 from luxliber/master

Ability for defining NodeCategoryAttribute for ZeroTouch methods and overriding last category part
DynamoDS · Jan 27, 2016 · b10a723 · b10a723
2 parents 80b93d7 + ffe76c3
commit b10a723
Showing 1 changed file with 36 additions and 0 deletions.
diff --git a/src/DynamoCore/Library/FunctionDescriptor.cs b/src/DynamoCore/Library/FunctionDescriptor.cs
@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
+using Dynamo.Graph.Nodes;
 using Dynamo.Interfaces;
 using Dynamo.Library;
 
@@ -222,6 +224,40 @@ public string Category
             {
                 var categoryBuf = new StringBuilder();
                 categoryBuf.Append(GetRootCategory());
+
+                //if this is not BuiltIn function search NodeCategoryAttribute for it
+                if (ClassName!=null)
+                {
+                    //get function assembly
+                    var asm = AppDomain.CurrentDomain.GetAssemblies()
+                        .Where(x => x.GetName().Name == Path.GetFileNameWithoutExtension(Assembly))
+                        .ToArray();
+
+                    if (asm.Any() && asm.First().GetType(ClassName)!=null)
+                    {
+                        //get class type of function
+                        var type = asm.First().GetType(ClassName);
+
+                        //get NodeCategoryAttribute for this function if it was been defined
+                        var nodeCat = type.GetMethods().Where(x=>x.Name==FunctionName)
+                            .Select(x => x.GetCustomAttribute(typeof (NodeCategoryAttribute)))
+                            .Where(x=>x!=null)
+                            .Cast<NodeCategoryAttribute>()
+                            .Select(x=>x.ElementCategory)
+                            .FirstOrDefault();
+
+                        //if attribute is found compose node category string with last part from attribute
+                        if (!string.IsNullOrEmpty(nodeCat) && (
+                            nodeCat == LibraryServices.Categories.Constructors
+                            || nodeCat == LibraryServices.Categories.Properties
+                            || nodeCat == LibraryServices.Categories.MemberFunctions))
+                        {
+                            categoryBuf.Append("." + UnqualifedClassName + "." + nodeCat);
+                            return categoryBuf.ToString();
+                        }
+                    }
+                }
+
                 switch (Type)
                 {
                     case FunctionType.Constructor: