Skip to content

Tool: fix generated code for protocol api #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmds merged 3 commits into from
Nov 10, 2024
Merged

Tool: fix generated code for protocol api #307

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33cb271
tool should generate Set-methods for writable properties only
tibel Nov 7, 2024
0bb4268
tool: use ObjectPath for service-create methods
tibel Nov 7, 2024
ccb0c60
tool: fix PropertyChnages invalidated and changed are swapped
tibel Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Tmds.DBus.Tool/ProtocolGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private void AppendServiceClass(IEnumerable<InterfaceDescription> interfaceDescr
foreach (var interf in interfaceDescriptions)
{
string interfaceName = interf.Name;
AppendLine($"public {interfaceName} Create{interfaceName}(string path) => new {interfaceName}(this, path);");
AppendLine($"public {interfaceName} Create{interfaceName}(ObjectPath path) => new {interfaceName}(this, path);");
}
EndBlock();
}
Expand Down Expand Up @@ -403,7 +403,7 @@ private void AppendWriteTypeMethod(string method, string signature)
private void AppendInterface(string name, XElement interfaceXml)
{
var readableProperties = ReadableProperties(interfaceXml).Select(ToArgument);
var writableProperties = ReadableProperties(interfaceXml).Select(ToArgument);
var writableProperties = WritableProperties(interfaceXml).Select(ToArgument);

string propertiesClassName = $"{name}Properties";

Expand Down Expand Up @@ -480,7 +480,7 @@ private void AppendInterface(string name, XElement interfaceXml)
AppendLine("var reader = message.GetBodyReader();");
AppendLine("reader.ReadString(); // interface");
AppendLine("List<string> changed = new(), invalidated = new();");
AppendLine($"return new PropertyChanges<{propertiesClassName}>(ReadProperties(ref reader, changed), changed.ToArray(), ReadInvalidated(ref reader));");
AppendLine($"return new PropertyChanges<{propertiesClassName}>(ReadProperties(ref reader, changed), ReadInvalidated(ref reader), changed.ToArray());");
EndBlock();
AppendLine($"static string[] ReadInvalidated(ref Reader reader)");
StartBlock();
Expand Down