Update readme and screenshots for radios feature

Handlers/MPDHandler.cs

@@ -12,6 +12,8 @@ using System.Windows.Threading;
 using MpcNET;
 using MpcNET.Commands.Database;
 using MpcNET.Commands.Playback;
+using MpcNET.Commands.Queue;
+using MpcNET.Commands.Reflection;
 using MpcNET.Commands.Status;
 using MpcNET.Message;
 using MpcNET.Types;
@@ -363,8 +365,15 @@ namespace unison
             else
             {
                 using MemoryStream stream = new MemoryStream(data.ToArray());
+                try
+                {
                     _cover = BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
                 }
+                catch (System.NotSupportedException)
+                {
+                    _cover = null;
+                }
+            }
             UpdateCover();
         }
 
@@ -439,5 +448,20 @@ namespace unison
                 _currentVolume = 0;
             SetVolume(_currentVolume);
         }
+
+        public void ClearQueue() => SendCommand(new ClearCommand());
+        public void PlayCommand() => SendCommand(new PlayCommand(0));
+
+        public void AddSong(string Uri)
+        {
+            Debug.WriteLine("AddCommand path: " + Uri);
+            SendCommand(new AddCommand(Uri));
+        }
+
+        public void ClearAddAndPlay(string Uri)
+        {
+            CommandList commandList = new CommandList(new IMpcCommand<object>[] { new ClearCommand(), new AddCommand(Uri), new PlayCommand(0) });
+            SendCommand(commandList);
+        }
     }
 }

README.md

@@ -7,6 +7,7 @@
 * lightweight window that can be toggled with shortcuts
 * music control through shortcuts
 * [Snapcast](https://mjaggard.github.io/snapcast/) integration
+* Radio stations
 
 ## Features
 
@@ -26,6 +27,12 @@ You can control your music at anytime with the shortcuts. They can of course be
 
 The main goal of embedding Snapcast is the ability to listen locally to music when I'm not using my main audio system. The computer running unison can then play music easily.
 
+### Radio stations
+
+Through [Radio-Browser](https://www.radio-browser.info), a community database, you can play radio-streams directly from unison. There are more than 28,000 stations recorded on this service, so it should be a nice way to discover new music and cultures.
+
+![Radio stations](Screenshots/screen4.png)
+
 ## Caveats
 
 ### Missing features
@@ -37,7 +44,6 @@ The main goal of embedding Snapcast is the ability to listen locally to music wh
 ### Wanted features
 
 * A complete shuffle system based on set criteria, aka a smart playlist.
-* Radio integration.
 
 ## Translations
 

Resources/Resources.Designer.cs

@@ -69,6 +69,87 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Country.
+        /// </summary>
+        public static string Radio_Country {
+            get {
+                return ResourceManager.GetString("Radio_Country", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Loading stations....
+        /// </summary>
+        public static string Radio_Loading {
+            get {
+                return ResourceManager.GetString("Radio_Loading", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Name.
+        /// </summary>
+        public static string Radio_Name {
+            get {
+                return ResourceManager.GetString("Radio_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No stations found!.
+        /// </summary>
+        public static string Radio_NotFound {
+            get {
+                return ResourceManager.GetString("Radio_NotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reset.
+        /// </summary>
+        public static string Radio_Reset {
+            get {
+                return ResourceManager.GetString("Radio_Reset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search.
+        /// </summary>
+        public static string Radio_Search {
+            get {
+                return ResourceManager.GetString("Radio_Search", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search station.
+        /// </summary>
+        public static string Radio_SearchStation {
+            get {
+                return ResourceManager.GetString("Radio_SearchStation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Tags.
+        /// </summary>
+        public static string Radio_Tags {
+            get {
+                return ResourceManager.GetString("Radio_Tags", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Radios.
+        /// </summary>
+        public static string Radios {
+            get {
+                return ResourceManager.GetString("Radios", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Settings.
         /// </summary>

Resources/Resources.fr-FR.resx

@@ -120,6 +120,33 @@
   <data name="Exit" xml:space="preserve">
     <value>Quitter</value>
   </data>
+  <data name="Radios" xml:space="preserve">
+    <value>Radios</value>
+  </data>
+  <data name="Radio_Country" xml:space="preserve">
+    <value>Pays</value>
+  </data>
+  <data name="Radio_Loading" xml:space="preserve">
+    <value>Recherche de stations...</value>
+  </data>
+  <data name="Radio_Name" xml:space="preserve">
+    <value>Nom</value>
+  </data>
+  <data name="Radio_NotFound" xml:space="preserve">
+    <value>Aucun station trouvée !</value>
+  </data>
+  <data name="Radio_Reset" xml:space="preserve">
+    <value>Réinitialiser</value>
+  </data>
+  <data name="Radio_Search" xml:space="preserve">
+    <value>Chercher</value>
+  </data>
+  <data name="Radio_SearchStation" xml:space="preserve">
+    <value>Recherche de station</value>
+  </data>
+  <data name="Radio_Tags" xml:space="preserve">
+    <value>Tags</value>
+  </data>
   <data name="Settings" xml:space="preserve">
     <value>Configuration</value>
   </data>

Resources/Resources.resx

@@ -120,6 +120,33 @@
   <data name="Exit" xml:space="preserve">
     <value>Exit</value>
   </data>
+  <data name="Radios" xml:space="preserve">
+    <value>Radios</value>
+  </data>
+  <data name="Radio_Country" xml:space="preserve">
+    <value>Country</value>
+  </data>
+  <data name="Radio_Loading" xml:space="preserve">
+    <value>Loading stations...</value>
+  </data>
+  <data name="Radio_Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="Radio_NotFound" xml:space="preserve">
+    <value>No stations found!</value>
+  </data>
+  <data name="Radio_Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Radio_Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="Radio_SearchStation" xml:space="preserve">
+    <value>Search station</value>
+  </data>
+  <data name="Radio_Tags" xml:space="preserve">
+    <value>Tags</value>
+  </data>
   <data name="Settings" xml:space="preserve">
     <value>Settings</value>
   </data>

Views/MainWindow.xaml

@@ -110,12 +110,20 @@
             </Border>
         </Grid>
         <Grid x:Name="BottomLayout" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" Width="Auto" MinHeight="40">
+            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,10,0">
                 <Button x:Name="Snapcast" HorizontalAlignment="Left" VerticalAlignment="Center" Click="Snapcast_Clicked" Margin="10,0,0,0" Padding="5, 2" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
                     <StackPanel Orientation="Horizontal">
                         <emoji:TextBlock Text="🔊" Padding="0,0,0,2"/>
                         <TextBlock x:Name="SnapcastText" Text="{x:Static properties:Resources.StartSnapcast}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
+                <Button x:Name="Radio" Padding="5, 2" HorizontalAlignment="Left" Click="Radios_Clicked"  Margin="5,0,10,0" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
+                    <StackPanel Orientation="Horizontal">
+                        <emoji:TextBlock Text="📻" Padding="0,0,0,2"/>
+                        <TextBlock Text="{x:Static properties:Resources.Radios}" Margin="5, 0, 0, 0"/>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <Grid x:Name="ConnectionOkIcon" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xf385;" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" VerticalAlignment="Center" HorizontalAlignment="Center" />

Views/MainWindow.xaml.cs

@@ -12,6 +12,7 @@ namespace unison
     public partial class MainWindow : Window
     {
         private readonly Settings _settingsWin;
+        private readonly Radios _radiosWin;
         private readonly DispatcherTimer _timer;
         private readonly MPDHandler _mpd;
 
@@ -23,6 +24,7 @@ namespace unison
             WindowState = WindowState.Minimized;
 
             _settingsWin = new Settings();
+            _radiosWin = new Radios();
             _timer = new DispatcherTimer();
             _mpd = (MPDHandler)Application.Current.Properties["mpd"];
 
@@ -68,10 +70,11 @@ namespace unison
                 SongTitle.Text = _mpd.GetCurrentSong().Title;
             else if (_mpd.GetCurrentSong().HasName && _mpd.GetCurrentSong().Name.Length > 0)
                 SongTitle.Text = _mpd.GetCurrentSong().Name;
-            else
+            else if (_mpd.GetCurrentSong().Path != null)
             {
                 int start = _mpd.GetCurrentSong().Path.LastIndexOf("/") + 1;
                 int end = _mpd.GetCurrentSong().Path.LastIndexOf(".");
+                if (start > 0 && end > 0 && end > start)
                     SongTitle.Text = _mpd.GetCurrentSong().Path.Substring(start, end - start);
             }
 
@@ -214,6 +217,15 @@ namespace unison
             snapcast.LaunchOrExit();
         }
 
+        public void Radios_Clicked(object sender, RoutedEventArgs e)
+        {
+            _radiosWin.Show();
+            _radiosWin.Activate();
+
+            if (_radiosWin.WindowState == WindowState.Minimized)
+                _radiosWin.WindowState = WindowState.Normal;
+        }
+
         public void Settings_Clicked(object sender, RoutedEventArgs e)
         {
             _settingsWin.Show();

Views/Radios.xaml

@@ -0,0 +1,74 @@
+<Window x:Class="unison.Radios"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
+        xmlns:properties="clr-namespace:unison.Resources" 
+        mc:Ignorable="d"
+        Title="Radios" Closing="Window_Closing" SizeToContent="WidthAndHeight" ResizeMode="NoResize">
+
+    <Grid>
+        <StackPanel>
+            <StackPanel HorizontalAlignment="Left" Orientation="Vertical" Margin="5,0,5,0">
+                <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                    <GroupBox.Header>
+                        <TextBlock>
+                            <emoji:EmojiInline Text="📻"/>
+                            <Run Text="{x:Static properties:Resources.Radio_SearchStation}"/>
+                        </TextBlock>
+                    </GroupBox.Header>
+                    <StackPanel Orientation="Vertical" Margin="5,0,5,0">
+                        <StackPanel Orientation="Horizontal">
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="{x:Static properties:Resources.Radio_Name}" Margin="0,0,0,5"/>
+                                <TextBox x:Name="NameSearch" KeyDown="SearchHandler" Width="200" Margin="0,4,0,0"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="{x:Static properties:Resources.Radio_Tags}" Margin="0,0,0,5"/>
+                                <TextBox x:Name="TagSearch" KeyDown="SearchHandler" Width="300" Margin="0,4,0,0"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="{x:Static properties:Resources.Radio_Country}" Margin="0,0,0,5"/>
+                                <ComboBox x:Name="CountryList" SelectedIndex="0" KeyDown="SearchHandler" Width="240" ScrollViewer.CanContentScroll="False"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                            <Button Content="{x:Static properties:Resources.Radio_Search}" Click="Search_Clicked" Padding="5, 2"/>
+                            <Button Content="{x:Static properties:Resources.Radio_Reset}" Click="Reset_Clicked" Margin="10,0,0,0" Padding="5, 2"/>
+                            <TextBlock x:Name="SearchStatus" Margin="15,1,0,0" FontStyle="Italic" />
+                        </StackPanel>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+
+            <Grid Margin="5,10,5,5" MaxHeight="600" MinWidth="800" MaxWidth="800">
+                <Grid.Resources>
+                <DataTemplate x:Key="CountryTemplate">
+                    <emoji:TextBlock TextAlignment="Center" Text="{Binding Country}"/>
+                </DataTemplate>
+            </Grid.Resources>
+            <DataGrid Name="RadioListGrid" MouseDoubleClick="Row_DoubleClick" CanUserAddRows="False" CanUserDeleteRows="False"
+                          CanUserReorderColumns="False" CanUserResizeRows="False" IsReadOnly="True" SelectionMode="Single"
+                          HeadersVisibility="Column" GridLinesVisibility="None" VirtualizingPanel.ScrollUnit="Pixel">
+                <DataGrid.Columns>
+                    <DataGridTemplateColumn Header="🏳️" CellTemplate="{StaticResource CountryTemplate}" MinWidth="25" />
+                    <DataGridTextColumn Header="{x:Static properties:Resources.Radio_Name}" Binding="{Binding Name}" MinWidth="50"/>
+                    <DataGridTextColumn Header="Codec" Binding="{Binding Codec}" MinWidth="47"/>
+                    <DataGridTextColumn Header="Bitrate" Binding="{Binding Bitrate}" MinWidth="47"/>
+                    <DataGridTextColumn Header="Tags" Binding="{Binding Tags}" MinWidth="50"/>
+                </DataGrid.Columns>
+                <DataGrid.CellStyle>
+                    <Style TargetType="DataGridCell">
+                        <Setter Property="BorderThickness" Value="0"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                    </Style>
+                </DataGrid.CellStyle>
+            </DataGrid>
+        </Grid>
+    </StackPanel>
+    </Grid>
+</Window>

Views/Radios.xaml.cs

@@ -0,0 +1,183 @@
+using RadioBrowser;
+using RadioBrowser.Models;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System;
+using System.ComponentModel;
+using System.Windows.Interop;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Collections.Generic;
+
+namespace unison
+{
+    public class CountryListItem
+    {
+        public uint Count { get; set; }
+        public string Name { get; set; }
+
+        public override string ToString()
+        {
+            if (Name == "")
+                return "None";
+            return $"{Name} ({Count})";
+        }
+    }
+
+    public class StationListItem
+    {
+        public string Name { get; set; }
+        public string Codec { get; set; }
+        public string Tags { get; set; }
+        public int Bitrate { get; set; }
+        public Uri Url { get; set; }
+
+        private string _country;
+        public string Country
+        {
+            get
+            {
+                if (_country.Length == 0)
+                    return "🏴‍☠️";
+                return string.Concat(_country.ToUpper().Select(x => char.ConvertFromUtf32(x + 0x1F1A5))); // return emoji
+            }
+            set
+            {
+                _country = value;
+            }
+        }
+    }
+
+    public partial class Radios : Window
+    {
+        private RadioBrowserClient _radioBrowser;
+        private MPDHandler _mpd;
+
+        public Radios()
+        {
+            InitializeComponent();
+
+            _radioBrowser = new RadioBrowserClient();
+            Initialize();
+        }
+
+        public async void Initialize()
+        {
+            List<NameAndCount> Countries = await _radioBrowser.Lists.GetCountriesAsync();
+            CountryList.Items.Add(new CountryListItem { Name = "", Count = 0 });
+            
+            foreach (NameAndCount Country in Countries)
+            {
+                CountryList.Items.Add(new CountryListItem
+                {
+                    Name = Country.Name,
+                    Count = Country.Stationcount
+                });
+            }
+        }
+
+        private string CleanString(string str)
+        {
+            return str.Replace("\r\n", "").Replace("\n", "").Replace("\r", "");
+        }
+
+        public async Task SearchAdvanced(string name, string country, string tags)
+        {
+            SearchStatus.Text = unison.Resources.Resources.Radio_Loading;
+
+            List<StationInfo> advancedSearch = await _radioBrowser.Search.AdvancedAsync(new AdvancedSearchOptions
+            {
+                Name = name,
+                Country = country,
+                TagList = tags
+            });
+
+            RadioListGrid.Items.Clear();
+            if (advancedSearch.Count > 0)
+            {
+                SearchStatus.Text = "";
+                foreach (StationInfo station in advancedSearch)
+                {
+                    RadioListGrid.Items.Add(new StationListItem
+                    {
+                        Name = CleanString(station.Name),
+                        Country = station.CountryCode,
+                        Codec = station.Codec,
+                        Bitrate = station.Bitrate,
+                        Url = station.Url,
+                        Tags = string.Join(", ", station.Tags)
+                    });
+                }
+                FitToContent();
+            }
+            else
+                SearchStatus.Text = unison.Resources.Resources.Radio_NotFound;
+        }
+
+        private void FitToContent()
+        {
+            foreach (DataGridColumn column in RadioListGrid.Columns)
+                column.Width = new DataGridLength(1.0, DataGridLengthUnitType.SizeToCells);
+        }
+
+        private void Row_DoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            DataGrid grid = sender as DataGrid;
+            StationListItem station;
+            try
+            {
+                station = grid.Items[grid.SelectedIndex] as StationListItem;
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                Debug.WriteLine("Error: Invalid index.");
+                return;
+            }
+
+            if (station.Url == null)
+            {
+                Debug.WriteLine("Error: Invalid station.");
+                return;
+            }
+
+            _mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            _mpd.ClearAddAndPlay(station.Url.AbsoluteUri);
+        }
+
+        private async void Search_Clicked(object sender, RoutedEventArgs e)
+        {
+            CountryListItem a = (CountryListItem)CountryList.SelectedItem;
+            await SearchAdvanced(NameSearch.Text, a?.Name, TagSearch.Text);
+        }
+
+        private void Reset_Clicked(object sender, RoutedEventArgs e)
+        {
+            NameSearch.Text = "";
+            TagSearch.Text = "";
+            CountryList.SelectedIndex = 0;
+        }
+
+        private void SearchHandler(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return)
+            {
+                Search_Clicked(null, null);
+            }
+        }
+
+        private void Window_Closing(object sender, CancelEventArgs e)
+        {
+            e.Cancel = true;
+            WindowState = WindowState.Minimized;
+            Hide();
+        }
+
+        public void InitHwnd()
+        {
+            WindowInteropHelper helper = new(this);
+            helper.EnsureHandle();
+        }
+    }
+}

Views/Settings.xaml

@@ -144,7 +144,8 @@
                                         <Run Text="{x:Static properties:Resources.Settings_AboutInfo}" /><LineBreak/>
                                         ※ <Hyperlink NavigateUri="https://github.com/Difegue/Stylophone" RequestNavigate="Hyperlink_RequestNavigate">Stylophone</Hyperlink><Run Text="{x:Static properties:Resources.Settings_MpcNET}" /><LineBreak/>
                                         ※ <Hyperlink NavigateUri="https://github.com/hardcodet/wpf-notifyicon" RequestNavigate="Hyperlink_RequestNavigate">wpf-notifyicon</Hyperlink><LineBreak/>
-                                        ※ <Hyperlink NavigateUri="https://github.com/samhocevar/emoji.wpf" RequestNavigate="Hyperlink_RequestNavigate">Emoji.WPF</Hyperlink>
+                                        ※ <Hyperlink NavigateUri="https://github.com/samhocevar/emoji.wpf" RequestNavigate="Hyperlink_RequestNavigate">Emoji.WPF</Hyperlink><LineBreak/>
+                                         ※ <Hyperlink NavigateUri="https://github.com/tof4/RadioBrowser" RequestNavigate="Hyperlink_RequestNavigate">RadioBrowser</Hyperlink>
                                     </TextBlock>
                                     <TextBlock Margin="0,10,0,0">
                                         <Run Text="{x:Static properties:Resources.Settings_SourceCode1}" />

Views/Systray.xaml

@@ -25,6 +25,11 @@
                 <Image Width="16" Height="16" emoji:Image.Source="🔊" />
             </MenuItem.Icon>
         </MenuItem>
+        <MenuItem Header="{x:Static properties:Resources.Radios}" Command="{Binding Radios}">
+            <MenuItem.Icon>
+                <Image Width="16" Height="16" emoji:Image.Source="📻" />
+            </MenuItem.Icon>
+        </MenuItem>
         <!--<MenuItem Header="Shuffle" Command="{Binding Shuffle}">
             <MenuItem.Icon>
                 <Image Width="16" Height="16" emoji:Image.Source="🔀" />

Views/SystrayViewModel.cs

@@ -59,6 +59,18 @@ namespace unison
             }
         }
 
+        public ICommand Radios
+        {
+            get
+            {
+                return new DelegateCommand
+                {
+                    CommandAction = () => ((MainWindow)Application.Current.MainWindow).Radios_Clicked(null, null),
+                    CanExecuteFunc = () => true
+                };
+            }
+        }
+
         public ICommand Settings
         {
             get

unison.csproj

@@ -7,7 +7,7 @@
     <ApplicationIcon>Resources\icon-full.ico</ApplicationIcon>
     <Win32Resource></Win32Resource>
     <StartupObject>unison.App</StartupObject>
-    <Version>1.0</Version>
+    <Version>1.1</Version>
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -74,6 +74,7 @@
   <ItemGroup>
     <PackageReference Include="Emoji.Wpf" Version="0.3.3" />
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
+    <PackageReference Include="RadioBrowser" Version="0.6.1" />
   </ItemGroup>
 
   <ItemGroup>