Skip to content
Snippets Groups Projects
Commit f093be9f authored by Frederik Carlier's avatar Frederik Carlier
Browse files

Add support for merging types, events

parent feefcee0
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
source/ChromeDevTools/MasterDevs.ChromeDevTools.csproj
+ 1
− 0
View file @ f093be9f
......@@ -880,6 +880,7 @@
<Compile Include="Protocol\Worker\WorkerCreatedEvent.cs" />
<Compile Include="Protocol\Worker\WorkerTerminatedEvent.cs" />
<Compile Include="Serialization\MessageContractResolver.cs" />
<Compile Include="SupportedByAttribute.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
......
source/ChromeDevTools/SupportedByAttribute.cs 0 → 100644
+ 24
− 0
View file @ f093be9f
using System;
namespace MasterDevs.ChromeDevTools
{
[AttributeUsage(AttributeTargets.Class)]
public class SupportedByAttribute : Attribute
{
public SupportedByAttribute(string browser)
{
if (browser == null)
{
throw new ArgumentNullException(nameof(browser));
}
this.Browser = browser;
}
public string Browser
{
get;
set;
}
}
}
source/ProtocolGenerator/NameEqualityComparer.cs
+ 6
− 5
View file @ f093be9f
......@@ -6,12 +6,13 @@ using System.Threading.Tasks;
namespace MasterDevs.ChromeDevTools.ProtocolGenerator
{
class NameEqualityComparer : EqualityComparer<ProtocolItem>
class NameEqualityComparer<T> : EqualityComparer<T>
where T : ProtocolItem
{
public static NameEqualityComparer Instance
{ get; } = new NameEqualityComparer();
public static NameEqualityComparer<T> Instance
{ get; } = new NameEqualityComparer<T>();
public override bool Equals(ProtocolItem x, ProtocolItem y)
public override bool Equals(T x, T y)
{
if (x == null || y == null)
{
......@@ -21,7 +22,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
return string.Equals(x.Name, y.Name, StringComparison.OrdinalIgnoreCase);
}
public override int GetHashCode(ProtocolItem obj)
public override int GetHashCode(T obj)
{
if (obj == null)
{
......
source/ProtocolGenerator/Program.cs
+ 24
− 7
View file @ f093be9f
......@@ -24,7 +24,6 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
private static Dictionary<string, List<string>> _DomainEvents = new Dictionary<string, List<string>>();
private static Dictionary<string, string> _SimpleTypes = new Dictionary<string, string>();
private static void Main(string[] args)
{
// At this point in time, we only process the most recent Chrome
......@@ -208,10 +207,10 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
var parameters = evnt.Parameters;
// ignoreing "handlers" ... i'm not sure what they are for yet
_DomainEvents[domainDirectoryInfo.Name].Add(eventName);
WriteEvent(domainDirectoryInfo, eventName, description, parameters);
WriteEvent(domainDirectoryInfo, eventName, description, parameters, evnt.SupportedBy);
}
private static void WriteEvent(DirectoryInfo domainDirectoryInfo, string eventName, string description, IEnumerable<Property> parameters)
private static void WriteEvent(DirectoryInfo domainDirectoryInfo, string eventName, string description, IEnumerable<Property> parameters, IEnumerable<string> supportedBy)
{
var className = ToCamelCase(eventName) + EventSubclass;
var sb = new StringBuilder();
......@@ -230,6 +229,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
}
sb.AppendFormat("\t[{0}({1}.{2}.{3})]", EventAttribute, ProtocolNameClass, domainDirectoryInfo.Name, ToCamelCase(eventName));
sb.AppendLine();
WriteSupportedBy(sb, supportedBy);
sb.AppendFormat("\tpublic class {0}", className);
sb.AppendLine();
sb.AppendLine("\t{");
......@@ -250,11 +250,11 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
var parameters = command.Parameters;
var returnObject = command.Returns;
_DomainCommands[domainDirectoryInfo.Name].Add(commandName);
WriteCommand(domainDirectoryInfo, commandName, description, parameters);
WriteCommandResponse(domainDirectoryInfo, commandName, description, returnObject);
WriteCommand(domainDirectoryInfo, commandName, description, parameters, command.SupportedBy);
WriteCommandResponse(domainDirectoryInfo, commandName, description, returnObject, command.SupportedBy);
}
private static void WriteCommandResponse(DirectoryInfo domainDirectoryInfo, string commandName, string description, IEnumerable<Property> returnObject)
private static void WriteCommandResponse(DirectoryInfo domainDirectoryInfo, string commandName, string description, IEnumerable<Property> returnObject, IEnumerable<string> supportedBy)
{
var className = ToCamelCase(commandName) + CommandResponseSubclass;
var sb = new StringBuilder();
......@@ -274,6 +274,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
}
sb.AppendFormat("\t[{0}({1}.{2}.{3})]", CommandResponseAttribute, ProtocolNameClass, domainDirectoryInfo.Name, ToCamelCase(commandName));
sb.AppendLine();
WriteSupportedBy(sb, supportedBy);
sb.AppendFormat("\tpublic class {0}", className);
sb.AppendLine();
sb.AppendLine("\t{");
......@@ -286,7 +287,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
WriteToFile(domainDirectoryInfo, className, sb.ToString());
}
private static void WriteCommand(DirectoryInfo domainDirectoryInfo, string commandName, string description, IEnumerable<Property> parameters)
private static void WriteCommand(DirectoryInfo domainDirectoryInfo, string commandName, string description, IEnumerable<Property> parameters, IEnumerable<string> supportedBy)
{
var className = ToCamelCase(commandName) + CommandSubclass;
var sb = new StringBuilder();
......@@ -307,6 +308,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
}
sb.AppendFormat("\t[{0}({1}.{2}.{3})]", CommandAttribute, ProtocolNameClass, domainDirectoryInfo.Name, ToCamelCase(commandName));
sb.AppendLine();
WriteSupportedBy(sb, supportedBy);
sb.AppendFormat("\tpublic class {0}", className);
sb.AppendLine();
sb.AppendLine("\t{");
......@@ -349,6 +351,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
sb.AppendFormat("\t/// {0}", type.Description);
sb.AppendLine();
sb.AppendLine("\t/// </summary>");
WriteSupportedBy(sb, type);
sb.AppendFormat("\tpublic class {0}", className);
sb.AppendLine();
sb.AppendLine("\t{");
......@@ -479,6 +482,7 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
sb.AppendFormat("\t/// {0}", type.Description);
sb.AppendLine();
sb.AppendLine("\t/// </summary>");
WriteSupportedBy(sb, type);
sb.AppendFormat("\tpublic enum {0}", enumName);
sb.AppendLine();
sb.AppendLine("\t{");
......@@ -492,6 +496,19 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
WriteToFile(domainDirectoryInfo, enumName, sb.ToString());
}
private static void WriteSupportedBy(StringBuilder sb, ProtocolItem type)
{
WriteSupportedBy(sb, type.SupportedBy);
}
private static void WriteSupportedBy(StringBuilder sb, IEnumerable<string> supportedBy)
{
foreach(var browser in supportedBy)
{
sb.AppendLine($"\t[SupportedBy(\"{browser}\")");
}
}
private static void WriteToFile(DirectoryInfo domainDirectoryInfo, string fileName, string fileContents)
{
var fullPath = Path.Combine(domainDirectoryInfo.FullName, fileName + ".cs");
......
source/ProtocolGenerator/ProtocolMerger.cs
+ 19
− 32
View file @ f093be9f
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
......@@ -12,62 +13,48 @@ namespace MasterDevs.ChromeDevTools.ProtocolGenerator
{
foreach (var domain in source.Domains)
{
if (!target.Domains.Contains(domain, NameEqualityComparer.Instance))
if (!target.Domains.Contains(domain, NameEqualityComparer<Domain>.Instance))
{
target.Domains.Add(domain);
}
else
{
Merge(source, domain, target.Domains.Single(t => NameEqualityComparer.Instance.Equals(domain, t)));
Merge(source, domain, target.Domains.Single(t => NameEqualityComparer<Domain>.Instance.Equals(domain, t)));
}
}
}
static void Merge(Protocol protocol, Domain source, Domain target)
{
foreach (var command in source.Commands)
{
if (!target.Commands.Contains(command, NameEqualityComparer.Instance))
{
target.Commands.Add(command);
Merge(protocol, source, source.Commands, target.Commands);
Merge(protocol, source, source.Events, target.Events);
Merge(protocol, source, source.Types, target.Types);
}
else
{
var targetCommand = target.Commands.Single(t => NameEqualityComparer.Instance.Equals(command, t));
if(!targetCommand.Equals(command))
static void Merge<T>(Protocol protocol, Domain domain, Collection<T> source, Collection<T> target)
where T : ProtocolItem
{
Console.WriteLine($"{protocol.Alias};{source.Name};{command.Name};{command};{targetCommand}");
}
else
foreach (var item in source)
{
foreach (var v in command.SupportedBy)
if (!target.Contains(item, NameEqualityComparer<T>.Instance))
{
targetCommand.SupportedBy.Add(v);
}
}
}
}
foreach (var @event in source.Events)
{
if (!target.Events.Contains(@event, NameEqualityComparer.Instance))
{
target.Events.Add(@event);
target.Add(item);
}
else
{
}
}
var targetItem = target.Single(t => NameEqualityComparer<T>.Instance.Equals(item, t));
foreach (var type in source.Types)
if (!targetItem.Equals(item))
{
if (!target.Types.Contains(type, NameEqualityComparer.Instance))
{
target.Types.Add(type);
Console.WriteLine($"{protocol.Alias};{domain.Name};{item.Name};{item};{targetItem};{typeof(T).Name}");
}
else
{
foreach (var v in item.SupportedBy)
{
targetItem.SupportedBy.Add(v);
}
}
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment