Skip to content

Commit 83c3b80

Browse files
jdomnitzjdomnitz
committed
Make fields constructor public in return value structs
1 parent b78fdd1 commit 83c3b80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+390
-118
lines changed

‎Generator/ClusterGenerator.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -993,8 +993,10 @@ private static void WriteRecord(clusterDataTypesStruct structType, Cluster clust
993993
writer.WriteLine($" /// <summary>\n /// {GeneratorUtil.FieldNameToComment(structType.name)}\n /// </summary>");
994994
writer.WriteLine(" public record " + GeneratorUtil.SanitizeName(structType.name) + " : TLVPayload {");
995995
writer.WriteLine($" /// <summary>\n /// {GeneratorUtil.FieldNameToComment(structType.name)}\n /// </summary>");
996-
writer.WriteLine($" public {GeneratorUtil.SanitizeName(structType.name)}() {{ }}\n\n [SetsRequiredMembers]");
997-
writer.WriteLine($" internal {GeneratorUtil.SanitizeName(structType.name)}(object[] fields) {{");
996+
writer.WriteLine($" public {GeneratorUtil.SanitizeName(structType.name)}() {{ }}\n");
997+
writer.WriteLine($" /// <summary>\n /// {GeneratorUtil.FieldNameToComment(structType.name)}\n /// </summary>");
998+
writer.WriteLine($" [SetsRequiredMembers]");
999+
writer.WriteLine($" public {GeneratorUtil.SanitizeName(structType.name)}(object[] fields) {{");
9981000
writer.WriteLine(" FieldReader reader = new FieldReader(fields);");
9991001
foreach (clusterDataTypesStructField field in structType.field)
10001002
{

‎MatterDotNet/Clusters/Application/ActionsCluster.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,11 @@ public record Action : TLVPayload {
191191
/// </summary>
192192
public Action() { }
193193

194+
/// <summary>
195+
/// Action
196+
/// </summary>
194197
[SetsRequiredMembers]
195-
internal Action(object[] fields) {
198+
public Action(object[] fields) {
196199
FieldReader reader = new FieldReader(fields);
197200
ActionID = reader.GetUShort(0)!.Value;
198201
Name = reader.GetString(1, false)!;
@@ -228,8 +231,11 @@ public record EndpointList : TLVPayload {
228231
/// </summary>
229232
public EndpointList() { }
230233

234+
/// <summary>
235+
/// Endpoint List
236+
/// </summary>
231237
[SetsRequiredMembers]
232-
internal EndpointList(object[] fields) {
238+
public EndpointList(object[] fields) {
233239
FieldReader reader = new FieldReader(fields);
234240
EndpointListID = reader.GetUShort(0)!.Value;
235241
Name = reader.GetString(1, false)!;

‎MatterDotNet/Clusters/Application/ApplicationBasicCluster.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@ public record Application : TLVPayload {
6868
/// </summary>
6969
public Application() { }
7070

71+
/// <summary>
72+
/// Application
73+
/// </summary>
7174
[SetsRequiredMembers]
72-
internal Application(object[] fields) {
75+
public Application(object[] fields) {
7376
FieldReader reader = new FieldReader(fields);
7477
CatalogVendorID = reader.GetUShort(0)!.Value;
7578
ApplicationID = reader.GetString(1, false)!;

‎MatterDotNet/Clusters/Application/ApplicationLauncherCluster.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ public record ApplicationEP : TLVPayload {
7777
/// </summary>
7878
public ApplicationEP() { }
7979

80+
/// <summary>
81+
/// Application EP
82+
/// </summary>
8083
[SetsRequiredMembers]
81-
internal ApplicationEP(object[] fields) {
84+
public ApplicationEP(object[] fields) {
8285
FieldReader reader = new FieldReader(fields);
8386
Application = new Application((object[])fields[0]);
8487
Endpoint = reader.GetUShort(1, true);
@@ -103,8 +106,11 @@ public record Application : TLVPayload {
103106
/// </summary>
104107
public Application() { }
105108

109+
/// <summary>
110+
/// Application
111+
/// </summary>
106112
[SetsRequiredMembers]
107-
internal Application(object[] fields) {
113+
public Application(object[] fields) {
108114
FieldReader reader = new FieldReader(fields);
109115
CatalogVendorID = reader.GetUShort(0)!.Value;
110116
ApplicationID = reader.GetString(1, false)!;

‎MatterDotNet/Clusters/Application/AudioOutputCluster.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,11 @@ public record OutputInfo : TLVPayload {
7474
/// </summary>
7575
public OutputInfo() { }
7676

77+
/// <summary>
78+
/// Output Info
79+
/// </summary>
7780
[SetsRequiredMembers]
78-
internal OutputInfo(object[] fields) {
81+
public OutputInfo(object[] fields) {
7982
FieldReader reader = new FieldReader(fields);
8083
Index = reader.GetByte(0)!.Value;
8184
OutputType = (OutputTypeEnum)reader.GetUShort(1)!.Value;

‎MatterDotNet/Clusters/Application/ChannelCluster.cs

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,11 @@ public record ChannelInfo : TLVPayload {
141141
/// </summary>
142142
public ChannelInfo() { }
143143

144+
/// <summary>
145+
/// Channel Info
146+
/// </summary>
144147
[SetsRequiredMembers]
145-
internal ChannelInfo(object[] fields) {
148+
public ChannelInfo(object[] fields) {
146149
FieldReader reader = new FieldReader(fields);
147150
MajorNumber = reader.GetUShort(0)!.Value;
148151
MinorNumber = reader.GetUShort(1)!.Value;
@@ -186,8 +189,11 @@ public record ChannelPaging : TLVPayload {
186189
/// </summary>
187190
public ChannelPaging() { }
188191

192+
/// <summary>
193+
/// Channel Paging
194+
/// </summary>
189195
[SetsRequiredMembers]
190-
internal ChannelPaging(object[] fields) {
196+
public ChannelPaging(object[] fields) {
191197
FieldReader reader = new FieldReader(fields);
192198
PreviousToken = new PageToken((object[])fields[0]);
193199
NextToken = new PageToken((object[])fields[1]);
@@ -213,8 +219,11 @@ public record LineupInfo : TLVPayload {
213219
/// </summary>
214220
public LineupInfo() { }
215221

222+
/// <summary>
223+
/// Lineup Info
224+
/// </summary>
216225
[SetsRequiredMembers]
217-
internal LineupInfo(object[] fields) {
226+
public LineupInfo(object[] fields) {
218227
FieldReader reader = new FieldReader(fields);
219228
OperatorName = reader.GetString(0, false)!;
220229
LineupName = reader.GetString(1, true);
@@ -246,8 +255,11 @@ public record PageToken : TLVPayload {
246255
/// </summary>
247256
public PageToken() { }
248257

258+
/// <summary>
259+
/// Page Token
260+
/// </summary>
249261
[SetsRequiredMembers]
250-
internal PageToken(object[] fields) {
262+
public PageToken(object[] fields) {
251263
FieldReader reader = new FieldReader(fields);
252264
Limit = reader.GetUShort(0, true);
253265
After = reader.GetString(1, true);
@@ -277,8 +289,11 @@ public record ProgramCast : TLVPayload {
277289
/// </summary>
278290
public ProgramCast() { }
279291

292+
/// <summary>
293+
/// Program Cast
294+
/// </summary>
280295
[SetsRequiredMembers]
281-
internal ProgramCast(object[] fields) {
296+
public ProgramCast(object[] fields) {
282297
FieldReader reader = new FieldReader(fields);
283298
Name = reader.GetString(0, false)!;
284299
Role = reader.GetString(1, false)!;
@@ -302,8 +317,11 @@ public record ProgramCategory : TLVPayload {
302317
/// </summary>
303318
public ProgramCategory() { }
304319

320+
/// <summary>
321+
/// Program Category
322+
/// </summary>
305323
[SetsRequiredMembers]
306-
internal ProgramCategory(object[] fields) {
324+
public ProgramCategory(object[] fields) {
307325
FieldReader reader = new FieldReader(fields);
308326
Category = reader.GetString(0, false)!;
309327
SubCategory = reader.GetString(1, true);
@@ -328,8 +346,11 @@ public record Program : TLVPayload {
328346
/// </summary>
329347
public Program() { }
330348

349+
/// <summary>
350+
/// Program
351+
/// </summary>
331352
[SetsRequiredMembers]
332-
internal Program(object[] fields) {
353+
public Program(object[] fields) {
333354
FieldReader reader = new FieldReader(fields);
334355
Identifier = reader.GetString(0, false)!;
335356
Channel = new ChannelInfo((object[])fields[1]);
@@ -482,8 +503,11 @@ public record SeriesInfo : TLVPayload {
482503
/// </summary>
483504
public SeriesInfo() { }
484505

506+
/// <summary>
507+
/// Series Info
508+
/// </summary>
485509
[SetsRequiredMembers]
486-
internal SeriesInfo(object[] fields) {
510+
public SeriesInfo(object[] fields) {
487511
FieldReader reader = new FieldReader(fields);
488512
Season = reader.GetString(0, false)!;
489513
Episode = reader.GetString(1, false)!;

‎MatterDotNet/Clusters/Application/ContentControlCluster.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@ public record AppInfo : TLVPayload {
122122
/// </summary>
123123
public AppInfo() { }
124124

125+
/// <summary>
126+
/// App Info
127+
/// </summary>
125128
[SetsRequiredMembers]
126-
internal AppInfo(object[] fields) {
129+
public AppInfo(object[] fields) {
127130
FieldReader reader = new FieldReader(fields);
128131
CatalogVendorID = reader.GetUShort(0)!.Value;
129132
ApplicationID = reader.GetString(1, false)!;
@@ -147,8 +150,11 @@ public record BlockChannel : TLVPayload {
147150
/// </summary>
148151
public BlockChannel() { }
149152

153+
/// <summary>
154+
/// Block Channel
155+
/// </summary>
150156
[SetsRequiredMembers]
151-
internal BlockChannel(object[] fields) {
157+
public BlockChannel(object[] fields) {
152158
FieldReader reader = new FieldReader(fields);
153159
BlockChannelIndex = reader.GetUShort(0, true);
154160
MajorNumber = reader.GetUShort(1)!.Value;
@@ -179,8 +185,11 @@ public record RatingName : TLVPayload {
179185
/// </summary>
180186
public RatingName() { }
181187

188+
/// <summary>
189+
/// Rating Name
190+
/// </summary>
182191
[SetsRequiredMembers]
183-
internal RatingName(object[] fields) {
192+
public RatingName(object[] fields) {
184193
FieldReader reader = new FieldReader(fields);
185194
RatingNameField = reader.GetString(0, false)!;
186195
RatingNameDesc = reader.GetString(1, true);
@@ -205,8 +214,11 @@ public record TimePeriodStructType : TLVPayload {
205214
/// </summary>
206215
public TimePeriodStructType() { }
207216

217+
/// <summary>
218+
/// Time Period Struct type
219+
/// </summary>
208220
[SetsRequiredMembers]
209-
internal TimePeriodStructType(object[] fields) {
221+
public TimePeriodStructType(object[] fields) {
210222
FieldReader reader = new FieldReader(fields);
211223
StartHour = reader.GetByte(0)!.Value;
212224
StartMinute = reader.GetByte(1)!.Value;
@@ -236,8 +248,11 @@ public record TimeWindow : TLVPayload {
236248
/// </summary>
237249
public TimeWindow() { }
238250

251+
/// <summary>
252+
/// Time Window
253+
/// </summary>
239254
[SetsRequiredMembers]
240-
internal TimeWindow(object[] fields) {
255+
public TimeWindow(object[] fields) {
241256
FieldReader reader = new FieldReader(fields);
242257
TimeWindowIndex = reader.GetUShort(0, true);
243258
DayOfWeek = (DayOfWeekBitmapType)reader.GetUShort(1)!.Value;

‎MatterDotNet/Clusters/Application/ContentLauncherCluster.cs

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,11 @@ public record AdditionalInfo : TLVPayload {
204204
/// </summary>
205205
public AdditionalInfo() { }
206206

207+
/// <summary>
208+
/// Additional Info
209+
/// </summary>
207210
[SetsRequiredMembers]
208-
internal AdditionalInfo(object[] fields) {
211+
public AdditionalInfo(object[] fields) {
209212
FieldReader reader = new FieldReader(fields);
210213
Name = reader.GetString(0, false)!;
211214
Value = reader.GetString(1, false)!;
@@ -229,8 +232,11 @@ public record BrandingInformation : TLVPayload {
229232
/// </summary>
230233
public BrandingInformation() { }
231234

235+
/// <summary>
236+
/// Branding Information
237+
/// </summary>
232238
[SetsRequiredMembers]
233-
internal BrandingInformation(object[] fields) {
239+
public BrandingInformation(object[] fields) {
234240
FieldReader reader = new FieldReader(fields);
235241
ProviderName = reader.GetString(0, false)!;
236242
Background = new StyleInformation((object[])fields[1]);
@@ -271,8 +277,11 @@ public record ContentSearch : TLVPayload {
271277
/// </summary>
272278
public ContentSearch() { }
273279

280+
/// <summary>
281+
/// Content Search
282+
/// </summary>
274283
[SetsRequiredMembers]
275-
internal ContentSearch(object[] fields) {
284+
public ContentSearch(object[] fields) {
276285
FieldReader reader = new FieldReader(fields);
277286
{
278287
ParameterList = new Parameter[((object[])fields[0]).Length];
@@ -304,8 +313,11 @@ public record Dimension : TLVPayload {
304313
/// </summary>
305314
public Dimension() { }
306315

316+
/// <summary>
317+
/// Dimension
318+
/// </summary>
307319
[SetsRequiredMembers]
308-
internal Dimension(object[] fields) {
320+
public Dimension(object[] fields) {
309321
FieldReader reader = new FieldReader(fields);
310322
Width = reader.GetDouble(0)!.Value;
311323
Height = reader.GetDouble(1)!.Value;
@@ -332,8 +344,11 @@ public record Parameter : TLVPayload {
332344
/// </summary>
333345
public Parameter() { }
334346

347+
/// <summary>
348+
/// Parameter
349+
/// </summary>
335350
[SetsRequiredMembers]
336-
internal Parameter(object[] fields) {
351+
public Parameter(object[] fields) {
337352
FieldReader reader = new FieldReader(fields);
338353
Type = (ParameterEnum)reader.GetUShort(0)!.Value;
339354
Value = reader.GetString(1, false)!;
@@ -373,8 +388,11 @@ public record PlaybackPreferences : TLVPayload {
373388
/// </summary>
374389
public PlaybackPreferences() { }
375390

391+
/// <summary>
392+
/// Playback Preferences
393+
/// </summary>
376394
[SetsRequiredMembers]
377-
internal PlaybackPreferences(object[] fields) {
395+
public PlaybackPreferences(object[] fields) {
378396
FieldReader reader = new FieldReader(fields);
379397
PlaybackPosition = reader.GetULong(0, true);
380398
TextTrack = new TrackPreference((object[])fields[1]);
@@ -418,8 +436,11 @@ public record StyleInformation : TLVPayload {
418436
/// </summary>
419437
public StyleInformation() { }
420438

439+
/// <summary>
440+
/// Style Information
441+
/// </summary>
421442
[SetsRequiredMembers]
422-
internal StyleInformation(object[] fields) {
443+
public StyleInformation(object[] fields) {
423444
FieldReader reader = new FieldReader(fields);
424445
ImageURL = reader.GetString(0, true);
425446
Color = reader.GetString(1, true);
@@ -449,8 +470,11 @@ public record TrackPreference : TLVPayload {
449470
/// </summary>
450471
public TrackPreference() { }
451472

473+
/// <summary>
474+
/// Track Preference
475+
/// </summary>
452476
[SetsRequiredMembers]
453-
internal TrackPreference(object[] fields) {
477+
public TrackPreference(object[] fields) {
454478
FieldReader reader = new FieldReader(fields);
455479
LanguageCode = reader.GetString(0, false)!;
456480
{

0 commit comments

Comments
 (0)