Device SerialNumber

Rans4ckeR · Jan 5, 2024 · 4fd7e70 · 4fd7e70
1 parent d045845
commit 4fd7e70
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 40 deletions.
diff --git a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
@@ -15,12 +15,12 @@ public sealed record InternetGatewayDevice(IFritzServiceOperationHandler FritzSe
     public IEnumerable<ServiceListItem> Services
         => services ??= UPnPDescription.Device.GetServices().ToArray();
 
-    internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler, InternetGatewayDevice, Task<TResult>> operation)
-        => operation(FritzServiceOperationHandler, this);
-
     public async ValueTask InitializeAsync()
     {
         SecurityPort = (await this.DeviceInfoGetSecurityPortAsync().ConfigureAwait(false)).SecurityPort;
         Users = (await UsersService.GetUsersAsync(this).ConfigureAwait(false)).ToArray();
     }
+
+    internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler, InternetGatewayDevice, Task<TResult>> operation)
+        => operation(FritzServiceOperationHandler, this);
 }
diff --git a/RS.Fritz.Manager.API/Extensions/DeviceExtensions.cs b/RS.Fritz.Manager.API/Extensions/DeviceExtensions.cs
@@ -6,7 +6,7 @@ public static IEnumerable<ServiceListItem> GetServices(this Device device)
     {
         IEnumerable<ServiceListItem> serviceListItems = device.ServiceList;
 
-        foreach (Device deviceListItem in device.DeviceList ?? Array.Empty<Device>())
+        foreach (Device deviceListItem in device.DeviceList ?? [])
         {
             serviceListItems = serviceListItems.Concat(GetServices(deviceListItem));
         }

diff --git a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>RS.Fritz.Manager.API</RootNamespace>
     <Title>RS.Fritz.Manager.API</Title>
     <Product>RS.Fritz.Manager.API</Product>
-    <Copyright>Copyright 2023 (c) RS. All rights reserved.</Copyright>
+    <Copyright>Copyright 2021-2024 (c) RS. All rights reserved.</Copyright>
     <Company>Rans4ckeR</Company>
     <Configuration></Configuration>
     <Trademark></Trademark>
@@ -39,7 +39,7 @@
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
@@ -54,7 +54,7 @@ private static IEnumerable<Dictionary<string, string>> GetFormattedDeviceRespons
             StringComparer.OrdinalIgnoreCase));
     }
 
-    private static async ValueTask ReceiveAsync(Socket socket, ICollection<string> responses, int receiveTimeout, CancellationToken cancellationToken)
+    private static async ValueTask ReceiveAsync(Socket socket, List<string> responses, int receiveTimeout, CancellationToken cancellationToken)
     {
         using IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(4096);
         using var timeoutCancellationTokenSource = new CancellationTokenSource(receiveTimeout);

diff --git a/RS.Fritz.Manager.API/Services/Discovery/Entities/Device.cs b/RS.Fritz.Manager.API/Services/Discovery/Entities/Device.cs
@@ -13,8 +13,9 @@ public readonly record struct Device(
     [property: DataMember(Name = "modelNumber", Order = 6)] string ModelNumber,
     [property: DataMember(Name = "modelURL", Order = 7)] string ModelUrl,
     [property: DataMember(Name = "UDN", Order = 8)] string UniqueDeviceName,
-    [property: DataMember(Name = "UPC", Order = 9)] string Upc,
-    [property: DataMember(Name = "iconList", Order = 10)] IconListItem[] IconList,
-    [property: DataMember(Name = "serviceList", Order = 11)] ServiceListItem[] ServiceList,
-    [property: DataMember(Name = "deviceList", Order = 12)] Device[]? DeviceList,
-    [property: DataMember(Name = "presentationURL", Order = 13)] string PresentationUrl);
+    [property: DataMember(Name = "serialNumber", Order = 9)] string SerialNumber,
+    [property: DataMember(Name = "UPC", Order = 10)] string Upc,
+    [property: DataMember(Name = "iconList", Order = 11)] IconListItem[] IconList,
+    [property: DataMember(Name = "serviceList", Order = 12)] ServiceListItem[] ServiceList,
+    [property: DataMember(Name = "deviceList", Order = 13)] Device[]? DeviceList,
+    [property: DataMember(Name = "presentationURL", Order = 14)] string PresentationUrl);
diff --git a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
@@ -19,8 +19,8 @@ internal sealed class MainWindowViewModel : FritzServiceViewModel
     private const int ZIndexNoOverlay = -1;
 
     private readonly IDeviceSearchService deviceSearchService;
-    private ObservableCollection<ObservableInternetGatewayDevice> devices = new();
-    private ObservableCollection<User> users = new();
+    private ObservableCollection<ObservableInternetGatewayDevice> devices = [];
+    private ObservableCollection<User> users = [];
     private ObservableObject? activeView;
     private string? userMessage;
     private bool deviceAndLoginControlsEnabled = true;

diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>RS.Fritz.Manager.UI</RootNamespace>
     <Title>RS.Fritz.Manager.UI</Title>
     <Product>RS.Fritz.Manager.UI</Product>
-    <Copyright>Copyright 2023 (c) RS. All rights reserved.</Copyright>
+    <Copyright>Copyright 2021-2024 (c) RS. All rights reserved.</Copyright>
     <Company>Rans4ckeR</Company>
     <Configuration></Configuration>
     <Trademark></Trademark>
@@ -41,7 +41,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/RS.Fritz.Manager.UI/Resources/UPnPResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/UPnPResourceDictionary.xaml
@@ -137,6 +137,7 @@
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
@@ -151,11 +152,12 @@
                     <Label Grid.Row="6" Grid.Column="0" Target="{Binding ElementName=ModelNumber}" Content="_ModelNumber" ToolTip="Model number of the device."/>
                     <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=ModelUrl}" Content="_ModelUrl" ToolTip="URL to the Web site for this model."/>
                     <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=UniqueDeviceName}" Content="_UniqueDeviceName" ToolTip="Name that uniquely identifies a specific device."/>
-                    <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=Upc}" Content="_Upc" ToolTip="Universal Product Code."/>
-                    <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=PresentationUrl}" Content="_PresentationUrl" ToolTip="URL to a device representation Web page."/>
-                    <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=IconList}" Content="_IconList" ToolTip="Icon to depict device in a control point UI."/>
-                    <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=ServiceList}" Content="_ServiceList" ToolTip="List of UPnP services."/>
-                    <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=DeviceList}" Content="_DeviceList" ToolTip="List of embedded UPnP devices."/>
+                    <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=SerialNumber}" Content="_SerialNumber"/>
+                    <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=Upc}" Content="_Upc" ToolTip="Universal Product Code."/>
+                    <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=PresentationUrl}" Content="_PresentationUrl" ToolTip="URL to a device representation Web page."/>
+                    <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=IconList}" Content="_IconList" ToolTip="Icon to depict device in a control point UI."/>
+                    <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=ServiceList}" Content="_ServiceList" ToolTip="List of UPnP services."/>
+                    <Label Grid.Row="14" Grid.Column="0" Target="{Binding ElementName=DeviceList}" Content="_DeviceList" ToolTip="List of embedded UPnP devices."/>
                     <TextBlock x:Name="DeviceType" Grid.Row="0" Grid.Column="1" Text="{Binding DeviceType}"/>
                     <TextBlock x:Name="FriendlyName" Grid.Row="1" Grid.Column="1" Text="{Binding FriendlyName}"/>
                     <TextBlock x:Name="Manufacturer" Grid.Row="2" Grid.Column="1" Text="{Binding Manufacturer}"/>
@@ -165,15 +167,16 @@
                     <TextBlock x:Name="ModelNumber" Grid.Row="6" Grid.Column="1" Text="{Binding ModelNumber}"/>
                     <ContentControl x:Name="ModelUrl" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding ModelUrl}" Grid.Row="7" Grid.Column="1"/>
                     <TextBlock x:Name="UniqueDeviceName" Grid.Row="8" Grid.Column="1" Text="{Binding UniqueDeviceName}"/>
-                    <TextBlock x:Name="Upc" Grid.Row="9" Grid.Column="1" Text="{Binding Upc}"/>
-                    <ContentControl x:Name="PresentationUrl" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding PresentationUrl}" Grid.Row="10" Grid.Column="1"/>
-                    <ItemsControl x:Name="IconList" Grid.Row="11" Grid.Column="1" ItemsSource="{Binding IconList}"/>
-                    <Border Style="{StaticResource BorderStyle}" Grid.Row="12" Grid.Column="1">
+                    <TextBlock x:Name="SerialNumber" Grid.Row="9" Grid.Column="1" Text="{Binding SerialNumber}"/>
+                    <TextBlock x:Name="Upc" Grid.Row="10" Grid.Column="1" Text="{Binding Upc}"/>
+                    <ContentControl x:Name="PresentationUrl" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding PresentationUrl}" Grid.Row="11" Grid.Column="1"/>
+                    <ItemsControl x:Name="IconList" Grid.Row="12" Grid.Column="1" ItemsSource="{Binding IconList}"/>
+                    <Border Style="{StaticResource BorderStyle}" Grid.Row="13" Grid.Column="1">
                         <Expander Header="ServiceList">
                             <ui:NoScrollDataGrid x:Name="ServiceList" ItemsSource="{Binding ServiceList}"/>
                         </Expander>
                     </Border>
-                    <ItemsControl x:Name="DeviceList" Grid.Row="13" Grid.Column="1" ItemsSource="{Binding DeviceList}"/>
+                    <ItemsControl x:Name="DeviceList" Grid.Row="14" Grid.Column="1" ItemsSource="{Binding DeviceList}"/>
                 </Grid>
             </Expander>
         </Border>

diff --git a/...serControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs b/...serControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
@@ -172,7 +172,7 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     protected override bool GetCanExecuteDefaultCommand()
         => base.GetCanExecuteDefaultCommand() && (WanCommonInterfaceConfigGetOnlineMonitorResponse is null || SyncGroupIndex < WanCommonInterfaceConfigGetOnlineMonitorResponse!.Value.Key!.Value.TotalNumberSyncGroups);
 
-    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, ICollection<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
+    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, List<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
     {
         for (int i = 1; i < values.Count; i++)
         {

diff --git a/...tz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs b/...tz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
@@ -19,7 +19,7 @@ internal sealed class WanDslInterfaceConfigDslInfoViewModel : ObservableObject
 
     public WanDslInterfaceConfigDslInfoViewModel()
     {
-        DownstreamSnrElements = new();
+        DownstreamSnrElements = [];
 
         maxBrush.Freeze();
         minBrush.Freeze();
@@ -43,7 +43,7 @@ public List<UIElement>? DownstreamSnrElements
         private set => _ = SetProperty(ref downstreamSnrElements, value);
     }
 
-    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, ICollection<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
+    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, List<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
     {
         for (int i = 1; i < values.Count; i++)
         {

diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
@@ -12,7 +12,7 @@ internal sealed class WanDslInterfaceConfigInfoViewModel : ObservableObject
     private readonly Brush minBrush = Brushes.Orange;
     private readonly Brush lineBrush = Brushes.Green;
     private readonly ScaleTransform scaleYTransform = new() { ScaleY = -1d };
-    private readonly List<WanDslInterfaceConfigGetInfoResponse> wanDslInterfaceConfigGetInfoResponses = new();
+    private readonly List<WanDslInterfaceConfigGetInfoResponse> wanDslInterfaceConfigGetInfoResponses = [];
 
     private KeyValuePair<WanDslInterfaceConfigGetInfoResponse?, UPnPFault?>? wanDslInterfaceConfigGetInfoResponse;
     private List<UIElement>? downstreamMaxRateHistory;
@@ -27,16 +27,16 @@ internal sealed class WanDslInterfaceConfigInfoViewModel : ObservableObject
 
     public WanDslInterfaceConfigInfoViewModel()
     {
-        UpstreamCurrRateHistory = new();
-        DownstreamCurrRateHistory = new();
-        UpstreamMaxRateHistory = new();
-        DownstreamMaxRateHistory = new();
-        UpstreamNoiseMarginHistory = new();
-        DownstreamNoiseMarginHistory = new();
-        UpstreamAttenuationHistory = new();
-        DownstreamAttenuationHistory = new();
-        UpstreamPowerHistory = new();
-        DownstreamPowerHistory = new();
+        UpstreamCurrRateHistory = [];
+        DownstreamCurrRateHistory = [];
+        UpstreamMaxRateHistory = [];
+        DownstreamMaxRateHistory = [];
+        UpstreamNoiseMarginHistory = [];
+        DownstreamNoiseMarginHistory = [];
+        UpstreamAttenuationHistory = [];
+        DownstreamAttenuationHistory = [];
+        UpstreamPowerHistory = [];
+        DownstreamPowerHistory = [];
 
         maxBrush.Freeze();
         minBrush.Freeze();