Update CHANGELOG to 1.3.1

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## v1.3.1
+
+*Released: 03/11/2022*
+
+* Update .NET version from 5.0 to 6.0
+* Fix: simple patch to avoid a crash concerning GetAlbumCover
+* Fix: connection change now working
+
+## v1.3
+
+*Released: 18/04/2022*
+
+* New feature: add support for readpicture, aka embedded cover art
+* New feature: add support for MPD password
+* Spanish translation
+* Trim album release date
+* Cover icon when a radio is playing
+* Update MpcNET package from 1.3 to 1.4
+* Fix: Snapcast not working with hostname
+* Fix: some radios crash
+* Fix: disable/enable radios and Snapcast with connection
+
 ## v1.2
 
 *Released: 07/04/2022*

Handlers/MPDHandler.cs

@@ -64,17 +64,19 @@ namespace unison
         private MpcConnection _connection;
         private MpcConnection _commandConnection;
         private IPEndPoint _mpdEndpoint;
-        private CancellationTokenSource _cancelToken;
+
+        private CancellationTokenSource _cancelCommand;
+        private CancellationTokenSource _cancelConnect;
 
         public MPDHandler()
         {
-            Initialize(null, null);
+            Startup(null, null);
 
             _stats = new Statistics();
 
             _retryTimer = new DispatcherTimer();
             _retryTimer.Interval = TimeSpan.FromSeconds(5);
-            _retryTimer.Tick += Initialize;
+            _retryTimer.Tick += Startup;
 
             _elapsedTimer = new System.Timers.Timer(500);
             _elapsedTimer.Elapsed += new System.Timers.ElapsedEventHandler(ElapsedTimer);
@@ -147,7 +149,7 @@ namespace unison
 
         public async Task<T> SafelySendCommandAsync<T>(IMpcCommand<T> command)
         {
-            if (_commandConnection == null)
+            if (_commandConnection == null || !IsConnected())
             {
                 Trace.WriteLine("[SafelySendCommandAsync] no command connection");
                 return default(T);
@@ -175,21 +177,52 @@ namespace unison
             return default(T);
         }
 
-        private void Initialize(object sender, EventArgs e)
+        public async void Startup(object sender, EventArgs e)
         {
-            if (!_connected)
-                Connect();
+            await Initialize();
         }
 
-        public async void Connect()
+        public async Task Initialize()
         {
-            _cancelToken = new CancellationTokenSource();
-            CancellationToken token = _cancelToken.Token;
+            Trace.WriteLine("Initializing");
+
+            Disconnected();
+
+            if (!_connected)
+                await Connect();
+        }
+
+        public void Disconnected()
+        {
+            _connected = false;
+            ConnectionChanged?.Invoke(this, EventArgs.Empty);
+
+            _commandConnection?.DisconnectAsync();
+            _connection?.DisconnectAsync();
+
+            _cancelConnect?.Cancel();
+            _cancelConnect = new CancellationTokenSource();
+
+            _cancelCommand?.Cancel();
+            _cancelCommand = new CancellationTokenSource();
+
+            _connection = null;
+            _commandConnection = null;
+
+            Trace.WriteLine("Disconnected");
+        }
+
+        public async Task Connect()
+        {
+            Trace.WriteLine("Connecting");
+
+            if (_cancelCommand.IsCancellationRequested || _cancelConnect.IsCancellationRequested)
+                return;
 
             try
             {
-                _connection = await ConnectInternal(token);
-                _commandConnection = await ConnectInternal(token);
+                _connection = await ConnectInternal(_cancelConnect.Token);
+                _commandConnection = await ConnectInternal(_cancelCommand.Token);
             }
             catch (MpcNET.Exceptions.MpcConnectException e)
             {
@@ -217,11 +250,14 @@ namespace unison
             await UpdateStatusAsync();
             await UpdateSongAsync();
 
-            Loop(token);
+            Loop(_cancelCommand.Token);
         }
 
         private async Task<MpcConnection> ConnectInternal(CancellationToken token)
         {
+            if (token.IsCancellationRequested)
+                return null;
+
             IPAddress.TryParse(Properties.Settings.Default.mpd_host, out _ipAddress);
 
             if (_ipAddress == null)
@@ -261,18 +297,6 @@ namespace unison
             return connection;
         }
 
-        public void Disconnected()
-        {            
-            _connected = false;
-            ConnectionChanged?.Invoke(this, EventArgs.Empty);
-
-            if (_connection != null)
-                _connection = null;
-
-            if (_commandConnection != null)
-                _commandConnection = null;
-        }
-
         private void Loop(CancellationToken token)
         {
             Task.Run(async () =>
@@ -281,8 +305,7 @@ namespace unison
                 {
                     try
                     {
-                        token.ThrowIfCancellationRequested();
-                        if (token.IsCancellationRequested || _connection == null)
+                        if (token.IsCancellationRequested || _connection == null || !IsConnected())
                             break;
 
                         IMpdMessage<string> idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options update"));
@@ -291,14 +314,17 @@ namespace unison
                             await HandleIdleResponseAsync(idleChanges.Response.Content);
                         else
                         {
-                            Trace.WriteLine($"Error in Idle connection thread: {idleChanges.Response?.Content}");
+                            Trace.WriteLine($"Error in Idle connection thread (1): {idleChanges.Response?.Content}");
                             throw new Exception(idleChanges.Response?.Content);
                         }
                     }
                     catch (Exception e)
                     {
+                        if (token.IsCancellationRequested)
+                            Trace.WriteLine($"Idle connection cancelled.");
+                        else
                             Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
-                        Disconnected();
+                        await Initialize();
                         break;
                     }
                 }
@@ -321,6 +347,7 @@ namespace unison
             catch (Exception e)
             {
                 Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                await Initialize();
             }
         }
 
@@ -345,6 +372,7 @@ namespace unison
             catch (Exception e)
             {
                 Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                await Initialize();
             }
 
             _isUpdatingStatus = false;
@@ -352,6 +380,8 @@ namespace unison
 
         private async Task UpdateSongAsync()
         {
+            Trace.WriteLine("Updating song");
+
             if (_connection == null || _isUpdatingSong)
                 return;
 
@@ -371,13 +401,17 @@ namespace unison
             catch (Exception e)
             {
                 Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                await Initialize();
             }
 
             _isUpdatingSong = false;
         }
 
-        private async void GetAlbumCover(string path, CancellationToken token = default)
+        private async void GetAlbumCover(string path, CancellationToken token)
         {
+            if (token.IsCancellationRequested)
+                return;
+
             List<byte> data = new List<byte>();
             try
             {
@@ -390,7 +424,7 @@ namespace unison
                     if (_connection == null)
                         return;
 
-                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new ReadPictureCommand(path, currentSize));
+                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
                     if (!albumReq.IsResponseValid)
                         break;
 
@@ -412,7 +446,7 @@ namespace unison
                     if (_connection == null)
                         return;
 
-                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
+                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new ReadPictureCommand(path, currentSize));
                     if (!albumReq.IsResponseValid)
                         break;
 
@@ -428,6 +462,9 @@ namespace unison
             }
             catch (Exception e)
             {
+                if (token.IsCancellationRequested)
+                    return;
+
                 Trace.WriteLine("Exception caught while getting albumart: " + e);
                 return;
             }
@@ -441,7 +478,7 @@ namespace unison
                 {
                     _cover = BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
                 }
-                catch (System.NotSupportedException)
+                catch
                 {
                     _cover = null;
                 }
@@ -476,7 +513,7 @@ namespace unison
             SongChanged?.Invoke(this, EventArgs.Empty);
 
             string uri = Regex.Escape(_currentSong.Path);
-            GetAlbumCover(uri);
+            GetAlbumCover(uri, _cancelCommand.Token);
         }
 
         public void UpdateCover()

Views/MainWindow.xaml

@@ -104,7 +104,8 @@
                             <VisualBrush Visual="{Binding ElementName=mask}"/>
                         </StackPanel.OpacityMask>
                         <Image x:Name="Cover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" Visibility="Collapsed" />
-                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" />
+                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" Visibility="Collapsed" />
+                        <Image x:Name="RadioCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/radio.png" Visibility="Collapsed" />
                     </StackPanel>
                 </Grid>
             </Border>

Views/MainWindow.xaml.cs

@@ -46,9 +46,12 @@ namespace unison
         {
             if (_mpd.IsConnected())
             {
-                Snapcast.IsEnabled = true;
                 ConnectionOkIcon.Visibility = Visibility.Visible;
                 ConnectionFailIcon.Visibility = Visibility.Collapsed;
+
+                Snapcast.IsEnabled = true;
+                if (_radiosWin.IsConnected())
+                    Radio.IsEnabled = true;
             }
             else
             {
@@ -56,6 +59,9 @@ namespace unison
                 DefaultState(true);
                 ConnectionOkIcon.Visibility = Visibility.Collapsed;
                 ConnectionFailIcon.Visibility = Visibility.Visible;
+
+                Snapcast.IsEnabled = false;
+                Radio.IsEnabled = false;
             }
             _settingsWin.UpdateConnectionStatus();
             Connection.Text = $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
@@ -153,8 +159,9 @@ namespace unison
             PlayPause.Text = (string)Application.Current.FindResource("pauseButton");
             TimeSlider.Value = 50;
             TimeSlider.IsEnabled = false;
-            NoCover.Visibility = Visibility.Visible;
+            NoCover.Visibility = Visibility.Collapsed;
             Cover.Visibility = Visibility.Collapsed;
+            RadioCover.Visibility = Visibility.Collapsed;
 
             if (LostConnection)
             {
@@ -166,16 +173,18 @@ namespace unison
 
         public void OnCoverChanged(object sender, EventArgs e)
         {
-            if (_mpd.GetCover() == null)
-            {
-                NoCover.Visibility = Visibility.Visible;
+            NoCover.Visibility = Visibility.Collapsed;
             Cover.Visibility = Visibility.Collapsed;
-            }
+            RadioCover.Visibility = Visibility.Collapsed;
+
+            if (_mpd.GetCurrentSong().Time == -1)
+                RadioCover.Visibility = Visibility.Visible;
+            else if (_mpd.GetCover() == null)
+                NoCover.Visibility = Visibility.Visible;
             else if (Cover.Source != _mpd.GetCover())
             {
                 Cover.Source = _mpd.GetCover();
                 Cover.Visibility = Visibility.Visible;
-                NoCover.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -188,11 +197,6 @@ namespace unison
                 SnapcastText.Text = unison.Resources.Resources.StartSnapcast;
         }
 
-        public void OnRadioBrowserConnected()
-        {
-            Radio.IsEnabled = true;
-        }
-
         public void UpdateButton(ref Border border, bool b)
         {
             border.Style = b ? (Style)Resources["SelectedButton"] : (Style)Resources["UnselectedButton"];

Views/Radios.xaml.cs

@@ -54,6 +54,9 @@ namespace unison
     {
         private RadioBrowserClient _radioBrowser;
         private MPDHandler _mpd;
+        private bool _connected = true;
+
+        public bool IsConnected() => _connected;
 
         public Radios()
         {
@@ -69,11 +72,8 @@ namespace unison
                 Debug.WriteLine("Exception while connecting to RadioBrowser: " + e.Message);
                 return;
             }
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
-                MainWin.OnRadioBrowserConnected();
-            });
+
+            _connected = true;
         }
 
         public async void Initialize()

Views/Settings.xaml

@@ -43,7 +43,7 @@
 
                                     <StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Password}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <PasswordBox x:Name="MpdPassword" Width="250" Margin="10,2,0,0"/>
+                                        <PasswordBox x:Name="MpdPassword" KeyDown="ConnectHandler" Width="250" Margin="10,2,0,0"/>
                                         <TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="250" HorizontalAlignment="Left"/>
                                     </StackPanel>
 
@@ -52,7 +52,6 @@
                                         <Run x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}"/>
                                     </TextBlock>
 
-                                    <!--<TextBlock x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}" TextWrapping="Wrap" Margin="5,10,0,0"/>-->
                                     <Button x:Name="ConnectButton" Content="{x:Static properties:Resources.Settings_ConnectButton}" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked"/>
                                 </StackPanel>
                             </Grid>
@@ -60,30 +59,6 @@
                     </DockPanel>
                 </TabItem>
 
-                <TabItem Header="{x:Static properties:Resources.Stats}">
-                    <DockPanel Margin="8">
-                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
-                            <GroupBox.Header>
-                                <TextBlock>
-                                    <emoji:EmojiInline Text="📊"/>
-                                    <Run Text="{x:Static properties:Resources.Stats}"/>
-                                </TextBlock>
-                            </GroupBox.Header>
-                            <Grid VerticalAlignment="Top">
-                                <TextBlock>
-                                    <Run Text="{x:Static properties:Resources.Stats_Songs}"/><Run Text=" "/><Run x:Name="StatSong"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_Albums}"/><Run Text=" "/><Run x:Name="StatAlbum"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_Artists}"/><Run Text=" "/><Run x:Name="StatArtist"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_TotalPlaytime}"/><Run Text=" "/><Run x:Name="StatTotalPlaytime"/><LineBreak/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_Uptime}"/><Run Text=" "/><Run x:Name="StatUptime"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_TotalTimePlayed}"/><Run Text=" "/><Run x:Name="StatTotalTimePlayed"/><LineBreak/>
-                                    <Run Text="{x:Static properties:Resources.Stats_LastDatabaseUpdate}"/><Run Text=" "/><Run x:Name="StatDatabaseUpdate"/>
-                                </TextBlock>
-                            </Grid>
-                        </GroupBox>
-                    </DockPanel>
-                </TabItem>
-
                 <TabItem Header="Snapcast">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
@@ -222,6 +197,30 @@
                     </DockPanel>
                 </TabItem>
 
+                <TabItem Header="{x:Static properties:Resources.Stats}">
+                    <DockPanel Margin="8">
+                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                            <GroupBox.Header>
+                                <TextBlock>
+                                    <emoji:EmojiInline Text="📊"/>
+                                    <Run Text="{x:Static properties:Resources.Stats}"/>
+                                </TextBlock>
+                            </GroupBox.Header>
+                            <Grid VerticalAlignment="Top">
+                                <TextBlock>
+                                    <Run Text="{x:Static properties:Resources.Stats_Songs}"/><Run Text=" "/><Run x:Name="StatSong"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Albums}"/><Run Text=" "/><Run x:Name="StatAlbum"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Artists}"/><Run Text=" "/><Run x:Name="StatArtist"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_TotalPlaytime}"/><Run Text=" "/><Run x:Name="StatTotalPlaytime"/><LineBreak/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Uptime}"/><Run Text=" "/><Run x:Name="StatUptime"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_TotalTimePlayed}"/><Run Text=" "/><Run x:Name="StatTotalTimePlayed"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_LastDatabaseUpdate}"/><Run Text=" "/><Run x:Name="StatDatabaseUpdate"/>
+                                </TextBlock>
+                            </Grid>
+                        </GroupBox>
+                    </DockPanel>
+                </TabItem>
+
                 <TabItem Header="{x:Static properties:Resources.Settings_About}" Height="20" VerticalAlignment="Bottom">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">

Views/Settings.xaml.cs

@@ -111,14 +111,11 @@ namespace unison
 
             SaveSettings();
 
-            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            if (mpd.IsConnected())
-                mpd = new MPDHandler();
-
             ConnectButton.IsEnabled = false;
             ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusConnecting;
 
-            System.Threading.Tasks.Task.Run(() => { mpd.Connect(); });
+            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            System.Threading.Tasks.Task.Run(async () => { await mpd.Initialize(); });
         }
 
         private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)

unison.csproj

@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\icon-full.ico</ApplicationIcon>
     <Win32Resource></Win32Resource>
     <StartupObject>unison.App</StartupObject>
-    <Version>1.2</Version>
+    <Version>1.3.1</Version>
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageProjectUrl>https://git.n700.ovh/keb/unison</PackageProjectUrl>
-    <RepositoryUrl>https://git.n700.ovh/keb/unison</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/ZetaKebab/unison</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/ZetaKebab/unison</RepositoryUrl>
     <Copyright>Théo Marchal</Copyright>
     <PackageIconUrl />
   </PropertyGroup>
@@ -22,6 +22,8 @@
     <None Remove="Resources\icon-mini.ico" />
     <None Remove="Resources\nocover.png" />
     <None Remove="LICENSE" />
+    <None Remove="Resources\nothing.png" />
+    <None Remove="Resources\radio.png" />
     <None Include="LICENSE">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
@@ -38,6 +40,12 @@
     <Resource Include="Resources\nocover.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\nothing.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Resources\radio.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Content Include="LICENSE">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -47,7 +55,7 @@
     <PackageReference Include="Emoji.Wpf" Version="0.3.3" />
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
     <PackageReference Include="RadioBrowser" Version="0.6.1" />
-	<PackageReference Include="MpcNET" Version="1.3.0" />
+	<PackageReference Include="MpcNET" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>