lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Incremental work on diffgram.

Browse Source
This commit is contained in:
sfmskywalker
2014-06-02 15:12:56 +02:00
parent a8b1f2c77d
commit 5b73e80703
6 changed files with 143 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
View File

@@ -69,9 +69,14 @@
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml.Linq" />
<Reference Include="xmldiffpatch, Version=1.0.8.28, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<HintPath>Lib\XmlDiffPatch\xmldiffpatch.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="Placement.info" />
<Content Include="Lib\XmlDiffPatch\xmldiffpatch.dll" />
<Content Include="Recipes\audit-trail.recipe.xml" />
<Content Include="Scripts\audit-trail-admin.js" />
<Content Include="Styles\admin.css" />
@@ -141,6 +146,10 @@
<Compile Include="ImportExport\AuditTrailImportHandler.cs" />
<Compile Include="Models\AuditTrailEventRecordResult.cs" />
<Compile Include="Providers\Content\ContentAuditTrailEventShapes.cs" />
<Compile Include="Providers\Content\DiffGramAnalyzer.cs" />
<Compile Include="Providers\Content\DiffNode.cs" />
<Compile Include="Providers\Content\DiffType.cs" />
<Compile Include="Providers\Content\IDiffGramAnalyzer.cs" />
<Compile Include="ViewModels\AuditTrailCategorySettingsViewModel.cs" />
<Compile Include="ViewModels\AuditTrailEventSettingsViewModel.cs" />
<Compile Include="ViewModels\AuditTrailSiteSettingsViewModel.cs" />

14
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventShapes.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Orchard.AuditTrail.Helpers;
using Orchard.AuditTrail.Models;
using Orchard.ContentManagement;
@@ -8,8 +9,11 @@ using Orchard.Environment;
namespace Orchard.AuditTrail.Providers.Content {
public class ContentAuditTrailEventShapes : IShapeTableProvider {
private readonly Work<IContentManager> _contentManager;
public ContentAuditTrailEventShapes(Work<IContentManager> contentManager) {
private readonly IDiffGramAnalyzer _analyzer;
public ContentAuditTrailEventShapes(Work<IContentManager> contentManager, IDiffGramAnalyzer analyzer) {
_contentManager = contentManager;
_analyzer = analyzer;
}
public void Discover(ShapeTableBuilder builder) {
@@ -25,6 +29,14 @@ namespace Orchard.AuditTrail.Providers.Content {
var contentItem = _contentManager.Value.Get(contentItemId);
var previousVersion = previousContentItemVersionId > 0 ? _contentManager.Value.Get(contentItemId, VersionOptions.VersionRecord(previousContentItemVersionId)) : default(ContentItem);
if (previousVersion != null) {
var previousVersionXml = _contentManager.Value.Export(previousVersion);
var currentVersionXml = _contentManager.Value.Export(contentItem);
var diffGram = _analyzer.GenerateDiffGram(previousVersionXml, currentVersionXml);
var diffNodes = _analyzer.Analyze(previousVersionXml, diffGram).ToArray();
context.Shape.DiffNodes = diffNodes;
}
context.Shape.ContentItem = contentItem;
context.Shape.PreviousVersion = previousVersion;
});

98
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/DiffGramAnalyzer.cs Normal file
View File

@@ -0,0 +1,98 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml;
using System.Xml.Linq;
using Microsoft.XmlDiffPatch;
namespace Orchard.AuditTrail.Providers.Content {
public class DiffGramAnalyzer : IDiffGramAnalyzer {
public XElement GenerateDiffGram(XElement element1, XElement element2) {
using(var node1Reader = element1.CreateReader())
using (var node2Reader = element2.CreateReader()) {
var result = new XDocument();
using (var writer = result.CreateWriter()) {
var diff =
new XmlDiff(XmlDiffOptions.IgnoreChildOrder | XmlDiffOptions.IgnoreWhitespace |
XmlDiffOptions.IgnoreComments | XmlDiffOptions.IgnoreXmlDecl);
diff.Compare(node1Reader, node2Reader, writer);
writer.Flush();
writer.Close();
}
return result.Root;
}
}
public IEnumerable<DiffNode> Analyze(XElement original, XElement diffGram) {
var stack = new Stack<XElement>();
stack.Push(new XElement("original", original));
using (var reader = diffGram.CreateReader()) {
while (!reader.EOF) {
var doRead = true;
if (reader.LocalName == "xmldiff")
reader.Read();
switch (reader.NodeType) {
case XmlNodeType.Element:
var match = reader.GetAttribute("match");
var isAttributeChange = match != null && match.StartsWith("@");
var index = match == null || isAttributeChange ? default(int?) : Int32.Parse(match) - 1;
var diffType = reader.LocalName;
var currentElement = stack.Peek();
if (currentElement.HasElements && index != null) {
var sourceElement = currentElement.Elements().ElementAt(index.Value);
stack.Push(sourceElement);
}
if (diffType != "node") {
switch (diffType) {
case "change":
if (isAttributeChange) {
var attributeName = match.Substring(1);
var originalValue = currentElement.Attribute(attributeName).Value;
var currentValue = reader.ReadElementContentAsString();
doRead = false;
yield return
new DiffNode {
Type = DiffType.Change,
ElementName = attributeName,
Previous = originalValue,
Current = currentValue
};
}
else {
var originalContent = currentElement.Value;
var currentContent = reader.ReadElementContentAsString();
stack.Pop();
doRead = false;
yield return
new DiffNode {
Type = DiffType.Change,
ElementName = currentElement.Name.ToString(),
Previous = originalContent,
Current = currentContent
};
}
break;
case "add":
reader.Read();
var addedElementContent = reader.ReadElementContentAsString();
yield return new DiffNode { Type = DiffType.Addition, ElementName = reader.Name, Current = addedElementContent };
break;
}
}
break;
case XmlNodeType.EndElement:
stack.Pop();
break;
}
if (doRead)
reader.Read();
}
}
}
}
}

8
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/DiffNode.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Orchard.AuditTrail.Providers.Content {
public class DiffNode {
public DiffType Type { get; set; }
public string ElementName { get; set; }
public string Previous { get; set; }
public string Current { get; set; }
}
}

6
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/DiffType.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Orchard.AuditTrail.Providers.Content {
public enum DiffType {
Change,
Addition
}
}

9
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/IDiffGramAnalyzer.cs Normal file
View File

@@ -0,0 +1,9 @@
using System.Collections.Generic;
using System.Xml.Linq;
namespace Orchard.AuditTrail.Providers.Content {
public interface IDiffGramAnalyzer : IDependency {
XElement GenerateDiffGram(XElement element1, XElement element2);
IEnumerable<DiffNode> Analyze(XElement original, XElement diffGram);
}
}