Change the way how the version is assigned and read. (#85)

chkr1011 · Feb 20, 2024 · 99f4725 · 99f4725
1 parent ae010e7
commit 99f4725
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
       # Build applications
       - name: Build win-x86
-        run: dotnet publish Source\mqttMultimeter.csproj -r win-x86 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r win-x86 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip win-x86 build
         uses: vimtor/action-zip@v1
@@ -44,7 +44,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-windows-x86.zip
 
       - name: Build win-x64
-        run: dotnet publish Source\mqttMultimeter.csproj -r win-x64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r win-x64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip win-x64 build
         uses: vimtor/action-zip@v1
@@ -59,7 +59,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-windows-x64.zip
 
       - name: Build win-arm64
-        run: dotnet publish Source\mqttMultimeter.csproj -r win-arm64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r win-arm64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip win-arm64 build
         uses: vimtor/action-zip@v1
@@ -74,7 +74,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-windows-arm64.zip
 
       - name: Build osx-x64
-        run: dotnet publish Source\mqttMultimeter.csproj -r osx-x64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeAllContentForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r osx-x64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeAllContentForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip osx-x64 build
         uses: vimtor/action-zip@v1
@@ -89,7 +89,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-macOS-x64.zip
 
       - name: Build osx-arm64
-        run: dotnet publish Source\mqttMultimeter.csproj -r osx-arm64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeAllContentForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r osx-arm64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeAllContentForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip osx-arm64 build
         uses: vimtor/action-zip@v1
@@ -104,7 +104,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-macOS-arm64.zip
 
       - name: Build linux-x64
-        run: dotnet publish Source\mqttMultimeter.csproj -r linux-x64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r linux-x64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip linux-x64 build
         uses: vimtor/action-zip@v1
@@ -119,7 +119,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-linux-x64.zip
 
       - name: Build linux-arm
-        run: dotnet publish Source\mqttMultimeter.csproj -r linux-arm -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r linux-arm -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip linux-arm build
         uses: vimtor/action-zip@v1
@@ -134,7 +134,7 @@ jobs:
           path: ${{ github.workspace }}\mqttMultimeter-linux-arm.zip
 
       - name: Build linux-arm64
-        run: dotnet publish Source\mqttMultimeter.csproj -r linux-arm64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -property:Version=${{ env.VERSION }}
+        run: dotnet publish Source\mqttMultimeter.csproj -r linux-arm64 -p:Configuration=Release -p:PublishSingleFile=true -p:PublishReadyToRun=false -p:IncludeNativeLibrariesForSelfExtract=true --self-contained true -p:Version=${{ env.VERSION }} -p:AssemblyVersion=${{ env.VERSION }}
 
       - name: Zip linux-arm64 build
         uses: vimtor/action-zip@v1

diff --git a/Source/Main/MainView.axaml b/Source/Main/MainView.axaml
@@ -142,8 +142,10 @@
                             Margin="10,0,-10,0"
                             Padding="10,0">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{CompiledBinding InfoPage.CurrentAppVersion, StringFormat={}v{0}}" />
+                            <TextBlock Text="{CompiledBinding InfoPage.CurrentAppVersion, StringFormat={}v{0}, Mode=OneTime}" />
                             <TextBlock Margin="10,0,0,0"
+                                       Cursor="Hand"
+                                       PointerPressed="OnUpdateAvailableNotificationPressed"
                                        IsVisible="{CompiledBinding InfoPage.IsUpdateAvailable}"
                                        Text="Update available" />
                         </StackPanel>

diff --git a/Source/Main/MainView.axaml.cs b/Source/Main/MainView.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 
 namespace mqttMultimeter.Main;
@@ -26,14 +27,14 @@ void OnActivatePageRequested(object? sender, EventArgs e)
         {
             return;
         }
-        
+
         foreach (TabItem? tabItem in sidebar.Items)
         {
             if (tabItem == null)
             {
                 continue;
             }
-            
+
             if (ReferenceEquals(sender, tabItem.Content))
             {
                 sidebar.SelectedItem = tabItem;
@@ -52,4 +53,9 @@ void OnDataContextChanged(object? sender, EventArgs e)
 
         viewModel.ActivatePageRequested += OnActivatePageRequested;
     }
+
+    void OnUpdateAvailableNotificationPressed(object? _, PointerPressedEventArgs __)
+    {
+        ((MainViewModel)DataContext!).InfoPage.OpenReleasesUrl();
+    }
 }
diff --git a/Source/Main/MainViewModel.cs b/Source/Main/MainViewModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Threading.Tasks;
+using Avalonia.Threading;
 using mqttMultimeter.Common;
 using mqttMultimeter.Pages.Connection;
 using mqttMultimeter.Pages.Inflight;
@@ -10,7 +10,6 @@
 using mqttMultimeter.Pages.Subscriptions;
 using mqttMultimeter.Pages.TopicExplorer;
 using mqttMultimeter.Services.Mqtt;
-using MQTTnet.Client;
 using ReactiveUI;
 
 namespace mqttMultimeter.Main;
@@ -33,7 +32,6 @@ public sealed class MainViewModel : BaseViewModel
         MqttClientService mqttClientService)
     {
         _mqttClientService = mqttClientService ?? throw new ArgumentNullException(nameof(mqttClientService));
-        _mqttClientService.ApplicationMessageReceived += IncreaseCounter;
 
         ConnectionPage = AttachEvents(connectionPage);
         PublishPage = AttachEvents(publishPage);
@@ -46,6 +44,10 @@ public sealed class MainViewModel : BaseViewModel
 
         InflightPage.RepeatMessageRequested += item => PublishPage.RepeatMessage(item);
         topicExplorerPage.RepeatMessageRequested += item => PublishPage.RepeatMessage(item);
+
+        // Update the counter with a timer. There is no need to trigger a binding
+        // for each counter increment.
+        DispatcherTimer.Run(UpdateCounter, TimeSpan.FromSeconds(1));
     }
 
     public event EventHandler? ActivatePageRequested;
@@ -84,10 +86,9 @@ public int Counter
         return page;
     }
 
-    Task IncreaseCounter(MqttApplicationMessageReceivedEventArgs _)
+    bool UpdateCounter()
     {
-        Counter++;
-
-        return Task.CompletedTask;
+        Counter = _mqttClientService.ReceivedMessagesCount;
+        return true;
     }
 }
diff --git a/Source/Pages/Inflight/InflightPageView.axaml b/Source/Pages/Inflight/InflightPageView.axaml
@@ -74,7 +74,7 @@
                                     <TextBlock Margin="5,0"
                                                HorizontalAlignment="Right"
                                                Classes="code_text"
-                                               Text="{CompiledBinding Number, Mode=OneTime}" />
+                                               Text="{CompiledBinding Number}" />
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -86,7 +86,7 @@
                                 <DataTemplate>
                                     <TextBlock Margin="5,0"
                                                Classes="code_text"
-                                               Text="{CompiledBinding Topic, Mode=OneTime}" />
+                                               Text="{CompiledBinding Topic}" />
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -99,7 +99,7 @@
                                     <StackPanel Orientation="Horizontal"
                                                 HorizontalAlignment="Right"
                                                 Margin="5,0">
-                                        <Border IsVisible="{CompiledBinding Retain, Mode=OneTime}"
+                                        <Border IsVisible="{CompiledBinding Retain}"
                                                 Classes="badge badge_retain"
                                                 Margin="0,3">
                                             <TextBlock />
@@ -117,7 +117,7 @@
                                     <TextBlock Margin="5,0,10,0"
                                                HorizontalAlignment="Right"
                                                Classes="code_text"
-                                               Text="{CompiledBinding Length, StringFormat={}{0} bytes, Mode=OneTime}" />
+                                               Text="{CompiledBinding Length, StringFormat={}{0} bytes}" />
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>

diff --git a/Source/Pages/Info/InfoPageView.axaml.cs b/Source/Pages/Info/InfoPageView.axaml.cs
@@ -34,7 +34,7 @@ static void Launch(string fileName)
 
     void OnLatestVersionClicked(object? sender, PointerPressedEventArgs e)
     {
-        Launch("https://github.com/chkr1011/mqttMultimeter/releases");
+        ((InfoPageViewModel)DataContext!).OpenReleasesUrl();
     }
 
     void OnOpenHomepage(object? sender, RoutedEventArgs e)

diff --git a/Source/Pages/Info/InfoPageViewModel.cs b/Source/Pages/Info/InfoPageViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using Avalonia.Controls;
 using Avalonia.Threading;
 using mqttMultimeter.Common;
@@ -47,6 +48,11 @@ public string LatestAppVersion
 
     public string MqttNetVersion { get; }
 
+    public void OpenReleasesUrl()
+    {
+        Launch("https://github.com/chkr1011/mqttMultimeter/releases");
+    }
+
     bool CheckForUpdates()
     {
         LatestAppVersion = _appUpdateService.LatestVersion?.ToString() ?? string.Empty;
@@ -55,4 +61,13 @@ bool CheckForUpdates()
         // Keep timer running.
         return true;
     }
+
+    static void Launch(string fileName)
+    {
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = fileName,
+            UseShellExecute = true
+        });
+    }
 }
diff --git a/Source/Pages/PacketInspector/PacketInspectorPageView.axaml b/Source/Pages/PacketInspector/PacketInspectorPageView.axaml
@@ -49,7 +49,7 @@
                                            HorizontalAlignment="Right"
                                            Classes="code_text"
                                            x:DataType="packetInspector:PacketViewModel"
-                                           Text="{CompiledBinding Number, Mode=OneTime}" />
+                                           Text="{CompiledBinding Number}" />
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
@@ -62,7 +62,7 @@
                                 <Grid Margin="10,0,0,0"
                                       x:DataType="packetInspector:PacketViewModel">
                                     <StackPanel Orientation="Horizontal"
-                                                IsVisible="{CompiledBinding IsInbound, Mode=OneTime}">
+                                                IsVisible="{CompiledBinding IsInbound}">
                                         <PathIcon Width="16"
                                                   Height="16"
                                                   Data="{StaticResource arrow_download_regular}" />
@@ -71,7 +71,7 @@
                                                    Text="Inbound" />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal"
-                                                IsVisible="{CompiledBinding !IsInbound, Mode=OneTime}">
+                                                IsVisible="{CompiledBinding !IsInbound}">
                                         <PathIcon Width="16"
                                                   Height="16"
                                                   Data="{StaticResource arrow_upload_regular}" />
@@ -92,7 +92,7 @@
                                 <TextBlock Margin="5,0"
                                            Classes="code_text"
                                            x:DataType="packetInspector:PacketViewModel"
-                                           Text="{CompiledBinding Type, Mode=OneTime}" />
+                                           Text="{CompiledBinding Type}" />
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
@@ -106,7 +106,7 @@
                                            HorizontalAlignment="Right"
                                            Classes="code_text"
                                            x:DataType="packetInspector:PacketViewModel"
-                                           Text="{CompiledBinding Length, StringFormat={}{0} bytes, Mode=OneTime}" />
+                                           Text="{CompiledBinding Length, StringFormat={}{0} bytes}" />
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>

diff --git a/Source/Pages/PacketInspector/PacketInspectorPageViewModel.cs b/Source/Pages/PacketInspector/PacketInspectorPageViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
 using Avalonia.Threading;
 using mqttMultimeter.Common;
 using mqttMultimeter.Services.Mqtt;
@@ -85,25 +86,25 @@ static string GetControlPacketType(byte data)
         }
     }
 
-    void ProcessPacket(InspectMqttPacketEventArgs eventArgs)
+    Task ProcessPacket(InspectMqttPacketEventArgs eventArgs)
     {
         if (!_isRecordingEnabled)
         {
-            return;
+            return Task.CompletedTask;
         }
-
-        var number = _number++;
-        var viewModel = new PacketViewModel
-        {
-            Number = number,
-            Type = GetControlPacketType(eventArgs.Buffer[0]),
-            Data = eventArgs.Buffer,
-            Length = eventArgs.Buffer.Length,
-            IsInbound = eventArgs.Direction == MqttPacketFlowDirection.Inbound
-        };
-
+
         Dispatcher.UIThread.Invoke(() =>
         {
+            var number = _number++;
+            var viewModel = new PacketViewModel
+            {
+                Number = number,
+                Type = GetControlPacketType(eventArgs.Buffer[0]),
+                Data = eventArgs.Buffer,
+                Length = eventArgs.Buffer.Length,
+                IsInbound = eventArgs.Direction == MqttPacketFlowDirection.Inbound
+            };
+
             Packets.Add(viewModel);
 
             // TODO: Move to configuration.
@@ -112,5 +113,7 @@ void ProcessPacket(InspectMqttPacketEventArgs eventArgs)
                 Packets.RemoveAt(0);
             }
         });
+
+        return Task.CompletedTask;
     }
 }
diff --git a/Source/Pages/TopicExplorer/TopicExplorerItemMessageView.axaml b/Source/Pages/TopicExplorer/TopicExplorerItemMessageView.axaml
@@ -12,15 +12,15 @@
     <StackPanel Orientation="Horizontal"
                 Margin="10">
         <TextBlock Classes="code_text"
-                   Text="{CompiledBinding Timestamp, StringFormat={}{0:HH:mm:ss.fff}, Mode=OneTime}" />
+                   Text="{CompiledBinding Timestamp, StringFormat={}{0:HH:mm:ss.fff}}" />
         <TextBlock Classes="code_text"
                    Margin="10,0"
                    Text="="
                    FontStyle="Italic" />
         <TextBlock Classes="code_text"
                    Margin="0,0,10,0"
                    FontStyle="Italic"
-                   Text="{CompiledBinding Payload, Mode=OneTime}" />
+                   Text="{CompiledBinding Payload}" />
     </StackPanel>
 
 </UserControl>