Merge branch 'main' into shuffle

App.xaml.cs

@@ -15,6 +15,8 @@ namespace unison
         {
             //debug language
             //unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("fr-FR");
+            //unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("es-ES");
+
 
             base.OnStartup(e);
 

CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+## v1.2
+
+*Released: 07/04/2022*
+
+* New feature: support for custom shortcuts
+* New feature: MPD stats
+* Add GitHub repository link in settings
+* MpcNET NuGet package integration
+* Update Snapcast from v0.25 to v0.26
+* Fix: hostname supported for connection
+* Fix: crash when using invalid IP or Hostname
+* Fix: crash when no internet connection when using RadioBrowser
+
+## v1.1
+
+*Released: 04/10/2021*
+
+* Radio browser
+* Mute shortcut
+* Enter key works in settings textboxes
+* Share current song by double-clicking
+
+## v1.0
+
+*Released: 03/09/2021*
+
+* First release of unison

Handlers/MPDHandler.cs

@@ -54,7 +54,7 @@ namespace unison
         bool _isUpdatingStatus = false;
         bool _isUpdatingSong = false;
 
-        bool _invalidIp = false;
+        public IPAddress _ipAddress;
 
         private event EventHandler ConnectionChanged;
         private event EventHandler StatusChanged;
@@ -64,12 +64,10 @@ namespace unison
         private MpcConnection _connection;
         private MpcConnection _commandConnection;
         private IPEndPoint _mpdEndpoint;
-        private CancellationTokenSource cancelToken;
+        private CancellationTokenSource _cancelToken;
 
         public MPDHandler()
         {
-            cancelToken = new CancellationTokenSource();
-
             Initialize(null, null);
 
             _stats = new Statistics();
@@ -97,7 +95,7 @@ namespace unison
 
         void OnConnectionChanged(object sender, EventArgs e)
         {
-            if (!_connected && !_invalidIp)
+            if (!_connected)
                 _retryTimer.Start();
             else
                 _retryTimer.Stop();
@@ -160,7 +158,7 @@ namespace unison
                 IMpdMessage<T> response = await _commandConnection.SendAsync(command);
                 if (!response.IsResponseValid)
                 {
-                    var mpdError = response.Response?.Result?.MpdError;
+                    string mpdError = response.Response?.Result?.MpdError;
                     if (mpdError != null && mpdError != "")
                         throw new Exception(mpdError);
                     else
@@ -185,19 +183,23 @@ namespace unison
 
         public async void Connect()
         {
-            CancellationToken token = cancelToken.Token;
+            _cancelToken = new CancellationTokenSource();
+            CancellationToken token = _cancelToken.Token;
+
             try
             {
                 _connection = await ConnectInternal(token);
                 _commandConnection = await ConnectInternal(token);
             }
-            catch(MpcNET.Exceptions.MpcConnectException)
+            catch (MpcNET.Exceptions.MpcConnectException e)
             {
-                _invalidIp = true;
+                _connected = false;
+                Trace.WriteLine($"Error in connect: {e.Message}");
+                ConnectionChanged?.Invoke(this, EventArgs.Empty);
+                return;
             }
             if (_connection != null && _commandConnection != null)
             {
-                _invalidIp = false;
                 if (_connection.IsConnected && _commandConnection.IsConnected)
                 {
                     _connected = true;
@@ -207,6 +209,7 @@ namespace unison
             }
             else
             {
+                _connected = false;
                 ConnectionChanged?.Invoke(this, EventArgs.Empty);
                 return;
             }
@@ -219,16 +222,21 @@ namespace unison
 
         private async Task<MpcConnection> ConnectInternal(CancellationToken token)
         {
-            IPAddress.TryParse(Properties.Settings.Default.mpd_host, out IPAddress ipAddress);
+            IPAddress.TryParse(Properties.Settings.Default.mpd_host, out _ipAddress);
 
-            if (ipAddress == null)
+            if (_ipAddress == null)
             {
-                IPAddress[] addrList;
                 try
                 {
-                    addrList = Dns.GetHostAddresses(Properties.Settings.Default.mpd_host);
+                    IPAddress[] addrList = Dns.GetHostAddresses(Properties.Settings.Default.mpd_host);
                     if (addrList.Length > 0)
-                        ipAddress = addrList[0];
+                    {
+                        foreach (IPAddress addr in addrList)
+                        {
+                            if (addr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                                _ipAddress = addr;
+                        }
+                    }
                 }
                 catch (Exception)
                 {
@@ -236,11 +244,11 @@ namespace unison
                 }
             }
 
-            _mpdEndpoint = new IPEndPoint(ipAddress, Properties.Settings.Default.mpd_port);
+            _mpdEndpoint = new IPEndPoint(_ipAddress, Properties.Settings.Default.mpd_port);
             MpcConnection connection = new MpcConnection(_mpdEndpoint);
             await connection.ConnectAsync(token);
 
-            /*if (!string.IsNullOrEmpty(Properties.Settings.Default.mpd_password))
+            if (!string.IsNullOrEmpty(Properties.Settings.Default.mpd_password))
             {
                 IMpdMessage<string> result = await connection.SendAsync(new PasswordCommand(Properties.Settings.Default.mpd_password));
                 if (!result.IsResponseValid)
@@ -248,19 +256,21 @@ namespace unison
                     string mpdError = result.Response?.Result?.MpdError;
                     Trace.WriteLine(mpdError);
                 }
-            }*/
+            }
 
             return connection;
         }
 
-        private void Disconnected()
-        {
+        public void Disconnected()
+        {            
             _connected = false;
-
-            _connection = null;
-            _commandConnection = null;
-
             ConnectionChanged?.Invoke(this, EventArgs.Empty);
+
+            if (_connection != null)
+                _connection = null;
+
+            if (_commandConnection != null)
+                _commandConnection = null;
         }
 
         private void Loop(CancellationToken token)
@@ -271,24 +281,29 @@ namespace unison
                 {
                     try
                     {
+                        token.ThrowIfCancellationRequested();
                         if (token.IsCancellationRequested || _connection == null)
                             break;
 
-                        var idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options"));
+                        IMpdMessage<string> idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options update"));
 
                         if (idleChanges.IsResponseValid)
                             await HandleIdleResponseAsync(idleChanges.Response.Content);
                         else
+                        {
+                            Trace.WriteLine($"Error in Idle connection thread: {idleChanges.Response?.Content}");
                             throw new Exception(idleChanges.Response?.Content);
+                        }
                     }
                     catch (Exception e)
                     {
                         Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
                         Disconnected();
+                        break;
                     }
                 }
 
-            }).ConfigureAwait(false);
+            }, token).ConfigureAwait(false);
         }
 
         private async Task HandleIdleResponseAsync(string subsystems)
@@ -366,6 +381,7 @@ namespace unison
             List<byte> data = new List<byte>();
             try
             {
+                bool ReadPictureFailed = true;
                 long totalBinarySize = 9999;
                 long currentSize = 0;
 
@@ -374,18 +390,41 @@ namespace unison
                     if (_connection == null)
                         return;
 
-                    var albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
+                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new ReadPictureCommand(path, currentSize));
                     if (!albumReq.IsResponseValid)
                         break;
 
-                    var response = albumReq.Response.Content;
-                    if (response.Binary == 0)
+                    MpdBinaryData response = albumReq.Response.Content;
+                    if (response == null || response.Binary == 0)
+                        break;
+
+                    ReadPictureFailed = false;
+                    totalBinarySize = response.Size;
+                    currentSize += response.Binary;
+                    data.AddRange(response.Data);
+                }
+                while (currentSize < totalBinarySize && !token.IsCancellationRequested);
+
+                do
+                {
+                    if (!ReadPictureFailed)
+                        break;
+                    if (_connection == null)
+                        return;
+
+                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
+                    if (!albumReq.IsResponseValid)
+                        break;
+
+                    MpdBinaryData response = albumReq.Response.Content;
+                    if (response == null || response.Binary == 0)
                         break;
 
                     totalBinarySize = response.Size;
                     currentSize += response.Binary;
                     data.AddRange(response.Data);
-                } while (currentSize < totalBinarySize && !token.IsCancellationRequested);
+                }
+                while (currentSize < totalBinarySize && !token.IsCancellationRequested);
             }
             catch (Exception e)
             {
@@ -503,7 +542,6 @@ namespace unison
 
         public void AddSong(string Uri)
         {
-            Debug.WriteLine("AddCommand path: " + Uri);
             SendCommand(new AddCommand(Uri));
         }
 
@@ -515,21 +553,23 @@ namespace unison
 
         public async void QueryStats()
         {
-            Dictionary<string, string> response = await SafelySendCommandAsync(new StatsCommand());
+            Dictionary<string, string> Response = await SafelySendCommandAsync(new StatsCommand());
+            if (Response == null)
+                return;
 
-            _stats.Songs = int.Parse(response["songs"]);
-            _stats.Albums = int.Parse(response["albums"]);
-            _stats.Artists = int.Parse(response["artists"]);
+            _stats.Songs = int.Parse(Response["songs"]);
+            _stats.Albums = int.Parse(Response["albums"]);
+            _stats.Artists = int.Parse(Response["artists"]);
 
             TimeSpan time;
-            time = TimeSpan.FromSeconds(int.Parse(response["uptime"]));
+            time = TimeSpan.FromSeconds(int.Parse(Response["uptime"]));
             _stats.Uptime = time.ToString(@"dd\:hh\:mm\:ss");
-            time = TimeSpan.FromSeconds(int.Parse(response["db_playtime"]));
+            time = TimeSpan.FromSeconds(int.Parse(Response["db_playtime"]));
             _stats.TotalPlaytime = time.ToString(@"dd\:hh\:mm\:ss");
-            time = TimeSpan.FromSeconds(int.Parse(response["playtime"]));
+            time = TimeSpan.FromSeconds(int.Parse(Response["playtime"]));
             _stats.TotalTimePlayed = time.ToString(@"dd\:hh\:mm\:ss");
 
-            DateTime date = new DateTime(1970, 1, 1).AddSeconds(int.Parse(response["db_update"])).ToLocalTime();
+            DateTime date = new DateTime(1970, 1, 1).AddSeconds(int.Parse(Response["db_update"])).ToLocalTime();
             _stats.DatabaseUpdate = date.ToString("dd/MM/yyyy @ HH:mm");
         }
     }

Handlers/SnapcastHandler.cs

@@ -14,7 +14,7 @@ namespace unison
         {
             if (Properties.Settings.Default.snapcast_startup)
             {
-                var mpd = (MPDHandler)Application.Current.Properties["mpd"];
+                MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
                 if (mpd.IsConnected())
                     LaunchOrExit();
             }
@@ -37,8 +37,10 @@ namespace unison
         {
             if (!HasStarted && !ForceExit)
             {
+                MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+
                 _snapcast.StartInfo.FileName = Properties.Settings.Default.snapcast_path + @"\snapclient.exe";
-                _snapcast.StartInfo.Arguments = $"--host {Properties.Settings.Default.mpd_host}";
+                _snapcast.StartInfo.Arguments = $"--host {mpd._ipAddress}";
                 _snapcast.StartInfo.CreateNoWindow = !Properties.Settings.Default.snapcast_window;
                 try
                 {

README.md

@@ -33,17 +33,11 @@ Through [Radio-Browser](https://www.radio-browser.info), a community database, y
 
 ![Radio stations](Screenshots/screen4.png)
 
-## Caveats
-
-### Missing features
-
-* MPD passwords: I don't really see the point, but if asked, I will integrate them.
-
-### Planned features
+## Planned features
 
 * A complete shuffle system based on set criteria, aka a smart playlist.
 * Playlist, queue and library management. I use other software to do it, but I will implement them at some point.
 
 ## Translations
 
-unison is translated in English and French. You can contribute if you want!
+unison is translated in English, French and Spanish. You can contribute if you want!

Resources/Resources.Designer.cs

@@ -196,7 +196,25 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connected to MPD.
+        ///   Looks up a localized string similar to Please note that since MPD passwords are not secure (they are sent in plain text to the server), there are saved as is in the setting file..
+        /// </summary>
+        public static string Settings_ConnectionPasswordInfo {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionPasswordInfo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Status:.
+        /// </summary>
+        public static string Settings_ConnectionStatus {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionStatus", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to connected to MPD.
         /// </summary>
         public static string Settings_ConnectionStatusConnected {
             get {
@@ -205,7 +223,7 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connecting....
+        ///   Looks up a localized string similar to connecting....
         /// </summary>
         public static string Settings_ConnectionStatusConnecting {
             get {
@@ -214,7 +232,7 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Not connected..
+        ///   Looks up a localized string similar to not connected..
         /// </summary>
         public static string Settings_ConnectionStatusOffline {
             get {
@@ -258,6 +276,15 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Password.
+        /// </summary>
+        public static string Settings_Password {
+            get {
+                return ResourceManager.GetString("Settings_Password", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Play / pause.
         /// </summary>

Resources/Resources.es-ES.resx

@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Exit" xml:space="preserve">
+    <value>Salir</value>
+  </data>
+  <data name="Radios" xml:space="preserve">
+    <value>Radios</value>
+  </data>
+  <data name="Radio_Country" xml:space="preserve">
+    <value>Países</value>
+  </data>
+  <data name="Radio_Loading" xml:space="preserve">
+    <value>Cargando estaciones...</value>
+  </data>
+  <data name="Radio_Name" xml:space="preserve">
+    <value>Nombre</value>
+  </data>
+  <data name="Radio_NotFound" xml:space="preserve">
+    <value>¡No estaciones encontradas!</value>
+  </data>
+  <data name="Radio_Reset" xml:space="preserve">
+    <value>Reinicializar</value>
+  </data>
+  <data name="Radio_Search" xml:space="preserve">
+    <value>Búsqueda</value>
+  </data>
+  <data name="Radio_SearchStation" xml:space="preserve">
+    <value>Buscar estación</value>
+  </data>
+  <data name="Radio_Tags" xml:space="preserve">
+    <value>Tags</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Ajustes</value>
+  </data>
+  <data name="Settings_About" xml:space="preserve">
+    <value>Acerca de</value>
+  </data>
+  <data name="Settings_AboutInfo" xml:space="preserve">
+    <value>unison es un software libre. Es construido con las siguientes tecnologías:</value>
+  </data>
+  <data name="Settings_ConnectButton" xml:space="preserve">
+    <value>Conexión</value>
+  </data>
+  <data name="Settings_Connection" xml:space="preserve">
+    <value>Conexión</value>
+  </data>
+  <data name="Settings_ConnectionPasswordInfo" xml:space="preserve">
+    <value>Tenga en cuenta que, dado que las contraseñas de MPD no son seguras (se envían en texto sin formato al servidor), se guardan tal cual en el archivo de configuración.</value>
+  </data>
+  <data name="Settings_ConnectionStatus" xml:space="preserve">
+    <value>Estado:</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
+    <value>conectado a MPD</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
+    <value>conectando...</value>
+  </data>
+  <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
+    <value>no conectado.</value>
+  </data>
+  <data name="Settings_Host" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="Settings_License" xml:space="preserve">
+    <value>Licencia</value>
+  </data>
+  <data name="Settings_MadeBy" xml:space="preserve">
+    <value>Creado por</value>
+  </data>
+  <data name="Settings_NextTrack" xml:space="preserve">
+    <value>Pista siguiente</value>
+  </data>
+  <data name="Settings_Password" xml:space="preserve">
+    <value>Contraseña</value>
+  </data>
+  <data name="Settings_PlayPause" xml:space="preserve">
+    <value>Jugar / pausa</value>
+  </data>
+  <data name="Settings_Port" xml:space="preserve">
+    <value>Puerto</value>
+  </data>
+  <data name="Settings_PreviousTrack" xml:space="preserve">
+    <value>Pista precedente</value>
+  </data>
+  <data name="Settings_Shortcuts" xml:space="preserve">
+    <value>Atajos</value>
+  </data>
+  <data name="Settings_ShortcutsInfo" xml:space="preserve">
+    <value>Tenga en cuenta que si no está reconocida la tecla, esto se debe a una limitación en el funcionamiento de las teclas virtuales.</value>
+  </data>
+  <data name="Settings_ShortcutsKey" xml:space="preserve">
+    <value>Entre una tecla...</value>
+  </data>
+  <data name="Settings_ShowWindow" xml:space="preserve">
+    <value>Mostrar ventana</value>
+  </data>
+  <data name="Settings_SnapcastInfo1" xml:space="preserve">
+    <value>Puede cambiar a su propia versión instalada localmente del cliente Snapcast con una ruta</value>
+  </data>
+  <data name="Settings_SnapcastInfo2" xml:space="preserve">
+    <value> absoluta</value>
+  </data>
+  <data name="Settings_SnapcastInfo3" xml:space="preserve">
+    <value>.</value>
+  </data>
+  <data name="Settings_SnapcastLauch" xml:space="preserve">
+    <value>Lanzar al inicio</value>
+  </data>
+  <data name="Settings_SnapcastPath" xml:space="preserve">
+    <value>Ruta del ejecutable</value>
+  </data>
+  <data name="Settings_SnapcastPort" xml:space="preserve">
+    <value>Puerto</value>
+  </data>
+  <data name="Settings_SnapcastResetButton" xml:space="preserve">
+    <value>Reinicializar</value>
+  </data>
+  <data name="Settings_SnapcastWindow" xml:space="preserve">
+    <value>Mostrar ventana de Snapcast</value>
+  </data>
+  <data name="Settings_SourceCode1" xml:space="preserve">
+    <value>Código fuente disponible gratuitamente</value>
+  </data>
+  <data name="Settings_SourceCode2" xml:space="preserve">
+    <value>aquí</value>
+  </data>
+  <data name="Settings_Version" xml:space="preserve">
+    <value>Versión:</value>
+  </data>
+  <data name="Settings_VolumeDown" xml:space="preserve">
+    <value>Bajar volumen</value>
+  </data>
+  <data name="Settings_VolumeMute" xml:space="preserve">
+    <value>Volumen mudo</value>
+  </data>
+  <data name="Settings_VolumeOffset" xml:space="preserve">
+    <value>Intervalo de volumen</value>
+  </data>
+  <data name="Settings_VolumeUp" xml:space="preserve">
+    <value>Subir volumen</value>
+  </data>
+  <data name="ShowWindow" xml:space="preserve">
+    <value>Mostrar ventana</value>
+  </data>
+  <data name="Snapcast_Popup1" xml:space="preserve">
+    <value>Error Snapcast</value>
+  </data>
+  <data name="Snapcast_Popup2" xml:space="preserve">
+    <value>Ruta no válida:</value>
+  </data>
+  <data name="Snapcast_Popup3" xml:space="preserve">
+    <value>Ruta actual:</value>
+  </data>
+  <data name="Snapcast_Popup4" xml:space="preserve">
+    <value>Puede restablecerlo en la configuración si es necesario.</value>
+  </data>
+  <data name="StartSnapcast" xml:space="preserve">
+    <value>Iniciar Snapcast</value>
+  </data>
+  <data name="Stats" xml:space="preserve">
+    <value>Estadísticas</value>
+  </data>
+  <data name="Stats_Albums" xml:space="preserve">
+    <value>Álbumes:</value>
+  </data>
+  <data name="Stats_Artists" xml:space="preserve">
+    <value>Artistas:</value>
+  </data>
+  <data name="Stats_LastDatabaseUpdate" xml:space="preserve">
+    <value>Última actualización de la base de datos:</value>
+  </data>
+  <data name="Stats_Songs" xml:space="preserve">
+    <value>Canciones:</value>
+  </data>
+  <data name="Stats_TotalPlaytime" xml:space="preserve">
+    <value>Tiempo de juego total:</value>
+  </data>
+  <data name="Stats_TotalTimePlayed" xml:space="preserve">
+    <value>Tiempo total jugado:</value>
+  </data>
+  <data name="Stats_Uptime" xml:space="preserve">
+    <value>Tiempo de actividad de MPD:</value>
+  </data>
+  <data name="StopSnapcast" xml:space="preserve">
+    <value>Parar Snapcast</value>
+  </data>
+</root>

Resources/Resources.fr-FR.resx

@@ -133,7 +133,7 @@
     <value>Nom</value>
   </data>
   <data name="Radio_NotFound" xml:space="preserve">
-    <value>Aucun station trouvée !</value>
+    <value>Aucune station trouvée !</value>
   </data>
   <data name="Radio_Reset" xml:space="preserve">
     <value>Réinitialiser</value>
@@ -162,14 +162,20 @@
   <data name="Settings_Connection" xml:space="preserve">
     <value>Connexion</value>
   </data>
+  <data name="Settings_ConnectionPasswordInfo" xml:space="preserve">
+    <value>Veuillez noter que comme les mots de passe de MPD ne sont pas sécurisés (ils sont envoyés en clair au serveur), ils sont sauvegardés tels quels.</value>
+  </data>
+  <data name="Settings_ConnectionStatus" xml:space="preserve">
+    <value>Statut :</value>
+  </data>
   <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
-    <value>Connecté à MPD</value>
+    <value>connecté à MPD</value>
   </data>
   <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
-    <value>Connexion en cours...</value>
+    <value>connexion en cours...</value>
   </data>
   <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
-    <value>Non connecté.</value>
+    <value>non connecté.</value>
   </data>
   <data name="Settings_Host" xml:space="preserve">
     <value>Hôte</value>
@@ -183,6 +189,9 @@
   <data name="Settings_NextTrack" xml:space="preserve">
     <value>Piste suivante</value>
   </data>
+  <data name="Settings_Password" xml:space="preserve">
+    <value>Mot de passe</value>
+  </data>
   <data name="Settings_PlayPause" xml:space="preserve">
     <value>Jouer / pause</value>
   </data>

Resources/Resources.resx

@@ -162,14 +162,20 @@
   <data name="Settings_Connection" xml:space="preserve">
     <value>Connection</value>
   </data>
+  <data name="Settings_ConnectionPasswordInfo" xml:space="preserve">
+    <value>Please note that since MPD passwords are not secure (they are sent in plain text to the server), there are saved as is in the setting file.</value>
+  </data>
+  <data name="Settings_ConnectionStatus" xml:space="preserve">
+    <value>Status:</value>
+  </data>
   <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
-    <value>Connected to MPD</value>
+    <value>connected to MPD</value>
   </data>
   <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
-    <value>Connecting...</value>
+    <value>connecting...</value>
   </data>
   <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
-    <value>Not connected.</value>
+    <value>not connected.</value>
   </data>
   <data name="Settings_Host" xml:space="preserve">
     <value>Host</value>
@@ -183,6 +189,9 @@
   <data name="Settings_NextTrack" xml:space="preserve">
     <value>Next track</value>
   </data>
+  <data name="Settings_Password" xml:space="preserve">
+    <value>Password</value>
+  </data>
   <data name="Settings_PlayPause" xml:space="preserve">
     <value>Play / pause</value>
   </data>

Views/MainWindow.xaml

@@ -110,14 +110,15 @@
             </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 HorizontalAlignment="Left" Orientation="Horizontal" VerticalAlignment="Center" Margin="10,0,0,0">
+                <Button x:Name="Shuffle" Padding="5, 2" Click="Shuffle_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" Margin="0,0,10,0">
                     <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"/>
+                        <emoji:TextBlock Text="🔁" Padding="0,0,0,2"/>
+                        <TextBlock Text="Shuffle" 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}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
+
+                <Button x:Name="Radio" Padding="5, 2" HorizontalAlignment="Left" Click="Radios_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
                     <StackPanel Orientation="Horizontal">
                         <emoji:TextBlock Text="📻" Padding="0,0,0,2"/>
                         <TextBlock Text="{x:Static properties:Resources.Radios}" Margin="5, 0, 0, 0"/>
@@ -135,12 +136,13 @@
                 <TextBlock x:Name="Connection" HorizontalAlignment="Center" Text="Not connected" TextWrapping="Wrap" VerticalAlignment="Top" TextAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Margin="5,0,0,0" />
             </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,10,0">
-                <!--<Button x:Name="Shuffle" Padding="5, 2" HorizontalAlignment="Right" Margin="0,0,10,0" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
+                <Button x:Name="Snapcast" HorizontalAlignment="Left" VerticalAlignment="Center" Click="Snapcast_Clicked" Margin="0,0,10,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 Text="Shuffle" Margin="5, 0, 0, 0"/>
+                        <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>
+
                 <Button x:Name="Settings" Padding="5, 2" Click="Settings_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}">
                     <StackPanel Orientation="Horizontal">
                         <emoji:TextBlock Text="🛠️"  Padding="0,0,0,2"/>

Views/MainWindow.xaml.cs

@@ -6,6 +6,8 @@ using System.Windows.Threading;
 using System.Windows.Interop;
 using System.Windows.Input;
 using System.Windows.Controls.Primitives;
+using MpcNET.Commands.Queue;
+using System.Diagnostics;
 
 namespace unison
 {
@@ -13,6 +15,7 @@ namespace unison
     {
         private readonly Settings _settingsWin;
         private readonly Radios _radiosWin;
+        private readonly Shuffle _shuffleWin;
         private readonly DispatcherTimer _timer;
         private readonly MPDHandler _mpd;
 
@@ -25,6 +28,7 @@ namespace unison
 
             _settingsWin = new Settings();
             _radiosWin = new Radios();
+            _shuffleWin = new Shuffle();
             _timer = new DispatcherTimer();
             _mpd = (MPDHandler)Application.Current.Properties["mpd"];
 
@@ -49,6 +53,9 @@ namespace unison
                 Snapcast.IsEnabled = true;
                 ConnectionOkIcon.Visibility = Visibility.Visible;
                 ConnectionFailIcon.Visibility = Visibility.Collapsed;
+
+                _shuffleWin.ListGenre();
+                _shuffleWin.ListFolder();
             }
             else
             {
@@ -61,7 +68,7 @@ namespace unison
             Connection.Text = $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
         }
 
-        public void OnSongChanged(object sender, EventArgs e)
+        public async void OnSongChanged(object sender, EventArgs e)
         {
             if (_mpd.GetCurrentSong() == null)
                 return;
@@ -83,7 +90,7 @@ namespace unison
             SongAlbum.Text = _mpd.GetCurrentSong().Album;
 
             if (_mpd.GetCurrentSong().Date != null)
-                SongAlbum.Text += $" ({ _mpd.GetCurrentSong().Date})";
+                SongAlbum.Text += $" ({_mpd.GetCurrentSong().Date.Split("-")[0]})";
 
             SongGenre.Text = _mpd.GetCurrentSong().Genre;
             SongFormat.Text = _mpd.GetCurrentSong().Path.Substring(_mpd.GetCurrentSong().Path.LastIndexOf(".") + 1);
@@ -107,6 +114,32 @@ namespace unison
                     _timer.Start();
                 EndTime.Text = FormatSeconds(_mpd.GetCurrentSong().Time);
             }
+
+            Debug.WriteLine("Song changed called!");
+
+            // handle continuous shuffle
+            if (_shuffleWin.GetContinuous())
+            {
+                System.Collections.Generic.IEnumerable<MpcNET.Types.IMpdFile> a = await _mpd.SafelySendCommandAsync(new PlaylistCommand());
+                int queueSize = 0;
+                foreach (var i in a)
+                {
+                    Debug.WriteLine(i.Path);
+                    queueSize++;
+                }
+                Debug.WriteLine("queue size is: " + queueSize);
+
+                if (queueSize < 5)
+                {
+                    _shuffleWin.AddContinuousSongs();
+                }
+
+                // query queue
+                // if (queue.SongRemaining < 5)
+                //{
+                //    // query shuffle songs
+                //}
+            }
         }
 
         public void OnStatusChanged(object sender, EventArgs e)
@@ -234,6 +267,15 @@ namespace unison
                 _radiosWin.WindowState = WindowState.Normal;
         }
 
+        public void Shuffle_Clicked(object sender, RoutedEventArgs e)
+        {
+            _shuffleWin.Show();
+            _shuffleWin.Activate();
+
+            if (_shuffleWin.WindowState == WindowState.Minimized)
+                _shuffleWin.WindowState = WindowState.Normal;
+        }
+
         public void Settings_Clicked(object sender, RoutedEventArgs e)
         {
             _settingsWin.Show();

Views/Radios.xaml.cs

@@ -78,16 +78,24 @@ namespace unison
 
         public async void Initialize()
         {
-            List<NameAndCount> Countries = await _radioBrowser.Lists.GetCountriesAsync();
-            CountryList.Items.Add(new CountryListItem { Name = "", Count = 0 });
-            
-            foreach (NameAndCount Country in Countries)
+            try
             {
-                CountryList.Items.Add(new CountryListItem
+                List<NameAndCount> Countries = await _radioBrowser.Lists.GetCountriesAsync();
+                CountryList.Items.Add(new CountryListItem { Name = "", Count = 0 });
+
+                foreach (NameAndCount Country in Countries)
                 {
-                    Name = Country.Name,
-                    Count = Country.Stationcount
-                });
+                    CountryList.Items.Add(new CountryListItem
+                    {
+                        Name = Country.Name,
+                        Count = Country.Stationcount
+                    });
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine("Exception while getting countries in RadioBrowser: " + e.Message);
+                return;
             }
         }
 

Views/Settings.xaml

@@ -33,20 +33,26 @@
                                 <StackPanel>
                                     <StackPanel>
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Host}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdHost" KeyDown="ConnectHandler" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <TextBox x:Name="MpdHost" KeyDown="ConnectHandler" TextChanged="MpdConnectTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
                                     <StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Port}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdPort" KeyDown="ConnectHandler" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <TextBox x:Name="MpdPort" KeyDown="ConnectHandler" PreviewTextInput="NumberValidationTextBox" MaxLength="5" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
-                                    <!--<StackPanel Margin="0,5,0,0">
-                                        <TextBlock Text="Password" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdPassword" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
-                                    </StackPanel>-->
+                                    <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"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="250" HorizontalAlignment="Left"/>
+                                    </StackPanel>
 
-                                    <TextBlock x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}" TextWrapping="Wrap" Margin="5,10,0,0"/>
+                                    <TextBlock TextWrapping="Wrap" Margin="5,10,0,0">
+                                        <Run Text="{x:Static properties:Resources.Settings_ConnectionStatus}" FontWeight="Bold" />
+                                        <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>
@@ -54,60 +60,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">
-                            <GroupBox.Header>
-                                <emoji:TextBlock Text="🔊 Snapcast"/>
-                            </GroupBox.Header>
-                            <Grid VerticalAlignment="Top">
-                                <StackPanel>
-                                    <StackPanel>
-                                        <CheckBox x:Name="SnapcastStartup" Margin="5, 5, 0, 0">
-                                            <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastLauch}" TextWrapping="Wrap"/>
-                                        </CheckBox>
-                                        <CheckBox x:Name="SnapcastWindow" Margin="5,2.5,0,0">
-                                            <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastWindow}" TextWrapping="Wrap"/>
-                                        </CheckBox>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastPort}" TextWrapping="Wrap" Margin="5,5,0,0"/>
-                                        <TextBox x:Name="SnapcastPort" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,5,0" HorizontalAlignment="Left"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastPath}" TextWrapping="Wrap" Margin="5,5,0,0"/>
-                                        <TextBox x:Name="SnapcastPath" TextWrapping="Wrap" Width="250" Margin="10,2,5,0" HorizontalAlignment="Left"/>
-                                        <TextBlock TextWrapping="Wrap" Margin="5,5,0,0" TextAlignment="Left" Width="250">
-                                            <Run Text="{x:Static properties:Resources.Settings_SnapcastInfo1}" /><Run Text="{x:Static properties:Resources.Settings_SnapcastInfo2}" FontStyle="Italic" FontWeight="DemiBold" /><Run Text="{x:Static properties:Resources.Settings_SnapcastInfo3}" />
-                                        </TextBlock>
-                                        <Button Content="{x:Static properties:Resources.Settings_SnapcastResetButton}" Margin="0,10,0,0" Width="120" Click="SnapcastReset_Clicked"/>
-                                    </StackPanel>
-                                </StackPanel>
-                            </Grid>
-                        </GroupBox>
-                    </DockPanel>
-                </TabItem>
-
                 <TabItem Header="{x:Static properties:Resources.Settings_Shortcuts}">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
@@ -205,17 +157,101 @@
                                     </Grid>
 
                                     <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShortcutsInfo}" TextWrapping="Wrap" Margin="0,2,0,0" MaxWidth="420" />
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShortcutsInfo}" TextWrapping="Wrap" MaxWidth="440" TextAlignment="Justify" />
                                     </StackPanel>
 
                                     <Button Content="{x:Static properties:Resources.Settings_SnapcastResetButton}" Margin="0,10,0,0" Width="120" Click="ShortcutsReset_Clicked"/>
-
                                 </StackPanel>
                             </Grid>
                         </GroupBox>
                     </DockPanel>
                 </TabItem>
 
+                <TabItem Header="Snapcast">
+                    <DockPanel Margin="8">
+                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                            <GroupBox.Header>
+                                <emoji:TextBlock Text="🔊 Snapcast"/>
+                            </GroupBox.Header>
+                            <Grid VerticalAlignment="Top">
+                                <StackPanel>
+                                    <StackPanel>
+                                        <CheckBox x:Name="SnapcastStartup" Margin="5, 5, 0, 0">
+                                            <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastLauch}" TextWrapping="Wrap"/>
+                                        </CheckBox>
+                                        <CheckBox x:Name="SnapcastWindow" Margin="5,2.5,0,0">
+                                            <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastWindow}" TextWrapping="Wrap"/>
+                                        </CheckBox>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastPort}" TextWrapping="Wrap" Margin="5,5,0,0"/>
+                                        <TextBox x:Name="SnapcastPort" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,5,0" HorizontalAlignment="Left"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastPath}" TextWrapping="Wrap" Margin="5,5,0,0"/>
+                                        <TextBox x:Name="SnapcastPath" TextWrapping="Wrap" Width="250" Margin="10,2,5,0" HorizontalAlignment="Left"/>
+                                        <TextBlock TextWrapping="Wrap" Margin="5,5,0,0" TextAlignment="Left" Width="250">
+                                            <Run Text="{x:Static properties:Resources.Settings_SnapcastInfo1}" /><Run Text="{x:Static properties:Resources.Settings_SnapcastInfo2}" FontStyle="Italic" FontWeight="DemiBold" /><Run Text="{x:Static properties:Resources.Settings_SnapcastInfo3}" />
+                                        </TextBlock>
+                                        <Button Content="{x:Static properties:Resources.Settings_SnapcastResetButton}" Margin="0,10,0,0" Width="120" Click="SnapcastReset_Clicked"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                        </GroupBox>
+                    </DockPanel>
+                </TabItem>
+
+                <TabItem Header="Shuffle">
+                    <DockPanel Margin="8">
+                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                            <GroupBox.Header>
+                                <TextBlock>
+                                    <emoji:EmojiInline Text="🔁 "/>
+                                    <Run Text="Shuffle"></Run>
+                                </TextBlock>
+                            </GroupBox.Header>
+                            <Grid MaxWidth="500">
+                                <StackPanel>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBox TextWrapping="Wrap" Width="25" PreviewTextInput="NumberValidationTextBox" Margin="0,2,0,0"/>
+                                        <TextBlock Text="Prevent repetition rate (0-100%)" TextWrapping="Wrap" Margin="5,2,0,0"/>
+                                    </StackPanel>
+                                    <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
+                                        <Run>The shuffle window allows to add random songs to your queue. Both options take into account the filter.</Run>
+                                        <Run>If the filter is empty, the entire music library is taken into account.</Run><LineBreak/><LineBreak/>
+                                        <Run FontWeight="Bold">Continuous shuffle</Run><LineBreak/>
+                                        <Run>By enabling this option, unison will automatically add songs to the queue so you never run out of songs to listen to.</Run>
+                                        <LineBreak/><LineBreak/>
+                                        
+                                        <Run FontWeight="Bold">Add to queue</Run><LineBreak/>
+                                        <Run>Add a fixed number of songs to the queue. It can take a long time to add more than 100 songs, so the option is limited to 1000 songs.</Run>
+                                    </TextBlock>
+                                </StackPanel>
+                            </Grid>
+                        </GroupBox>
+                    </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

@@ -37,6 +37,7 @@ namespace unison
 
         HotkeyHandler _hotkeys = (HotkeyHandler)Application.Current.Properties["hotkeys"];
 
+
         public Settings()
         {
             InitHwnd();
@@ -52,7 +53,7 @@ namespace unison
         {
             MpdHost.Text = Properties.Settings.Default.mpd_host;
             MpdPort.Text = Properties.Settings.Default.mpd_port.ToString();
-            //MpdPassword.Text = Properties.Settings.Default.mpd_password;
+            MpdPassword.Password = Properties.Settings.Default.mpd_password;
             SnapcastStartup.IsChecked = Properties.Settings.Default.snapcast_startup;
             SnapcastWindow.IsChecked = Properties.Settings.Default.snapcast_window;
             SnapcastPath.Text = Properties.Settings.Default.snapcast_path;
@@ -62,6 +63,134 @@ namespace unison
             InitializeShortcuts();
         }
 
+        public void UpdateConnectionStatus()
+        {
+            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            if (mpd.IsConnected())
+            {
+                ConnectionStatus.Text = $"{unison.Resources.Resources.Settings_ConnectionStatusConnected} {mpd.GetVersion()}.";
+                ConnectButton.IsEnabled = false;
+            }
+            else
+            {
+                ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusOffline;
+                ConnectButton.IsEnabled = true;
+            }
+        }
+
+        private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
+        {
+            Regex regex = new Regex("[^0-9]+");
+            e.Handled = regex.IsMatch(e.Text);
+        }
+
+        private void MpdConnectTextBox(object sender, TextChangedEventArgs e)
+        {
+            TextBox textBox = (TextBox)sender;
+
+            if (textBox.Text == Properties.Settings.Default.mpd_host)
+                ConnectButton.IsEnabled = false;
+            else
+                ConnectButton.IsEnabled = true;
+
+            e.Handled = true;
+        }
+
+        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            ProcessStartInfo psi = new(e.Uri.AbsoluteUri);
+            psi.UseShellExecute = true;
+            Process.Start(psi);
+            e.Handled = true;
+        }
+
+        private void MPDConnect_Clicked(object sender, RoutedEventArgs e)
+        {
+            if (!ConnectButton.IsEnabled)
+                return;
+
+            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(); });
+        }
+
+        private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)
+        {
+            SnapcastPath.Text = (string)Application.Current.FindResource("snapcastPath");
+            SnapcastPort.Text = (string)Application.Current.FindResource("snapcastPort");
+        }
+
+        public void UpdateStats()
+        {
+            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            StatSong.Text = mpd.GetStats().Songs.ToString();
+            StatAlbum.Text = mpd.GetStats().Albums.ToString();
+            StatArtist.Text = mpd.GetStats().Artists.ToString();
+            StatTotalPlaytime.Text = mpd.GetStats().TotalPlaytime.ToString();
+            StatUptime.Text = mpd.GetStats().Uptime.ToString();
+            StatTotalTimePlayed.Text = mpd.GetStats().TotalTimePlayed.ToString();
+            StatDatabaseUpdate.Text = mpd.GetStats().DatabaseUpdate.ToString();
+        }
+
+        private void ConnectHandler(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return)
+                MPDConnect_Clicked(null, null);
+        }
+
+        private void Window_Closing(object sender, CancelEventArgs e)
+        {
+            e.Cancel = true;
+            SaveSettings();
+            WindowState = WindowState.Minimized;
+            Hide();
+        }
+
+        public void InitHwnd()
+        {
+            WindowInteropHelper helper = new(this);
+            helper.EnsureHandle();
+        }
+
+        public void SaveSettings()
+        {
+            Properties.Settings.Default.mpd_host = MpdHost.Text;
+            Properties.Settings.Default.mpd_port = int.Parse(MpdPort.Text, CultureInfo.InvariantCulture);
+            Properties.Settings.Default.mpd_password = MpdPassword.Password;
+            Properties.Settings.Default.snapcast_startup = (bool)SnapcastStartup.IsChecked;
+            Properties.Settings.Default.snapcast_window = (bool)SnapcastWindow.IsChecked;
+            Properties.Settings.Default.snapcast_path = SnapcastPath.Text;
+            Properties.Settings.Default.snapcast_port = int.Parse(SnapcastPort.Text, CultureInfo.InvariantCulture);
+            Properties.Settings.Default.volume_offset = int.Parse(VolumeOffset.Text, CultureInfo.InvariantCulture);
+
+            Properties.Settings.Default.nextTrack_mod = GetMod(Shortcut_NextTrack);
+            Properties.Settings.Default.nextTrack_vk = GetVk(Shortcut_NextTrack);
+            Properties.Settings.Default.previousTrack_mod = GetMod(Shortcut_PreviousTrack);
+            Properties.Settings.Default.previousTrack_vk = GetVk(Shortcut_PreviousTrack);
+            Properties.Settings.Default.playPause_mod = GetMod(Shortcut_PlayPause);
+            Properties.Settings.Default.playPause_vk = GetVk(Shortcut_PlayPause);
+            Properties.Settings.Default.volumeUp_mod = GetMod(Shortcut_VolumeUp);
+            Properties.Settings.Default.volumeUp_vk = GetVk(Shortcut_VolumeUp);
+            Properties.Settings.Default.volumeDown_mod = GetMod(Shortcut_VolumeDown);
+            Properties.Settings.Default.volumeDown_vk = GetVk(Shortcut_VolumeDown);
+            Properties.Settings.Default.volumeMute_mod = GetMod(Shortcut_VolumeMute);
+            Properties.Settings.Default.volumeMute_vk = GetVk(Shortcut_VolumeMute);
+            Properties.Settings.Default.showWindow_mod = GetMod(Shortcut_ShowWindow);
+            Properties.Settings.Default.showWindow_vk = GetVk(Shortcut_ShowWindow);
+
+            Properties.Settings.Default.Save();
+        }
+
+
+        // Hotkeys
+
         void InitializeShortcuts()
         {
             System.Collections.Generic.IEnumerable<StackPanel> stackPanelCollection = RebindKeyWrapper.Children.OfType<StackPanel>();
@@ -108,55 +237,6 @@ namespace unison
             }
         }
 
-        private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
-        {
-            Regex regex = new Regex("[^0-9]+");
-            e.Handled = regex.IsMatch(e.Text);
-        }
-
-        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
-        {
-            ProcessStartInfo psi = new(e.Uri.AbsoluteUri);
-            psi.UseShellExecute = true;
-            Process.Start(psi);
-            e.Handled = true;
-        }
-
-        public void UpdateConnectionStatus()
-        {
-            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            if (mpd.IsConnected())
-                ConnectionStatus.Text = $"{unison.Resources.Resources.Settings_ConnectionStatusConnected} {mpd.GetVersion()}.";
-            else
-                ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusOffline;
-        }
-
-        private void MPDConnect_Clicked(object sender, RoutedEventArgs e)
-        {
-            SaveSettings();
-            ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusConnecting;
-            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            mpd.Connect();
-        }
-
-        private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)
-        {
-            SnapcastPath.Text = (string)Application.Current.FindResource("snapcastPath");
-            SnapcastPort.Text = (string)Application.Current.FindResource("snapcastPort");
-        }
-
-        public void UpdateStats()
-        {
-            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            StatSong.Text = mpd.GetStats().Songs.ToString();
-            StatAlbum.Text = mpd.GetStats().Albums.ToString();
-            StatArtist.Text = mpd.GetStats().Artists.ToString();
-            StatTotalPlaytime.Text = mpd.GetStats().TotalPlaytime.ToString();
-            StatUptime.Text = mpd.GetStats().Uptime.ToString();
-            StatTotalTimePlayed.Text = mpd.GetStats().TotalTimePlayed.ToString();
-            StatDatabaseUpdate.Text = mpd.GetStats().DatabaseUpdate.ToString();
-        }
-
         private void HotkeyChanged()
         {
             _hotkeys.RemoveHotkeys();
@@ -307,54 +387,5 @@ namespace unison
             TextBlock textBlock = (TextBlock)button.Content;
             return (uint)(HotkeyHandler.VK)System.Enum.Parse(typeof(HotkeyHandler.VK), textBlock.Text, true);
         }
-
-        public void SaveSettings()
-        {
-            Properties.Settings.Default.mpd_host = MpdHost.Text;
-            Properties.Settings.Default.mpd_port = int.Parse(MpdPort.Text, CultureInfo.InvariantCulture);
-            //Properties.Settings.Default.mpd_password = MpdPassword.Text;
-            Properties.Settings.Default.snapcast_startup = (bool)SnapcastStartup.IsChecked;
-            Properties.Settings.Default.snapcast_window = (bool)SnapcastWindow.IsChecked;
-            Properties.Settings.Default.snapcast_path = SnapcastPath.Text;
-            Properties.Settings.Default.snapcast_port = int.Parse(SnapcastPort.Text, CultureInfo.InvariantCulture);
-            Properties.Settings.Default.volume_offset = int.Parse(VolumeOffset.Text, CultureInfo.InvariantCulture);
-        
-            Properties.Settings.Default.nextTrack_mod = GetMod(Shortcut_NextTrack);
-            Properties.Settings.Default.nextTrack_vk = GetVk(Shortcut_NextTrack);
-            Properties.Settings.Default.previousTrack_mod = GetMod(Shortcut_PreviousTrack);
-            Properties.Settings.Default.previousTrack_vk = GetVk(Shortcut_PreviousTrack);
-            Properties.Settings.Default.playPause_mod = GetMod(Shortcut_PlayPause);
-            Properties.Settings.Default.playPause_vk = GetVk(Shortcut_PlayPause);
-            Properties.Settings.Default.volumeUp_mod = GetMod(Shortcut_VolumeUp);
-            Properties.Settings.Default.volumeUp_vk = GetVk(Shortcut_VolumeUp);
-            Properties.Settings.Default.volumeDown_mod = GetMod(Shortcut_VolumeDown);
-            Properties.Settings.Default.volumeDown_vk = GetVk(Shortcut_VolumeDown);
-            Properties.Settings.Default.volumeMute_mod = GetMod(Shortcut_VolumeMute);
-            Properties.Settings.Default.volumeMute_vk = GetVk(Shortcut_VolumeMute);
-            Properties.Settings.Default.showWindow_mod = GetMod(Shortcut_ShowWindow);
-            Properties.Settings.Default.showWindow_vk = GetVk(Shortcut_ShowWindow);
-
-            Properties.Settings.Default.Save();
-        }
-
-        private void ConnectHandler(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Return)
-                MPDConnect_Clicked(null, null);
-        }
-
-        private void Window_Closing(object sender, CancelEventArgs e)
-        {
-            e.Cancel = true;
-            SaveSettings();
-            WindowState = WindowState.Minimized;
-            Hide();
-        }
-
-        public void InitHwnd()
-        {
-            WindowInteropHelper helper = new(this);
-            helper.EnsureHandle();
-        }
     }
 }

Views/Shuffle.xaml

@@ -0,0 +1,102 @@
+<Window x:Class="unison.Shuffle"
+        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:local="clr-namespace:unison"
+        mc:Ignorable="d"
+        Title="Shuffle" Closing="Window_Closing" SizeToContent="WidthAndHeight" ResizeMode="NoResize">
+
+    <Grid>
+        <StackPanel>
+            <StackPanel HorizontalAlignment="Left" Orientation="Vertical" Margin="5,0,5,5">
+                <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                    <GroupBox.Header>
+                        <TextBlock>
+                            <emoji:EmojiInline Text="🔡"/>
+                            <Run Text="Filter"/>
+                        </TextBlock>
+                    </GroupBox.Header>
+                    <StackPanel Orientation="Vertical" Margin="5,0,5,0">
+                        <StackPanel Orientation="Horizontal">
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="Song" Margin="0,0,0,2"/>
+                                <TextBox x:Name="Song" Width="240" Margin="5,0,0,0"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="Artist" Margin="0,0,0,2"/>
+                                <TextBox x:Name="Artist" Width="240" Margin="5,0,0,0"/>
+                            </StackPanel>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="Album" Margin="0,0,0,2"/>
+                                <TextBox x:Name="Album" Width="240" Margin="5,0,0,0"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="Year" Margin="0,0,0,2"/>
+                                <TextBox x:Name="Year" Width="240" Margin="5,0,0,0"/>
+                            </StackPanel>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="Genre" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="Genre" SelectedIndex="0" Width="240" ScrollViewer.CanContentScroll="False" Margin="5,0,0,0" FocusVisualStyle="{x:Null}"/>
+                            </StackPanel>
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="Directory" Margin="0,0,0,2" TextDecorations="{x:Null}"/>
+                                <ComboBox x:Name="Directory" SelectedIndex="0" Width="240" ScrollViewer.CanContentScroll="False" Margin="5,0,0,0" IsEnabled="True"/>
+                            </StackPanel>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
+                            <Button Content="Reset" Click="Reset_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
+                        </StackPanel>
+                        <StackPanel x:Name="SongFilterPanel" Margin="0,5,0,0" Visibility="Collapsed">
+                            <TextBlock>
+                                <Run Text="Number of songs in filter: "/><Run x:Name="SongFilterNumber" FontWeight="Bold"/>
+                            </TextBlock>
+                        </StackPanel>
+                    </StackPanel>
+                </GroupBox>
+
+                <GroupBox Margin="0,5,0,0" HorizontalAlignment="Stretch">
+                    <GroupBox.Header>
+                        <TextBlock>
+                            <emoji:EmojiInline Text="♾️"/>
+                            <Run Text="Continuous shuffle"/>
+                        </TextBlock>
+                    </GroupBox.Header>
+                    <StackPanel Orientation="Horizontal" Margin="5,8,0,0">
+                        <CheckBox x:Name="ContinuousShuffle" Checked="ContinuousShuffle_Checked" Unchecked="ContinuousShuffle_Checked" FocusVisualStyle="{x:Null}">
+                            <TextBlock Text="Enable continuous shuffle" TextWrapping="Wrap"/>
+                        </CheckBox>
+                    </StackPanel>
+                </GroupBox>
+
+                <GroupBox x:Name="AddToQueueGroup" Margin="0,5,0,0" HorizontalAlignment="Stretch">
+                    <GroupBox.Header>
+                        <TextBlock>
+                            <emoji:EmojiInline Text="➕"/>
+                            <Run Text="Add to queue"/>
+                        </TextBlock>
+                    </GroupBox.Header>
+                    <StackPanel Margin="5,0,0,0">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
+                            <TextBox x:Name="SongNumber" Text="100" Width="35" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                            <TextBlock Text="Number of songs to add" Margin="5,0,0,5"/>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,2,0,0">
+                            <Button Content="Add to queue" Click="AddToQueue_Clicked" Padding="5, 2" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
+                            <TextBlock x:Name="SearchStatus" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed">
+                                <Run Text="Added "/><Run x:Name="NumberAddedSongs"/><Run Text=" songs to the queue..."/>
+                            </TextBlock>
+                        </StackPanel>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Window>

Views/Shuffle.xaml.cs

@@ -0,0 +1,307 @@
+using MpcNET;
+using MpcNET.Commands.Database;
+using MpcNET.Commands.Reflection;
+using MpcNET.Tags;
+using MpcNET.Types;
+using MpcNET.Types.Filters;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace unison
+{
+    public partial class Shuffle : Window
+    {
+        private MPDHandler _mpd;
+        bool _continuous = false;
+        List<string> _songList { get; }
+
+        public Shuffle()
+        {
+            InitializeComponent();
+            _songList = new();
+        }
+
+        private bool IsFilterEmpty()
+        {
+            if (Song.Text.Length == 0 && Artist.Text.Length == 0 && Album.Text.Length == 0 && Year.Text.Length == 0 && Genre.SelectedIndex == 0 && Directory.Text.Length == 0)
+                return true;
+            return false;
+        }
+
+        public bool GetContinuous()
+        {
+            return _continuous;
+        }
+
+        public void AddContinuousSongs()
+        {
+            if (IsFilterEmpty())
+            {
+                // add a completely random song
+                ContinuousShuffle_AddToQueueRandom();
+                return;
+            }
+
+            int AddedSongs = 0;
+            NumberAddedSongs.Text = AddedSongs.ToString();
+            SearchStatus.Visibility = Visibility.Visible;
+
+            HashSet<int> SongIndex = new();
+            while (SongIndex.Count < 2)
+            {
+                int MaxIndex = new Random().Next(0, _songList.Count - 1);
+                SongIndex.Add(MaxIndex);
+            }
+
+            foreach (int index in SongIndex)
+                _mpd.AddSong(_songList[index]);
+
+            SearchStatus.Visibility = Visibility.Collapsed;
+        }
+
+        public async void ListGenre()
+        {
+            if (Genre.Items.Count == 0)
+            {
+                _mpd = (MPDHandler)Application.Current.Properties["mpd"];
+                List<string> Response = await _mpd.SafelySendCommandAsync(new ListCommand(MpdTags.Genre, null, null));
+
+                if (Response.Count > 0)
+                {
+                    Genre.Items.Add("");
+                    foreach (var genre in Response)
+                        Genre.Items.Add(genre);
+                }
+            }
+        }
+
+        public async void ListFolder()
+        {
+            if (Directory.Items.Count == 0)
+            {
+                _mpd = (MPDHandler)Application.Current.Properties["mpd"];
+                IEnumerable<IMpdFilePath> Response = await _mpd.SafelySendCommandAsync(new LsInfoCommand(""));
+
+                if (Response != null)
+                {
+                    Directory.Items.Add("");
+                    foreach (var directory in Response)
+                        Directory.Items.Add(directory.Name);
+                }
+            }
+        }
+
+        private void Window_Closing(object sender, CancelEventArgs e)
+        {
+            e.Cancel = true;
+            WindowState = WindowState.Minimized;
+            Hide();
+        }
+
+        public void InitHwnd()
+        {
+            WindowInteropHelper helper = new(this);
+            helper.EnsureHandle();
+        }
+
+        private void Reset_Clicked(object sender, RoutedEventArgs e)
+        {
+            Song.Text = "";
+            Artist.Text = "";
+            Album.Text = "";
+            Year.Text = "";
+            Genre.SelectedIndex = 0;
+            Directory.SelectedIndex = 0;
+        }
+
+        private async void ContinuousShuffle_Checked(object sender, RoutedEventArgs e)
+        {
+            if (ContinuousShuffle.IsChecked == true)
+            {
+                AddToQueueGroup.IsEnabled = false;
+                _continuous = true;
+                _songList.Clear();
+                if (!IsFilterEmpty())
+                {
+                    /*await*/
+                    GetSongsFromFilter();
+                }
+            }
+            else
+            {
+                AddToQueueGroup.IsEnabled = true;
+                _continuous = false;
+            }
+        }
+
+        private async void ContinuousShuffle_AddToQueueRandom()
+        {
+            for (int i = 0; i < 2; i++)
+            {
+                // generate random number
+                int song = new Random().Next(0, _mpd.GetStats().Songs - 1);
+
+                // query random song
+                CommandList commandList = new CommandList(new IMpcCommand<object>[] { new SearchCommand(MpdTags.Title, "", song, song + 1) });
+                string Response = await _mpd.SafelySendCommandAsync(commandList);
+
+                await Task.Delay(1);
+                if (Response.Length > 0)
+                {
+                    // parse song and add it to queue
+                    int start = Response.IndexOf("[file, ");
+                    int end = Response.IndexOf("],");
+                    string filePath = Response.Substring(start + 7, end - (start + 7));
+                    _mpd.AddSong(filePath);
+                }
+            }
+
+            SearchStatus.Visibility = Visibility.Collapsed;
+        }
+
+        private async void AddToQueueRandom()
+        {
+            int AddedSongs = 0;
+            NumberAddedSongs.Text = AddedSongs.ToString();
+            SearchStatus.Visibility = Visibility.Visible;
+
+            for (int i = 0; i < int.Parse(SongNumber.Text); i++)
+            {
+                // generate random number
+                int song = new Random().Next(0, _mpd.GetStats().Songs - 1);
+
+                // query random song
+                CommandList commandList = new CommandList(new IMpcCommand<object>[] { new SearchCommand(MpdTags.Title, "", song, song + 1) });
+                string Response = await _mpd.SafelySendCommandAsync(commandList);
+
+                await Task.Delay(1);
+                if (Response.Length > 0)
+                {
+                    // parse song and add it to queue
+                    int start = Response.IndexOf("[file, ");
+                    int end = Response.IndexOf("],");
+                    string filePath = Response.Substring(start + 7, end - (start + 7));
+                    _mpd.AddSong(filePath);
+
+                    AddedSongs++;
+                    NumberAddedSongs.Text = AddedSongs.ToString();
+                }
+            }
+
+            SearchStatus.Visibility = Visibility.Collapsed;
+        }
+
+        private async Task GetSongsFromFilter()
+        {
+            _songList.Clear();
+            SongFilterPanel.Visibility = Visibility.Visible;
+
+            int song = _mpd.GetStats().Songs;
+
+            List<IFilter> filtersA = new();
+            if (Song.Text != "")
+                filtersA.Add(new FilterTag(MpdTags.Title, Song.Text, FilterOperator.Contains));
+            if (Artist.Text != "")
+                filtersA.Add(new FilterTag(MpdTags.Artist, Artist.Text, FilterOperator.Contains));
+            if (Album.Text != "")
+                filtersA.Add(new FilterTag(MpdTags.Album, Album.Text, FilterOperator.Contains));
+            if (Year.Text != "")
+                filtersA.Add(new FilterTag(MpdTags.Date, Year.Text, FilterOperator.Contains));
+            if (Genre.Text != "")
+                filtersA.Add(new FilterTag(MpdTags.Genre, Genre.Text, FilterOperator.Contains));
+            if (Directory.Text != "")
+                filtersA.Add(new FilterBase(Directory.Text, FilterOperator.None));
+
+            Debug.WriteLine(Directory.Text);
+
+            CommandList commandList = new CommandList(new IMpcCommand<object>[] { new SearchCommand(filtersA, 0, song + 1) });
+            string Response = await _mpd.SafelySendCommandAsync(commandList);
+
+            Debug.WriteLine(Response);
+
+            // create a list of the file url
+            string[] value = Response.Split(", [file, ");
+
+            // there are no song in this filter
+            if (value[0] == "")
+            {
+                SongFilterNumber.Text = _songList.Count.ToString();
+                return;
+            }
+
+            foreach (string file in value)
+            {
+                int start = 0;
+                int end = file.IndexOf("],");
+                string filePath = file.Substring(start, end - start);
+
+                Debug.WriteLine(filePath);
+                _songList.Add(filePath);
+
+                SongFilterNumber.Text = _songList.Count.ToString();
+            }
+
+            // remove characters from first file
+            _songList[0] = _songList[0].Substring(7, _songList[0].Length - 7);
+
+            SongFilterPanel.Visibility = Visibility.Visible;
+            SongFilterNumber.Text = _songList.Count.ToString();
+        }
+
+        private async void AddToQueueFilter()
+        {
+            await GetSongsFromFilter();
+
+            int AddedSongs = 0;
+            NumberAddedSongs.Text = AddedSongs.ToString();
+            SearchStatus.Visibility = Visibility.Visible;
+
+            // more requested songs than available => add everything
+            if (int.Parse(SongNumber.Text) > _songList.Count)
+            {
+                foreach (string path in _songList)
+                {
+                    await Task.Delay(1);
+                    _mpd.AddSong(path);
+
+                    AddedSongs++;
+                    NumberAddedSongs.Text = AddedSongs.ToString();
+                }
+            }
+            // more available songs than requested =>
+            // we add unique indexes until we reach the requested amount
+            else
+            {
+                HashSet<int> SongIndex = new();
+                while (SongIndex.Count < int.Parse(SongNumber.Text))
+                {
+                    int MaxIndex = new Random().Next(0, _songList.Count - 1);
+                    SongIndex.Add(MaxIndex);
+                }
+
+                foreach (int index in SongIndex)
+                    _mpd.AddSong(_songList[index]);
+            }
+
+            SearchStatus.Visibility = Visibility.Collapsed;
+
+        }
+
+        private void AddToQueue_Clicked(object sender, RoutedEventArgs e)
+        {
+            _mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            if (_mpd.GetStats() == null)
+                return;
+
+            if (IsFilterEmpty())
+                AddToQueueRandom();
+            else
+                AddToQueueFilter();
+        }
+    }
+}

Views/Systray.xaml

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

Views/SystrayViewModel.cs

@@ -71,6 +71,18 @@ namespace unison
             }
         }
 
+        public ICommand Shuffle
+        {
+            get
+            {
+                return new DelegateCommand
+                {
+                    CommandAction = () => ((MainWindow)Application.Current.MainWindow).Shuffle_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.2</Version>
+    <Version>1.3</Version>
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -47,7 +47,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>
@@ -64,6 +64,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Resources\Resources.es-ES.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\Resources.fr-FR.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
     </EmbeddedResource>