keb/unison
1
0
Fork 0
Code Releases 6 Activity

MPD password support

Browse Source
This commit is contained in:
Théo Marchal 2022-04-13 00:43:04 +02:00
parent f95b884d16
commit 519fe4968e
7 changed files with 73 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Handlers/MPDHandler.cs
View File

@ -55,7 +55,6 @@ namespace unison
bool _isUpdatingSong = false;
public IPAddress _ipAddress;
bool _invalidIp = false;
private event EventHandler ConnectionChanged;
private event EventHandler StatusChanged;
@ -96,7 +95,7 @@ namespace unison
void OnConnectionChanged(object sender, EventArgs e)
{
if (!_connected && !_invalidIp)
if (!_connected)
_retryTimer.Start();
else
_retryTimer.Stop();
@ -195,14 +194,12 @@ namespace unison
catch (MpcNET.Exceptions.MpcConnectException e)
{
_connected = false;
_invalidIp = true;
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;
@ -251,7 +248,7 @@ namespace unison
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)
@ -259,7 +256,7 @@ namespace unison
string mpdError = result.Response?.Result?.MpdError;
Trace.WriteLine(mpdError);
}
}*/
}
return connection;
}

8
README.md
View File

@ -33,13 +33,7 @@ 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.

33
Resources/Resources.Designer.cs generated
View File

@ -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>

17
Resources/Resources.fr-FR.resx
View File

@ -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>

15
Resources/Resources.resx
View File

@ -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>

18
Views/Settings.xaml
View File

@ -41,12 +41,18 @@
<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>
@ -205,7 +211,7 @@
</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"/>

4
Views/Settings.xaml.cs
View File

@ -53,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;
@ -163,7 +163,7 @@ namespace unison
{
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.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;