Updated extensions

EcsRx · Sep 4, 2018 · e918f79 · e918f79
1 parent 73ba3bb
commit e918f79
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/EcsRx.Infrastructure.Ninject/NinjectDependencyContainer.cs b/src/EcsRx.Infrastructure.Ninject/NinjectDependencyContainer.cs
@@ -71,6 +71,9 @@ public void Bind<TFrom, TTo>(BindingConfiguration configuration = null) where TT
 
             foreach (var constructorArg in configuration.WithNamedConstructorArgs)
             { binding.WithConstructorArgument(constructorArg.Key, constructorArg.Value); }
+
+            foreach (var constructorArg in configuration.WithTypedConstructorArgs)
+            { binding.WithConstructorArgument(constructorArg.Key, constructorArg.Value); }
         }
 
         public void Bind<T>(BindingConfiguration configuration = null)

diff --git a/src/EcsRx/Extensions/IEnumerableExtensions.cs b/src/EcsRx/Extensions/IEnumerableExtensions.cs
@@ -34,7 +34,7 @@ public static IEnumerable<ISystem> GetApplicableSystems(this IEnumerable<ISystem
             return systems.Where(x => x.Group.RequiredComponents.All(y => componentTypes.Contains(y)));
         }
 
-        public static IEnumerable<T> OrderByPriority<T>(this IEnumerable<T> listToPrioritize)
+        public static IOrderedEnumerable<T> OrderByPriority<T>(this IEnumerable<T> listToPrioritize)
         {
             var priorityAttributeType = typeof(PriorityAttribute);
             return listToPrioritize.OrderBy(x =>
@@ -46,5 +46,18 @@ public static IEnumerable<T> OrderByPriority<T>(this IEnumerable<T> listToPriori
                 return -priorityAttribute.Priority;
             });
         } 
+
+        public static IOrderedEnumerable<T> ThenByPriority<T>(this IOrderedEnumerable<T> listToPrioritize)
+        {
+            var priorityAttributeType = typeof(PriorityAttribute);
+            return listToPrioritize.ThenBy(x =>
+            {
+                var priorityAttributes = x.GetType().GetCustomAttributes(priorityAttributeType, true);
+                if (priorityAttributes.Length <= 0) { return 0; }
+
+                var priorityAttribute = priorityAttributes.FirstOrDefault() as PriorityAttribute;
+                return -priorityAttribute.Priority;
+            });
+        } 
     }
 }