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

Made RazorDataTypeModel attribute multiple instance (meaning you can apply the same model to multiple data types without seperate copies of the model). Added a priority with a default of 100 to the model binder attribute.

Browse Source
This commit is contained in:
agrath
2012-01-09 08:26:39 -13:00
parent fde12a532c
commit 9f15137832
2 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
View File

@@ -374,7 +374,7 @@ namespace umbraco.MacroEngines
}
return list;
}
static Dictionary<Guid, Type> RazorDataTypeModelTypes = null;
static Dictionary<System.Tuple<Guid, int>, Type> RazorDataTypeModelTypes = null;
public override bool TryGetMember(GetMemberBinder binder, out object result)
{
@@ -421,29 +421,36 @@ namespace umbraco.MacroEngines
HttpContext.Current.Trace.Write("RazorDataTypeModelTypes cache is empty, populating cache using TypeFinder...");
try
{
RazorDataTypeModelTypes = new Dictionary<Guid, Type>();
RazorDataTypeModelTypes = new Dictionary<System.Tuple<Guid, int>, Type>();
TypeFinder.FindClassesMarkedWithAttribute(typeof(RazorDataTypeModel))
.ToList()
.FindAll(type => typeof(IRazorDataTypeModel).IsAssignableFrom(type))
.ConvertAll(type =>
{
RazorDataTypeModel RazorDataTypeModelAttribute = (RazorDataTypeModel)Attribute.GetCustomAttribute(type, typeof(RazorDataTypeModel));
Guid g = RazorDataTypeModelAttribute.DataTypeEditorId;
return new KeyValuePair<Guid, Type>(g, type);
IEnumerable<RazorDataTypeModel> RazorDataTypeModelAttributes = Attribute.GetCustomAttributes(type, typeof(RazorDataTypeModel)).Cast<RazorDataTypeModel>();
return RazorDataTypeModelAttributes.ToList().ConvertAll(RazorDataTypeModelAttribute =>
{
Guid g = RazorDataTypeModelAttribute.DataTypeEditorId;
int priority = RazorDataTypeModelAttribute.Priority;
return new KeyValuePair<System.Tuple<Guid, int>, Type>(new System.Tuple<Guid, int>(g, priority), type);
});
})
.SelectMany(item => item)
.ToList()
.ForEach(item =>
{
if (!RazorDataTypeModelTypes.ContainsKey(item.Key))
System.Tuple<Guid, int> key = item.Key;
if (!RazorDataTypeModelTypes.ContainsKey(key))
{
RazorDataTypeModelTypes.Add(item.Key, item.Value);
RazorDataTypeModelTypes.Add(key, item.Value);
}
});
HttpContext.Current.Trace.Write(string.Format("{0} items added to cache...", RazorDataTypeModelTypes.Count));
int i = 1;
foreach (KeyValuePair<Guid, Type> item in RazorDataTypeModelTypes)
foreach (KeyValuePair<System.Tuple<Guid, int>, Type> item in RazorDataTypeModelTypes)
{
HttpContext.Current.Trace.Write(string.Format("{0}/{1}: {2} => {3}", i, RazorDataTypeModelTypes.Count, item.Key, item.Value.FullName));
HttpContext.Current.Trace.Write(string.Format("{0}/{1}: {2}@{4} => {3}", i, RazorDataTypeModelTypes.Count, item.Key.Item1, item.Value.FullName, item.Key.Item2));
i++;
}
}
@@ -455,46 +462,55 @@ namespace umbraco.MacroEngines
}
}
HttpContext.Current.Trace.Write(string.Format("Checking the RazorDataTypeModelTypes cache to see if the GUID {0} has a Model...", dataType));
if (RazorDataTypeModelTypes != null && RazorDataTypeModelTypes.ContainsKey(dataType) && dataType != Guid.Empty)
if (RazorDataTypeModelTypes != null && RazorDataTypeModelTypes.Where(model => model.Key.Item1 == dataType).Any() && dataType != Guid.Empty)
{
Type dataTypeType = RazorDataTypeModelTypes[dataType];
HttpContext.Current.Trace.Write(string.Format("Found dataType {0} for GUID {1}", dataTypeType.FullName, dataType));
IRazorDataTypeModel razorDataTypeModel = Activator.CreateInstance(dataTypeType, false) as IRazorDataTypeModel;
HttpContext.Current.Trace.Write(string.Format("Instantiating {0}...", dataTypeType.FullName));
if (razorDataTypeModel != null)
var razorDataTypeModelDefinition = RazorDataTypeModelTypes.Where(model => model.Key.Item1 == dataType).OrderByDescending(model => model.Key.Item2).FirstOrDefault();
if (!(razorDataTypeModelDefinition.Equals(default(KeyValuePair<System.Tuple<Guid, int>, Type>))))
{
HttpContext.Current.Trace.Write("Success");
object instance = null;
HttpContext.Current.Trace.Write("Calling Init on razorDataTypeModel");
if (razorDataTypeModel.Init(n.Id, data.Value, out instance))
Type dataTypeType = razorDataTypeModelDefinition.Value;
HttpContext.Current.Trace.Write(string.Format("Found dataType {0} for GUID {1}", dataTypeType.FullName, dataType));
IRazorDataTypeModel razorDataTypeModel = Activator.CreateInstance(dataTypeType, false) as IRazorDataTypeModel;
HttpContext.Current.Trace.Write(string.Format("Instantiating {0}...", dataTypeType.FullName));
if (razorDataTypeModel != null)
{
if (instance != null)
HttpContext.Current.Trace.Write("Success");
object instance = null;
HttpContext.Current.Trace.Write("Calling Init on razorDataTypeModel");
if (razorDataTypeModel.Init(n.Id, data.Value, out instance))
{
HttpContext.Current.Trace.Write(string.Format("razorDataTypeModel successfully instantiated and returned a valid instance of type {0}", instance.GetType().FullName));
if (instance != null)
{
HttpContext.Current.Trace.Write(string.Format("razorDataTypeModel successfully instantiated and returned a valid instance of type {0}", instance.GetType().FullName));
}
else
{
HttpContext.Current.Trace.Warn("razorDataTypeModel successfully instantiated but returned null for instance");
}
result = instance;
return true;
}
else
{
HttpContext.Current.Trace.Warn("razorDataTypeModel successfully instantiated but returned null for instance");
if (instance != null)
{
HttpContext.Current.Trace.Write(string.Format("razorDataTypeModel returned false but returned a valid instance of type {0}", instance.GetType().FullName));
}
else
{
HttpContext.Current.Trace.Warn("razorDataTypeModel successfully instantiated but returned null for instance");
}
}
result = instance;
return true;
}
else
{
if (instance != null)
{
HttpContext.Current.Trace.Write(string.Format("razorDataTypeModel returned false but returned a valid instance of type {0}", instance.GetType().FullName));
}
else
{
HttpContext.Current.Trace.Warn("razorDataTypeModel successfully instantiated but returned null for instance");
}
HttpContext.Current.Trace.Write("Failed");
HttpContext.Current.Trace.Warn(string.Format("DataTypeModel {0} failed to instantiate, perhaps it is lacking a parameterless constructor or doesn't implement IRazorDataTypeModel?", dataTypeType.FullName));
}
}
else
{
HttpContext.Current.Trace.Write("Failed");
HttpContext.Current.Trace.Warn(string.Format("DataTypeModel {0} failed to instantiate, perhaps it is lacking a parameterless constructor or doesn't implement IRazorDataTypeModel?", dataTypeType.FullName));
HttpContext.Current.Trace.Warn(string.Format("Could not get the dataTypeType for the RazorDataTypeModel"));
}
}
else

10
umbraco.MacroEngines.Juno/RazorDynamicNode/RazorDataTypeModel.cs
View File

@@ -5,17 +5,23 @@ using System.Text;
namespace umbraco.MacroEngines
{
[AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
[AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
public sealed class RazorDataTypeModel : Attribute
{
public readonly Guid DataTypeEditorId;
public readonly int Priority;
public RazorDataTypeModel(string DataTypeEditorId)
{
this.DataTypeEditorId = new Guid(DataTypeEditorId);
Priority = 100;
}
public RazorDataTypeModel(string DataTypeEditorId, int Priority)
{
this.DataTypeEditorId = new Guid(DataTypeEditorId);
this.Priority = Priority;
}
}
}