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

Updating PackagingService to use the newly added event args

Browse Source
This commit is contained in:
Morten Christensen
2014-01-19 14:30:49 +01:00
parent 473d76f1b7
commit 2ae3b09b8c
1 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/Umbraco.Core/Services/PackagingService.cs
View File

@@ -71,15 +71,15 @@ namespace Umbraco.Core.Services
/// <returns><see cref="XElement"/> containing the xml representation of the Content object</returns>
public XElement Export(IContent content, bool deep = false, bool raiseEvents = true)
{
if (raiseEvents)
{
if (ExportingContent.IsRaisedEventCancelled(new SaveEventArgs<IContent>(content), this))
return default(XElement);
}
//nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
var nodeName = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "node" : content.ContentType.Alias.ToSafeAliasWithForcingCheck();
if (raiseEvents)
{
if (ExportingContent.IsRaisedEventCancelled(new ExportEventArgs<IContent>(content, nodeName), this))
return new XElement(nodeName);
}
var xml = Export(content, nodeName);
xml.Add(new XAttribute("nodeType", content.ContentType.Id));
xml.Add(new XAttribute("creatorName", content.GetCreatorProfile().Name));
@@ -96,7 +96,7 @@ namespace Umbraco.Core.Services
}
if(raiseEvents)
ExportedContent.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedContent.RaiseEvent(new ExportEventArgs<IContent>(content, xml, false), this);
return xml;
}
@@ -167,7 +167,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingContent.IsRaisedEventCancelled(new SaveEventArgs<XElement>(element), this))
if (ImportingContent.IsRaisedEventCancelled(new ImportEventArgs<IContent>(element), this))
return Enumerable.Empty<IContent>();
}
@@ -184,7 +184,7 @@ namespace Umbraco.Core.Services
_contentService.Save(contents, userId);
if(raiseEvents)
ImportedContent.RaiseEvent(new SaveEventArgs<IContent>(contents, false), this);
ImportedContent.RaiseEvent(new ImportEventArgs<IContent>(contents, element, false), this);
return contents;
}
@@ -198,7 +198,7 @@ namespace Umbraco.Core.Services
_contentService.Save(contents, userId);
if(raiseEvents)
ImportedContent.RaiseEvent(new SaveEventArgs<IContent>(contents, false), this);
ImportedContent.RaiseEvent(new ImportEventArgs<IContent>(contents, element, false), this);
return contents;
}
@@ -335,8 +335,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ExportingContentType.IsRaisedEventCancelled(new SaveEventArgs<IContentType>(contentType), this))
return default(XElement);
if (ExportingContentType.IsRaisedEventCancelled(new ExportEventArgs<IContentType>(contentType, "DocumentType"), this))
return new XElement("DocumentType");
}
var info = new XElement("Info",
@@ -401,7 +401,7 @@ namespace Umbraco.Core.Services
tabs);
if (raiseEvents)
ExportedContentType.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedContentType.RaiseEvent(new ExportEventArgs<IContentType>(contentType, xml, false), this);
return xml;
}
@@ -430,7 +430,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingContentType.IsRaisedEventCancelled(new SaveEventArgs<XElement>(element), this))
if (ImportingContentType.IsRaisedEventCancelled(new ImportEventArgs<IContentType>(element), this))
return Enumerable.Empty<IContentType>();
}
@@ -481,7 +481,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
ImportedContentType.RaiseEvent(new SaveEventArgs<IContentType>(list, false), this);
ImportedContentType.RaiseEvent(new ImportEventArgs<IContentType>(list, element, false), this);
return list;
}
@@ -778,12 +778,11 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ExportingDataType.IsRaisedEventCancelled(new SaveEventArgs<IDataTypeDefinition>(dataTypeDefinition), this))
return default(XElement);
if (ExportingDataType.IsRaisedEventCancelled(new ExportEventArgs<IDataTypeDefinition>(dataTypeDefinition, "DataType"), this))
return new XElement("DataType");
}
var prevalues = new XElement("PreValues");
var prevalueList = _dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id)
.FormatAsDictionary();
@@ -807,7 +806,7 @@ namespace Umbraco.Core.Services
xml.Add(new XAttribute("DatabaseType", dataTypeDefinition.DatabaseType.ToString()));
if (raiseEvents)
ExportedDataType.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedDataType.RaiseEvent(new ExportEventArgs<IDataTypeDefinition>(dataTypeDefinition, xml, false), this);
return xml;
}
@@ -823,7 +822,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingDataType.IsRaisedEventCancelled(new SaveEventArgs<XElement>(element), this))
if (ImportingDataType.IsRaisedEventCancelled(new ImportEventArgs<IDataTypeDefinition>(element), this))
return Enumerable.Empty<IDataTypeDefinition>();
}
@@ -891,7 +890,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
ImportedDataType.RaiseEvent(new SaveEventArgs<IDataTypeDefinition>(list, false), this);
ImportedDataType.RaiseEvent(new ImportEventArgs<IDataTypeDefinition>(list, element, false), this);
return list;
}
@@ -954,8 +953,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ExportingDictionaryItem.IsRaisedEventCancelled(new SaveEventArgs<IDictionaryItem>(dictionaryItem), this))
return default(XElement);
if (ExportingDictionaryItem.IsRaisedEventCancelled(new ExportEventArgs<IDictionaryItem>(dictionaryItem, "DictionaryItem"), this))
return new XElement("DictionaryItem");
}
var xml = new XElement("DictionaryItem", new XAttribute("Key", dictionaryItem.ItemKey));
@@ -977,7 +976,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
ExportedDictionaryItem.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedDictionaryItem.RaiseEvent(new ExportEventArgs<IDictionaryItem>(dictionaryItem, xml, false), this);
return xml;
}
@@ -992,7 +991,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingDictionaryItem.IsRaisedEventCancelled(new SaveEventArgs<XElement>(dictionaryItemElementList), this))
if (ImportingDictionaryItem.IsRaisedEventCancelled(new ImportEventArgs<IDictionaryItem>(dictionaryItemElementList), this))
return Enumerable.Empty<IDictionaryItem>();
}
@@ -1007,7 +1006,7 @@ namespace Umbraco.Core.Services
items.AddRange(ImportDictionaryItem(dictionaryItemElement, languages, raiseEvents));
if (raiseEvents)
ImportedDictionaryItem.RaiseEvent(new SaveEventArgs<IDictionaryItem>(items, false), this);
ImportedDictionaryItem.RaiseEvent(new ImportEventArgs<IDictionaryItem>(items, dictionaryItemElementList, false), this);
return items;
}
@@ -1100,8 +1099,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ExportingLanguage.IsRaisedEventCancelled(new SaveEventArgs<ILanguage>(language), this))
return default(XElement);
if (ExportingLanguage.IsRaisedEventCancelled(new ExportEventArgs<ILanguage>(language, "Language"), this))
return new XElement("Language");
}
var xml = new XElement("Language",
@@ -1110,7 +1109,7 @@ namespace Umbraco.Core.Services
new XAttribute("FriendlyName", language.CultureName));
if (raiseEvents)
ExportedLanguage.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedLanguage.RaiseEvent(new ExportEventArgs<ILanguage>(language, xml, false), this);
return xml;
}
@@ -1126,7 +1125,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingLanguage.IsRaisedEventCancelled(new SaveEventArgs<XElement>(languageElementList), this))
if (ImportingLanguage.IsRaisedEventCancelled(new ImportEventArgs<ILanguage>(languageElementList), this))
return Enumerable.Empty<ILanguage>();
}
@@ -1147,7 +1146,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
ImportedLanguage.RaiseEvent(new SaveEventArgs<ILanguage>(list, false), this);
ImportedLanguage.RaiseEvent(new ImportEventArgs<ILanguage>(list, languageElementList, false), this);
return list;
}
@@ -1167,7 +1166,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingMacro.IsRaisedEventCancelled(new SaveEventArgs<XElement>(element), this))
if (ImportingMacro.IsRaisedEventCancelled(new ImportEventArgs<IMacro>(element), this))
return Enumerable.Empty<IMacro>();
}
@@ -1223,7 +1222,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
ImportedMacro.RaiseEvent(new SaveEventArgs<IMacro>(macros, false), this);
ImportedMacro.RaiseEvent(new ImportEventArgs<IMacro>(macros, element, false), this);
return macros;
}
@@ -1254,8 +1253,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ExportingMacro.IsRaisedEventCancelled(new SaveEventArgs<IMacro>(macro), this))
return default(XElement);
if (ExportingMacro.IsRaisedEventCancelled(new ExportEventArgs<IMacro>(macro, "macro"), this))
return new XElement("macro");
}
var xml = new XElement("macro");
@@ -1280,7 +1279,7 @@ namespace Umbraco.Core.Services
xml.Add(properties);
if (raiseEvents)
ExportedMacro.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedMacro.RaiseEvent(new ExportEventArgs<IMacro>(macro, xml, false), this);
return xml;
}
@@ -1323,15 +1322,15 @@ namespace Umbraco.Core.Services
/// <returns><see cref="XElement"/> containing the xml representation of the Media object</returns>
public XElement Export(IMedia media, bool deep = false, bool raiseEvents = true)
{
if (raiseEvents)
{
if (ExportingMedia.IsRaisedEventCancelled(new SaveEventArgs<IMedia>(media), this))
return default(XElement);
}
//nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
var nodeName = UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema ? "node" : media.ContentType.Alias.ToSafeAliasWithForcingCheck();
if (raiseEvents)
{
if (ExportingMedia.IsRaisedEventCancelled(new ExportEventArgs<IMedia>(media, nodeName), this))
return new XElement(nodeName);
}
var xml = Export(media, nodeName);
xml.Add(new XAttribute("nodeType", media.ContentType.Id));
xml.Add(new XAttribute("writerName", media.GetCreatorProfile().Name));
@@ -1348,7 +1347,7 @@ namespace Umbraco.Core.Services
}
if(raiseEvents)
ExportedMedia.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedMedia.RaiseEvent(new ExportEventArgs<IMedia>(media, xml, false), this);
return xml;
}
@@ -1456,7 +1455,7 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ImportingTemplate.IsRaisedEventCancelled(new SaveEventArgs<XElement>(element), this))
if (ImportingTemplate.IsRaisedEventCancelled(new ImportEventArgs<ITemplate>(element), this))
return Enumerable.Empty<ITemplate>();
}
@@ -1529,7 +1528,7 @@ namespace Umbraco.Core.Services
_fileService.SaveTemplate(templates, userId);
if(raiseEvents)
ImportedTemplate.RaiseEvent(new SaveEventArgs<ITemplate>(templates, false), this);
ImportedTemplate.RaiseEvent(new ImportEventArgs<ITemplate>(templates, element, false), this);
return templates;
}
@@ -1576,8 +1575,8 @@ namespace Umbraco.Core.Services
{
if (raiseEvents)
{
if (ExportingTemplate.IsRaisedEventCancelled(new SaveEventArgs<ITemplate>(template), this))
return default(XElement);
if (ExportingTemplate.IsRaisedEventCancelled(new ExportEventArgs<ITemplate>(template, "Template"), this))
return new XElement("Template");
}
var xml = new XElement("Template");
@@ -1597,7 +1596,7 @@ namespace Umbraco.Core.Services
}
if (raiseEvents)
ExportedTemplate.RaiseEvent(new SaveEventArgs<XElement>(xml, false), this);
ExportedTemplate.RaiseEvent(new ExportEventArgs<ITemplate>(template, xml, false), this);
return xml;
}
@@ -1611,152 +1610,152 @@ namespace Umbraco.Core.Services
/// <summary>
/// Occurs before Importing Content
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingContent;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IContent>> ImportingContent;
/// <summary>
/// Occurs after Content is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IContent>> ImportedContent;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IContent>> ImportedContent;
/// <summary>
/// Occurs before Exporting Content
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IContent>> ExportingContent;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IContent>> ExportingContent;
/// <summary>
/// Occurs after Content is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedContent;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IContent>> ExportedContent;
/// <summary>
/// Occurs before Exporting Media
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IMedia>> ExportingMedia;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IMedia>> ExportingMedia;
/// <summary>
/// Occurs after Media is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedMedia;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IMedia>> ExportedMedia;
/// <summary>
/// Occurs before Importing ContentType
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingContentType;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IContentType>> ImportingContentType;
/// <summary>
/// Occurs after ContentType is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IContentType>> ImportedContentType;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IContentType>> ImportedContentType;
/// <summary>
/// Occurs before Exporting ContentType
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IContentType>> ExportingContentType;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IContentType>> ExportingContentType;
/// <summary>
/// Occurs after ContentType is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedContentType;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IContentType>> ExportedContentType;
/// <summary>
/// Occurs before Importing DataType
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingDataType;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IDataTypeDefinition>> ImportingDataType;
/// <summary>
/// Occurs after DataType is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IDataTypeDefinition>> ImportedDataType;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IDataTypeDefinition>> ImportedDataType;
/// <summary>
/// Occurs before Exporting DataType
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IDataTypeDefinition>> ExportingDataType;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IDataTypeDefinition>> ExportingDataType;
/// <summary>
/// Occurs after DataType is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedDataType;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IDataTypeDefinition>> ExportedDataType;
/// <summary>
/// Occurs before Importing DictionaryItem
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingDictionaryItem;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IDictionaryItem>> ImportingDictionaryItem;
/// <summary>
/// Occurs after DictionaryItem is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IDictionaryItem>> ImportedDictionaryItem;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IDictionaryItem>> ImportedDictionaryItem;
/// <summary>
/// Occurs before Exporting DictionaryItem
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IDictionaryItem>> ExportingDictionaryItem;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IDictionaryItem>> ExportingDictionaryItem;
/// <summary>
/// Occurs after DictionaryItem is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedDictionaryItem;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IDictionaryItem>> ExportedDictionaryItem;
/// <summary>
/// Occurs before Importing Macro
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingMacro;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IMacro>> ImportingMacro;
/// <summary>
/// Occurs after Macro is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IMacro>> ImportedMacro;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<IMacro>> ImportedMacro;
/// <summary>
/// Occurs before Exporting Macro
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<IMacro>> ExportingMacro;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IMacro>> ExportingMacro;
/// <summary>
/// Occurs after Macro is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedMacro;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<IMacro>> ExportedMacro;
/// <summary>
/// Occurs before Importing Language
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingLanguage;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<ILanguage>> ImportingLanguage;
/// <summary>
/// Occurs after Language is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<ILanguage>> ImportedLanguage;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<ILanguage>> ImportedLanguage;
/// <summary>
/// Occurs before Exporting Language
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<ILanguage>> ExportingLanguage;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<ILanguage>> ExportingLanguage;
/// <summary>
/// Occurs after Language is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedLanguage;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<ILanguage>> ExportedLanguage;
/// <summary>
/// Occurs before Importing Template
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ImportingTemplate;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<ITemplate>> ImportingTemplate;
/// <summary>
/// Occurs after Template is Imported and Saved
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<ITemplate>> ImportedTemplate;
public static event TypedEventHandler<IPackagingService, ImportEventArgs<ITemplate>> ImportedTemplate;
/// <summary>
/// Occurs before Exporting Template
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<ITemplate>> ExportingTemplate;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<ITemplate>> ExportingTemplate;
/// <summary>
/// Occurs after Template is Exported to Xml
/// </summary>
public static event TypedEventHandler<IPackagingService, SaveEventArgs<XElement>> ExportedTemplate;
public static event TypedEventHandler<IPackagingService, ExportEventArgs<ITemplate>> ExportedTemplate;
#endregion
}
}