keb/unison
1
0
Fork 0
Code Releases 7 Activity

Compare commits

base: keb:1.4
Branches Tags
keb:main keb:interface-rework keb:shuffle
keb:1.5 keb:1.4 keb:v1.3.1 keb:v1.3 keb:v1.2 keb:v1.1 keb:v1.0
..
compare: keb:3b55c79d305e333b0d5a635df4d26cbffc331bbd
Branches Tags
keb:main keb:interface-rework keb:shuffle
keb:1.5 keb:1.4 keb:v1.3.1 keb:v1.3 keb:v1.2 keb:v1.1 keb:v1.0

14 Commits
1.4 ... 3b55c79d30

Author SHA1 Message Date
Théo Marchal
3b55c79d30 Merge branch 'main' into shuffle 2022-11-03 22:20:37 +01:00
Théo Marchal
5142477b5e GetPlaylist more cleverly 2022-04-19 01:17:48 +02:00
Théo Marchal
a6b7ad9c1e Merge branch 'main' into shuffle 2022-04-19 00:23:59 +02:00
Théo Marchal
1d3515a39d Cleaned things for shuffle, but still has some deadlocks and crashes 2022-04-18 01:02:26 +02:00
Théo Marchal
792437b839 Update readme and screenshots 2022-04-17 16:04:28 +02:00
Théo Marchal
5bfa7d3b5b Basic shuffle features, must fix deadlocks 2022-04-17 16:02:09 +02:00
Théo Marchal
c5e8534af7 Merge branch 'main' into shuffle 2022-04-14 01:08:49 +02:00
Théo Marchal
5d6e3b6d1e Update MpcNET from 1.3 to 1.4 to use filters 2022-04-14 01:06:33 +02:00
Théo Marchal
6ad4d9c813 Merge branch 'main' into shuffle 2022-04-07 00:59:00 +02:00
Théo Marchal
c93a9a326e Better working continuous shuffle 2021-10-07 22:14:09 +02:00
Théo Marchal
c055c59de7 Handle no response when querying stats 2021-10-07 22:13:18 +02:00
Théo Marchal
4c71d6a6e0 Rough working shuffle system 2021-10-06 22:54:55 +02:00
Théo Marchal
3685c369b4 Merge branch 'main' into shuffle 2021-10-05 19:20:00 +02:00
Théo Marchal
e0d640532c Shuffle window (only visual) 2021-10-05 14:23:23 +02:00
35 changed files with 521 additions and 1808 deletions
Expand all files Collapse all files

84
App.config
View File

@ -1,84 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="unison.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<userSettings>
<unison.Properties.Settings>
<setting name="mpd_host" serializeAs="String">
<value>192.168.0.1</value>
</setting>
<setting name="mpd_port" serializeAs="String">
<value>6600</value>
</setting>
<setting name="mpd_password" serializeAs="String">
<value />
</setting>
<setting name="snapcast_startup" serializeAs="String">
<value>False</value>
</setting>
<setting name="snapcast_window" serializeAs="String">
<value>False</value>
</setting>
<setting name="snapcast_path" serializeAs="String">
<value>snapclient_0.26.0-1_win64</value>
</setting>
<setting name="snapcast_port" serializeAs="String">
<value>1704</value>
</setting>
<setting name="volume_offset" serializeAs="String">
<value>5</value>
</setting>
<setting name="nextTrack_mod" serializeAs="String">
<value>2</value>
</setting>
<setting name="nextTrack_vk" serializeAs="String">
<value>176</value>
</setting>
<setting name="previousTrack_mod" serializeAs="String">
<value>2</value>
</setting>
<setting name="previousTrack_vk" serializeAs="String">
<value>177</value>
</setting>
<setting name="playPause_mod" serializeAs="String">
<value>2</value>
</setting>
<setting name="playPause_vk" serializeAs="String">
<value>179</value>
</setting>
<setting name="volumeUp_mod" serializeAs="String">
<value>2</value>
</setting>
<setting name="volumeUp_vk" serializeAs="String">
<value>175</value>
</setting>
<setting name="volumeDown_mod" serializeAs="String">
<value>2</value>
</setting>
<setting name="volumeDown_vk" serializeAs="String">
<value>174</value>
</setting>
<setting name="volumeMute_mod" serializeAs="String">
<value>2</value>
</setting>
<setting name="volumeMute_vk" serializeAs="String">
<value>173</value>
</setting>
<setting name="showWindow_mod" serializeAs="String">
<value>3</value>
</setting>
<setting name="showWindow_vk" serializeAs="String">
<value>13</value>
</setting>
<setting name="MainWindowTop" serializeAs="String">
<value>100</value>
</setting>
<setting name="MainWindowLeft" serializeAs="String">
<value>100</value>
</setting>
</unison.Properties.Settings>
</userSettings>
</configuration>

15
App.xaml.cs
View File

@ -1,6 +1,6 @@
using System.Windows;
using System.Globalization;
using System.Windows;
using Hardcodet.Wpf.TaskbarNotification;
using unison.Handlers;
namespace unison
{
@ -11,15 +11,13 @@ namespace unison
private SnapcastHandler _snapcast;
private ShuffleHandler _shuffle;
private MPDHandler _mpd;
private UpdateHandler _updater;
protected override void OnStartup(StartupEventArgs e)
{
unison.Resources.Resources.Culture = System.Globalization.CultureInfo.CurrentCulture;
//debug language
//unison.Resources.Resources.Culture = System.Globalization.CultureInfo.GetCultureInfo("fr-FR");
//unison.Resources.Resources.Culture = System.Globalization.CultureInfo.GetCultureInfo("es-ES");
//unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("fr-FR");
//unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("es-ES");
base.OnStartup(e);
@ -35,9 +33,6 @@ namespace unison
_shuffle = new ShuffleHandler();
Current.Properties["shuffle"] = _shuffle;
_updater = new UpdateHandler();
Current.Properties["updater"] = _updater;
Current.MainWindow = new MainWindow();
_systray = (TaskbarIcon)FindResource("SystrayTaskbar");

14
CHANGELOG.md
View File

@ -1,19 +1,5 @@
# Changelog
## v1.4
*Released: 09/12/2022*
* New feature: shuffle system
* New feature: (un)installer script
* New feature: update system
* New feature: update MPD database button
* Restore window position when relaunching the app
* New settings organisation
* Update Emoji.WPF from 0.3.3 to 0.3.4
* Fix: cover images are displaying in all cases
* Fix: querying a large list of radios could hang the app
## v1.3.1
*Released: 03/11/2022*

113
Handlers/MPDHandler.cs
View File

@ -48,13 +48,13 @@ namespace unison
private MpdStatus _currentStatus;
private IMpdFile _currentSong;
private BitmapImage _cover;
private readonly Statistics _stats;
private BitmapFrame _cover;
public Statistics _stats;
private readonly System.Timers.Timer _elapsedTimer;
private readonly DispatcherTimer _retryTimer;
private DispatcherTimer _retryTimer;
private bool _isUpdatingStatus = false;
private bool _isUpdatingSong = false;
bool _isUpdatingStatus = false;
bool _isUpdatingSong = false;
public IPAddress _ipAddress;
@ -67,11 +67,9 @@ namespace unison
private MpcConnection _commandConnection;
private IPEndPoint _mpdEndpoint;
public CancellationTokenSource _cancelCommand;
private CancellationTokenSource _cancelCommand;
private CancellationTokenSource _cancelConnect;
private bool UpdateStarted = false;
public MPDHandler()
{
Startup(null, null);
@ -156,7 +154,7 @@ namespace unison
if (_commandConnection == null || !IsConnected())
{
Trace.WriteLine("[SafelySendCommandAsync] no command connection");
return default;
return default(T);
}
try
@ -178,7 +176,7 @@ namespace unison
Trace.WriteLine($"Sending {command.GetType().Name} failed: {e.Message}");
}
return default;
return default(T);
}
public async void Startup(object sender, EventArgs e)
@ -340,15 +338,12 @@ namespace unison
{
try
{
if (subsystems.Contains("player") || subsystems.Contains("mixer") || subsystems.Contains("output") || subsystems.Contains("options") || subsystems.Contains("update"))
if (subsystems.Contains("player") || subsystems.Contains("mixer") || subsystems.Contains("output") || subsystems.Contains("options"))
{
await UpdateStatusAsync();
if (subsystems.Contains("player"))
await UpdateSongAsync();
if (subsystems.Contains("update"))
UpdateDatabaseSync();
}
}
catch (Exception e)
@ -358,30 +353,6 @@ namespace unison
}
}
private void UpdateDatabaseSync()
{
if (!UpdateStarted)
{
Application.Current.Dispatcher.Invoke(() =>
{
MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
MainWin.GetSettings().MPDDatabaseUpdate_Start();
});
UpdateStarted = true;
}
else
{
Application.Current.Dispatcher.Invoke(() =>
{
MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
MainWin.GetSettings().MPDDatabaseUpdate_Stop();
MainWin.UpdateStats();
});
UpdateStarted = false;
}
}
private async Task UpdateStatusAsync()
{
if (_connection == null || _isUpdatingStatus)
@ -436,8 +407,6 @@ namespace unison
}
_isUpdatingSong = false;
Trace.WriteLine("Updated song");
}
private async void GetAlbumCover(string path, CancellationToken token)
@ -507,12 +476,14 @@ namespace unison
else
{
using MemoryStream stream = new MemoryStream(data.ToArray());
_cover = new BitmapImage();
_cover.BeginInit();
_cover.CacheOption = BitmapCacheOption.OnLoad;
_cover.StreamSource = stream;
_cover.EndInit();
_cover.Freeze();
try
{
_cover = BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
}
catch
{
_cover = null;
}
}
UpdateCover();
}
@ -554,7 +525,7 @@ namespace unison
public IMpdFile GetCurrentSong() => _currentSong;
public MpdStatus GetStatus() => _currentStatus;
public BitmapImage GetCover() => _cover;
public BitmapFrame GetCover() => _cover;
public string GetVersion() => _version;
public Statistics GetStats() => _stats;
public double GetCurrentTime() => _currentTime;
@ -567,13 +538,13 @@ namespace unison
public void Prev()
{
if (CanPrevNext && !_isUpdatingSong)
if (CanPrevNext)
SendCommand(new PreviousCommand());
}
public void Next()
{
if (CanPrevNext && !_isUpdatingSong)
if (CanPrevNext)
SendCommand(new NextCommand());
}
@ -639,36 +610,7 @@ namespace unison
{
if (_Playlist == null)
return 0;
return _Playlist.ToArray().Length;
}
public void UpdateDB() => SendCommand(new UpdateCommand());
private static string FormatTime(TimeSpan time)
{
string FormattedTime = "";
if (time.Days == 1)
FormattedTime += $"{time.Days} {Resources.Resources.Day}, ";
else if (time.Days > 1)
FormattedTime += $"{time.Days} {Resources.Resources.Days}, ";
if (time.Hours == 1)
FormattedTime += $"{time.Hours} {Resources.Resources.Hour}, ";
else
FormattedTime += $"{time.Hours} {Resources.Resources.Hours}, ";
if (time.Minutes == 1)
FormattedTime += $"{time.Minutes} {Resources.Resources.Minute}, ";
else
FormattedTime += $"{time.Minutes} {Resources.Resources.Minutes}, ";
if (time.Seconds == 1)
FormattedTime += $"{time.Seconds} {Resources.Resources.Second}";
else
FormattedTime += $"{time.Seconds} {Resources.Resources.Seconds}";
return FormattedTime;
return _Playlist.ToArray().Count();
}
public async void QueryStats()
@ -681,13 +623,16 @@ namespace unison
_stats.Albums = int.Parse(Response["albums"]);
_stats.Artists = int.Parse(Response["artists"]);
_stats.Uptime = FormatTime(TimeSpan.FromSeconds(int.Parse(Response["uptime"])));
_stats.TotalPlaytime = FormatTime(TimeSpan.FromSeconds(int.Parse(Response["db_playtime"])));
_stats.TotalTimePlayed = FormatTime(TimeSpan.FromSeconds(int.Parse(Response["playtime"])));
TimeSpan time;
time = TimeSpan.FromSeconds(int.Parse(Response["uptime"]));
_stats.Uptime = time.ToString(@"dd\:hh\:mm\:ss");
time = TimeSpan.FromSeconds(int.Parse(Response["db_playtime"]));
_stats.TotalPlaytime = time.ToString(@"dd\:hh\:mm\:ss");
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();
string dayOfWeek = Resources.Resources.Culture.DateTimeFormat.GetDayName(date.DayOfWeek);
_stats.DatabaseUpdate = dayOfWeek + " " + date.ToString("dd/MM/yyyy @ HH:mm");
_stats.DatabaseUpdate = date.ToString("dd/MM/yyyy @ HH:mm");
}
}
}

81
Handlers/RadioHandler.cs
View File

@ -1,81 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using RadioBrowser;
using RadioBrowser.Models;
namespace unison.Handlers
{
public class CountryListItem
{
public uint Count { get; set; }
public string Name { get; set; }
public override string ToString()
{
if (Name == "")
return "None";
return $"{Name} ({Count})";
}
}
public class StationListItem
{
public string Name { get; set; }
public string Codec { get; set; }
public string Tags { get; set; }
public int Bitrate { get; set; }
public Uri Url { get; set; }
private string _country;
public string Country
{
get
{
if (_country.Length == 0)
return "🏴‍☠️";
return string.Concat(_country.ToUpper().Select(x => char.ConvertFromUtf32(x + 0x1F1A5))); // return emoji
}
set
{
_country = value;
}
}
}
internal class RadioHandler
{
private readonly RadioBrowserClient _radioBrowser;
private readonly bool _connected = true;
public bool IsConnected() => _connected;
public RadioHandler()
{
try
{
_radioBrowser = new RadioBrowserClient();
}
catch (Exception e)
{
Trace.WriteLine("Exception while connecting to RadioBrowser: " + e.Message);
return;
}
_connected = true;
}
public async Task<List<NameAndCount>> GetCountries()
{
return await _radioBrowser.Lists.GetCountriesAsync();
}
public async Task<List<StationInfo>> AdvancedSearch(AdvancedSearchOptions options)
{
return await _radioBrowser.Search.AdvancedAsync(options);
}
}
}

140
Handlers/ShuffleHandler.cs
View File

@ -1,110 +1,134 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using MpcNET;
using MpcNET.Commands.Database;
using MpcNET.Commands.Playback;
using MpcNET.Commands.Database;
using MpcNET.Commands.Queue;
using MpcNET.Commands.Reflection;
using MpcNET.Tags;
using MpcNET.Types;
using MpcNET.Types.Filters;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace unison
{
class ShuffleHandler
{
private readonly MPDHandler _mpd;
private MPDHandler _mpd;
public List<string> _songList { get; }
public int AddedSongs = 0;
public List<string> SongList { get; }
public ShuffleHandler()
{
SongList = new();
_songList = new();
_mpd = (MPDHandler)Application.Current.Properties["mpd"];
}
public async Task GetSongsFromFilter(List<IFilter> filter, CancellationToken token)
private bool IsOnMainThread()
{
if (token.IsCancellationRequested)
return;
SongList.Clear();
int song = _mpd.GetStats().Songs;
IEnumerable<IMpdFile> response = await _mpd.SafelySendCommandAsync(new SearchCommand(filter, 0, song + 1));
foreach (IMpdFile file in response)
SongList.Add(file.Path);
return Application.Current.Dispatcher.Thread == System.Threading.Thread.CurrentThread;
}
public async Task AddToQueueRandom(int SongNumber, CancellationToken token)
public async Task GetSongsFromFilter(List<IFilter> filter)
{
if (token.IsCancellationRequested)
return;
Debug.WriteLine("[GetSongsFromFilterBefore] is on main thread => " + IsOnMainThread());
await Task.Run(async() =>
{
Debug.WriteLine("[GetSongsFromFilterAfter] is on main thread => " + IsOnMainThread());
_songList.Clear();
int song = _mpd.GetStats().Songs;
IEnumerable<IMpdFile> response = await _mpd.SafelySendCommandAsync(new SearchCommand(filter, 0, song + 1));
Debug.WriteLine("got response => " + response.Count());
foreach (IMpdFile file in response)
{
_songList.Add(file.Path);
Debug.WriteLine(file.Path);
}
});
}
public async Task AddToQueueRandom(int SongNumber)
{
Debug.WriteLine("Add To Queue Random");
await Task.Run(async () =>
{
int AddedSongs = 0;
var commandList = new CommandList();
int songTotal = _mpd.GetStats().Songs;
Debug.WriteLine("song to add => " + SongNumber);
for (int i = 0; i < SongNumber; i++)
{
int song = new Random().Next(0, songTotal - 1);
commandList.Add(new SearchAddCommand(new FilterTag(MpdTags.Title, "", FilterOperator.Contains), song, song + 1));
AddedSongs++;
// generate random number
int song = new Random().Next(0, _mpd.GetStats().Songs - 1);
Debug.WriteLine("song " + song + " - song total " + _mpd.GetStats().Songs);
IEnumerable<IMpdFile> Response = await _mpd.SafelySendCommandAsync(new SearchCommand(new FilterTag(MpdTags.Title, "", FilterOperator.Contains), song, song + 1));
// play if stopped or unknown state (no queue managing at the moment, so mandatory)
if (i == 0 && (_mpd.GetStatus().State != MpdState.Play && _mpd.GetStatus().State != MpdState.Pause))
commandList.Add(new PlayCommand(0));
}
Debug.WriteLine("got response");
await _mpd.SafelySendCommandAsync(commandList);
}
public async Task AddToQueueFilter(int SongNumber, CancellationToken token)
await Task.Delay(1);
if (Response.Count() > 0)
{
if (token.IsCancellationRequested)
return;
string filePath = Response.First().Path;
_mpd.AddSong(filePath);
Debug.WriteLine("song path => " + filePath);
if (i == 0)
{
if (!_mpd.IsPlaying())
_mpd.Play(0);
}
AddedSongs++;
}
}
});
Debug.WriteLine("Add To Queue Random - finished");
}
public async Task AddToQueueFilter(int SongNumber)
{
Debug.WriteLine("Add To Queue Filter");
await Task.Run(async () =>
{
int AddedSongs = 0;
// more (or equal) requested songs than available => add everything
if (SongNumber >= SongList.Count)
Debug.WriteLine("song to add => " + SongNumber);
// more requested songs than available => add everything
if (SongNumber > _songList.Count)
{
var commandList = new CommandList();
foreach (string path in SongList)
foreach (string path in _songList)
{
commandList.Add(new AddCommand(path));
await Task.Delay(1);
_mpd.AddSong(path);
Debug.WriteLine("song path => " + path);
AddedSongs++;
}
commandList.Add(new PlayCommand(0));
await _mpd.SafelySendCommandAsync(commandList);
}
// more available songs than requested =>
// we add unique indexes until we reach the requested amount
else
{
HashSet<int> SongIndex = new();
Debug.WriteLine("while - before");
while (SongIndex.Count < SongNumber)
{
int MaxIndex = new Random().Next(0, SongList.Count - 1);
int MaxIndex = new Random().Next(0, _songList.Count - 1);
SongIndex.Add(MaxIndex);
}
var commandList = new CommandList();
foreach (int index in SongIndex)
{
commandList.Add(new AddCommand(SongList[index]));
AddedSongs++;
_mpd.AddSong(_songList[index]);
Debug.WriteLine("while - after");
}
});
commandList.Add(new PlayCommand(0));
await _mpd.SafelySendCommandAsync(commandList);
}
Debug.WriteLine("Add To Queue Filter - finished");
}
}
}

24
Handlers/SnapcastHandler.cs
View File

@ -8,7 +8,6 @@ namespace unison
public class SnapcastHandler
{
private readonly Process _snapcast = new();
public bool HasStarted { get; private set; }
public void OnConnectionChanged(object sender, EventArgs e)
@ -21,17 +20,7 @@ namespace unison
}
}
private void HandleExit(object sender, EventArgs e)
{
_snapcast.Kill();
HasStarted = false;
Application.Current.Dispatcher.Invoke(() =>
{
UpdateInterface();
});
}
public static void UpdateInterface()
public void UpdateInterface()
{
TaskbarIcon Systray = (TaskbarIcon)Application.Current.Properties["systray"];
SystrayViewModel DataContext = Systray.DataContext as SystrayViewModel;
@ -53,19 +42,16 @@ namespace unison
_snapcast.StartInfo.FileName = Properties.Settings.Default.snapcast_path + @"\snapclient.exe";
_snapcast.StartInfo.Arguments = $"--host {mpd._ipAddress}";
_snapcast.StartInfo.CreateNoWindow = !Properties.Settings.Default.snapcast_window;
_snapcast.EnableRaisingEvents = true;
_snapcast.Exited += new EventHandler(HandleExit);
try
{
_snapcast.Start();
}
catch (Exception err)
{
MessageBox.Show($"[{Resources.Resources.Snapcast_Popup1}]\n" +
$"{Resources.Resources.Snapcast_Popup2} {err.Message}\n\n" +
$"{Resources.Resources.Snapcast_Popup3} {Properties.Settings.Default.snapcast_path}\n" +
$"{Resources.Resources.Snapcast_Popup4}",
MessageBox.Show($"[{unison.Resources.Resources.Snapcast_Popup1}]\n" +
$"{unison.Resources.Resources.Snapcast_Popup2} {err.Message}\n\n" +
$"{unison.Resources.Resources.Snapcast_Popup3} {Properties.Settings.Default.snapcast_path}\n" +
$"{unison.Resources.Resources.Snapcast_Popup4}",
"unison", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}

57
Handlers/UpdateHandler.cs
View File

@ -1,57 +0,0 @@
using System.Windows;
using AutoUpdaterDotNET;
namespace unison.Handlers
{
internal class UpdateHandler
{
readonly string xmlFile = "https://raw.githubusercontent.com/ZetaKebab/unison/main/Installer/unison.xml";
private bool _UpdateAvailable = false;
private bool _RequestedCheck = false;
public bool UpdateAvailable() => _UpdateAvailable;
public UpdateHandler()
{
AutoUpdater.CheckForUpdateEvent += AutoUpdaterOnCheckForUpdateEvent;
Start();
}
public void Start(bool RequestCheck = false)
{
_RequestedCheck = RequestCheck;
AutoUpdater.Start(xmlFile);
}
private static string CutVersionNumber(string number)
{
return number.Substring(0, number.LastIndexOf("."));
}
private void AutoUpdaterOnCheckForUpdateEvent(UpdateInfoEventArgs args)
{
if (args.Error == null)
{
if (args.IsUpdateAvailable)
{
_UpdateAvailable = true;
string number = CutVersionNumber(args.CurrentVersion);
MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
MainWin.UpdateUpdateStatus(number);
MessageBoxResult Result = MessageBox.Show($"{Resources.Resources.Update_Message1} {number}.\n{Resources.Resources.Update_Message2}",
"unison", MessageBoxButton.YesNo, MessageBoxImage.Information);
if (Result == MessageBoxResult.Yes)
AutoUpdater.DownloadUpdate(args);
}
else
{
if (_RequestedCheck)
MessageBox.Show($"{Resources.Resources.Update_NoUpdate}", "unison", MessageBoxButton.OK, MessageBoxImage.Information);
}
}
}
}
}

43
Installer/unison.iss
View File

@ -1,43 +0,0 @@
#define Name "unison"
#define Version "1.4"
#define Snapcast "snapclient_0.26.0-1_win64"
#define Publisher "Th<54>o Marchal"
#define URL "https://github.com/ZetaKebab/unison"
#define ExeName "unison.exe"
[Setup]
AppName={#Name}
AppVersion={#Version}
AppVerName={#Name} v{#Version}
AppPublisher={#Publisher}
AppPublisherURL={#URL}
AppSupportURL={#URL}
AppUpdatesURL={#URL}
DefaultDirName={autopf}\{#Name}
DisableProgramGroupPage=yes
ArchitecturesInstallIn64BitMode=x64
OutputBaseFilename="{#Name}-v{#Version}-setup"
OutputDir=..\publish\installer
SetupIconFile=..\Resources\icon-full.ico
UninstallDisplayIcon = "{app}\{#Name}.exe"
Compression=lzma
SolidCompression=yes
WizardStyle=modern
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
[Files]
Source: "..\publish\{#ExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\publish\LICENSE"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\publish\unison.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\publish\{#Snapcast}\*"; DestDir: "{app}\{#Snapcast}"; Flags: ignoreversion recursesubdirs createallsubdirs
[Icons]
Name: "{group}\{#Name}"; Filename: "{app}\{#ExeName}"
[Run]
Filename: "{app}\{#Name}.exe"; Parameters: "-frominstaller"; Flags: nowait postinstall skipifsilent

7
Installer/unison.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.3.1.0</version>
<url>https://github.com/ZetaKebab/unison/releases/download/v1.3.1/unison-v1.3.1.zip</url>
<changelog>https://raw.githubusercontent.com/ZetaKebab/unison/main/CHANGELOG.md</changelog>
<mandatory>false</mandatory>
</item>

26
Properties/Settings.Designer.cs generated
View File

@ -12,7 +12,7 @@ namespace unison.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@ -286,29 +286,5 @@ namespace unison.Properties {
this["showWindow_vk"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("100")]
public double MainWindowTop {
get {
return ((double)(this["MainWindowTop"]));
}
set {
this["MainWindowTop"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("100")]
public double MainWindowLeft {
get {
return ((double)(this["MainWindowLeft"]));
}
set {
this["MainWindowLeft"] = value;
}
}
}
}

6
Properties/Settings.settings
View File

@ -68,11 +68,5 @@
<Setting Name="showWindow_vk" Type="System.UInt32" Scope="User">
<Value Profile="(Default)">13</Value>
</Setting>
<Setting Name="MainWindowTop" Type="System.Double" Scope="User">
<Value Profile="(Default)">100</Value>
</Setting>
<Setting Name="MainWindowLeft" Type="System.Double" Scope="User">
<Value Profile="(Default)">100</Value>
</Setting>
</Settings>
</SettingsFile>

30
README.md
View File

@ -1,13 +1,14 @@
# unison
![Main window](Screenshots/screen1.png)
![Main window](Screenshots/screen-mainwindow.png)
**unison** is a very simple [Music Player Daemon (MPD)](https://www.musicpd.org/) daemon client with the following goals:
* lightweight window that can be toggled with shortcuts
* music control through rebindable shortcuts
* [Snapcast](https://github.com/badaix/snapcast) integration
* Radio stations
* shuffle panel
* [Snapcast](https://mjaggard.github.io/snapcast/) integration
* radio stations
## Features
@ -15,13 +16,25 @@
By default, unison works as a daemon in the taskbar system tray. You can display the main window when needed at any time with a shortcut.
![Systray](Screenshots/screen2.png)
![Systray](Screenshots/screen-systray.png)
### Shortcuts
You can control your music at anytime with the shortcuts. They are usable system-wide, even if the window is not visible. They are of course fully rebindable.
![Settings => shortcuts](Screenshots/screen3.png)
![Settings => shortcuts](Screenshots/screen-shortcuts.png)
### Shuffle panel
One of unison's main feature is a complete shuffle system based on criterias, aka a smart playlist.
You have two options:
* **Add to queue** allows you to add a defined number of songs to the queue.
* **Continuous shuffle** allows you, as long as the program is running, to automatically add songs to the queue.
Each of these options work with filters, but if none are selected, it is based on the entire library.
![Shuffle panel](Screenshots/screen-shuffle.png)
### Snapcast
@ -31,12 +44,13 @@ Embedding a Snapcast client allows to listen to music on multiple devices. For e
Through [Radio-Browser](https://www.radio-browser.info), a community database, you can play radio streams directly from unison. There are more than 28,000 stations recorded on this service, so it is a nice way to discover new music and cultures.
![Radio stations](Screenshots/screen4.png)
![Radio stations](Screenshots/screen-radio.png)
## 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.
* Playlist, queue and library management
* More options for the shuffle panel
* Dark mode
## Translations

436
Resources/Resources.Designer.cs generated
View File

@ -19,7 +19,7 @@ namespace unison.Resources {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@ -60,33 +60,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Database.
/// </summary>
public static string Database {
get {
return ResourceManager.GetString("Database", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to day.
/// </summary>
public static string Day {
get {
return ResourceManager.GetString("Day", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to days.
/// </summary>
public static string Days {
get {
return ResourceManager.GetString("Days", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Exit.
/// </summary>
@ -96,123 +69,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Album.
/// </summary>
public static string FilterType_Album {
get {
return ResourceManager.GetString("FilterType_Album", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Artist.
/// </summary>
public static string FilterType_Artist {
get {
return ResourceManager.GetString("FilterType_Artist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Directory.
/// </summary>
public static string FilterType_Directory {
get {
return ResourceManager.GetString("FilterType_Directory", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Genre.
/// </summary>
public static string FilterType_Genre {
get {
return ResourceManager.GetString("FilterType_Genre", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Song.
/// </summary>
public static string FilterType_Song {
get {
return ResourceManager.GetString("FilterType_Song", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Year.
/// </summary>
public static string FilterType_Year {
get {
return ResourceManager.GetString("FilterType_Year", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to hour.
/// </summary>
public static string Hour {
get {
return ResourceManager.GetString("Hour", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to hours.
/// </summary>
public static string Hours {
get {
return ResourceManager.GetString("Hours", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to minute.
/// </summary>
public static string Minute {
get {
return ResourceManager.GetString("Minute", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to minutes.
/// </summary>
public static string Minutes {
get {
return ResourceManager.GetString("Minutes", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to contains.
/// </summary>
public static string Operator_Contains {
get {
return ResourceManager.GetString("Operator_Contains", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to is.
/// </summary>
public static string Operator_Is {
get {
return ResourceManager.GetString("Operator_Is", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to is not.
/// </summary>
public static string Operator_IsNot {
get {
return ResourceManager.GetString("Operator_IsNot", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Country.
/// </summary>
@ -294,24 +150,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to second.
/// </summary>
public static string Second {
get {
return ResourceManager.GetString("Second", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to seconds.
/// </summary>
public static string Seconds {
get {
return ResourceManager.GetString("Seconds", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Settings.
/// </summary>
@ -358,7 +196,7 @@ namespace unison.Resources {
}
/// <summary>
/// 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), they are saved as is in the setting file..
/// 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 {
@ -510,51 +348,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to The shuffle window allows to add random songs to your queue. Both options take into account the filter..
/// </summary>
public static string Settings_Shuffle1 {
get {
return ResourceManager.GetString("Settings_Shuffle1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to If the filter is empty, the entire music library is taken into account..
/// </summary>
public static string Settings_Shuffle2 {
get {
return ResourceManager.GetString("Settings_Shuffle2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The filter is queried each time you use the Add to queue or Continuous shuffle options..
/// </summary>
public static string Settings_Shuffle3 {
get {
return ResourceManager.GetString("Settings_Shuffle3", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Add a fixed number of songs to the queue. For technical reasons, it is limited to 100 random songs without a filter, and to 1000 songs with a filter..
/// </summary>
public static string Settings_Shuffle4 {
get {
return ResourceManager.GetString("Settings_Shuffle4", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to By enabling this option, unison will automatically add songs to the queue so you never run out of songs to listen to..
/// </summary>
public static string Settings_Shuffle5 {
get {
return ResourceManager.GetString("Settings_Shuffle5", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You can change to your own locally installed version of the Snapcast client with an.
/// </summary>
@ -645,15 +438,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Update database.
/// </summary>
public static string Settings_UpdateDatabase {
get {
return ResourceManager.GetString("Settings_UpdateDatabase", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Version:.
/// </summary>
@ -708,132 +492,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Shuffle.
/// </summary>
public static string Shuffle {
get {
return ResourceManager.GetString("Shuffle", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Adding.
/// </summary>
public static string Shuffle_ButtonMessage1 {
get {
return ResourceManager.GetString("Shuffle_ButtonMessage1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to songs....
/// </summary>
public static string Shuffle_ButtonMessage2 {
get {
return ResourceManager.GetString("Shuffle_ButtonMessage2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to done!.
/// </summary>
public static string Shuffle_ButtonMessage3 {
get {
return ResourceManager.GetString("Shuffle_ButtonMessage3", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Continuous shuffle.
/// </summary>
public static string Shuffle_Continuous {
get {
return ResourceManager.GetString("Shuffle_Continuous", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Enable continuous shuffle.
/// </summary>
public static string Shuffle_ContinuousEnable {
get {
return ResourceManager.GetString("Shuffle_ContinuousEnable", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Filter.
/// </summary>
public static string Shuffle_Filter {
get {
return ResourceManager.GetString("Shuffle_Filter", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Query filter.
/// </summary>
public static string Shuffle_FilterQuery {
get {
return ResourceManager.GetString("Shuffle_FilterQuery", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Reset.
/// </summary>
public static string Shuffle_FilterReset {
get {
return ResourceManager.GetString("Shuffle_FilterReset", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Number of songs in filter:.
/// </summary>
public static string Shuffle_FilterSongNumber {
get {
return ResourceManager.GetString("Shuffle_FilterSongNumber", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Querying filter....
/// </summary>
public static string Shuffle_Querying1 {
get {
return ResourceManager.GetString("Shuffle_Querying1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to done!.
/// </summary>
public static string Shuffle_Querying2 {
get {
return ResourceManager.GetString("Shuffle_Querying2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Add to queue.
/// </summary>
public static string Shuffle_Queue {
get {
return ResourceManager.GetString("Shuffle_Queue", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Songs to add.
/// </summary>
public static string Shuffle_QueueSongs {
get {
return ResourceManager.GetString("Shuffle_QueueSongs", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Snapcast error.
/// </summary>
@ -879,6 +537,15 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Stats.
/// </summary>
public static string Stats {
get {
return ResourceManager.GetString("Stats", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Albums:.
/// </summary>
@ -933,24 +600,6 @@ namespace unison.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Updating database....
/// </summary>
public static string Stats_UpdateDBMessage1 {
get {
return ResourceManager.GetString("Stats_UpdateDBMessage1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to done!.
/// </summary>
public static string Stats_UpdateDBMessage2 {
get {
return ResourceManager.GetString("Stats_UpdateDBMessage2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to MPD uptime:.
/// </summary>
@ -968,68 +617,5 @@ namespace unison.Resources {
return ResourceManager.GetString("StopSnapcast", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Check for updates.
/// </summary>
public static string Update_ButtonCheck {
get {
return ResourceManager.GetString("Update_ButtonCheck", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Start update.
/// </summary>
public static string Update_ButtonStart {
get {
return ResourceManager.GetString("Update_ButtonStart", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Update available! New version is.
/// </summary>
public static string Update_Message1 {
get {
return ResourceManager.GetString("Update_Message1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Install now?.
/// </summary>
public static string Update_Message2 {
get {
return ResourceManager.GetString("Update_Message2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No update available..
/// </summary>
public static string Update_NoUpdate {
get {
return ResourceManager.GetString("Update_NoUpdate", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to New version.
/// </summary>
public static string Update_String1 {
get {
return ResourceManager.GetString("Update_String1", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to available!.
/// </summary>
public static string Update_String2 {
get {
return ResourceManager.GetString("Update_String2", resourceCulture);
}
}
}
}

148
Resources/Resources.es-ES.resx
View File

@ -112,62 +112,14 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Database" xml:space="preserve">
<value>Base de datos</value>
</data>
<data name="Day" xml:space="preserve">
<value>día</value>
</data>
<data name="Days" xml:space="preserve">
<value>días</value>
</data>
<data name="Exit" xml:space="preserve">
<value>Salir</value>
</data>
<data name="FilterType_Album" xml:space="preserve">
<value>Album</value>
</data>
<data name="FilterType_Artist" xml:space="preserve">
<value>Artista</value>
</data>
<data name="FilterType_Directory" xml:space="preserve">
<value>Directorio</value>
</data>
<data name="FilterType_Genre" xml:space="preserve">
<value>Género</value>
</data>
<data name="FilterType_Song" xml:space="preserve">
<value>Canción</value>
</data>
<data name="FilterType_Year" xml:space="preserve">
<value>Año</value>
</data>
<data name="Hour" xml:space="preserve">
<value>hora</value>
</data>
<data name="Hours" xml:space="preserve">
<value>horas</value>
</data>
<data name="Minute" xml:space="preserve">
<value>minuto</value>
</data>
<data name="Minutes" xml:space="preserve">
<value>minutos</value>
</data>
<data name="Operator_Contains" xml:space="preserve">
<value>contiene</value>
</data>
<data name="Operator_Is" xml:space="preserve">
<value>es</value>
</data>
<data name="Operator_IsNot" xml:space="preserve">
<value>no es</value>
</data>
<data name="Radios" xml:space="preserve">
<value>Radios</value>
</data>
@ -195,12 +147,6 @@
<data name="Radio_Tags" xml:space="preserve">
<value>Tags</value>
</data>
<data name="Second" xml:space="preserve">
<value>segundo</value>
</data>
<data name="Seconds" xml:space="preserve">
<value>segundos</value>
</data>
<data name="Settings" xml:space="preserve">
<value>Ajustes</value>
</data>
@ -267,21 +213,6 @@
<data name="Settings_ShowWindow" xml:space="preserve">
<value>Mostrar ventana</value>
</data>
<data name="Settings_Shuffle1" xml:space="preserve">
<value>La ventana Aleatorio permite agregar canciones aleatorias a la fila. La dos opciones tienen en cuenta el filtro.</value>
</data>
<data name="Settings_Shuffle2" xml:space="preserve">
<value>Si el filtro es vacío, la integralidad de la biblioteca musical se tiene en cuenta.</value>
</data>
<data name="Settings_Shuffle3" xml:space="preserve">
<value>El filtro es buscado cada vez que las opciones Agregar a la fila o Aleatorio continuo son usadas.</value>
</data>
<data name="Settings_Shuffle4" xml:space="preserve">
<value>Agrega un número dado de canciones a la fila. For razones tecnicas, es opción es limitada a 100 canciones aleatorias sin filtro, y a 1000 canciones con filtro.</value>
</data>
<data name="Settings_Shuffle5" xml:space="preserve">
<value>Activando esa opción, unison va a agregar automaticamente canciones a la fila para nunca llegar al cabo de canciones a escuchar.</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>
@ -312,9 +243,6 @@
<data name="Settings_SourceCode2" xml:space="preserve">
<value>aquí</value>
</data>
<data name="Settings_UpdateDatabase" xml:space="preserve">
<value>Actualizar base de datos</value>
</data>
<data name="Settings_Version" xml:space="preserve">
<value>Versión:</value>
</data>
@ -333,48 +261,6 @@
<data name="ShowWindow" xml:space="preserve">
<value>Mostrar ventana</value>
</data>
<data name="Shuffle" xml:space="preserve">
<value>Aleatorio</value>
</data>
<data name="Shuffle_ButtonMessage1" xml:space="preserve">
<value>Agregando</value>
</data>
<data name="Shuffle_ButtonMessage2" xml:space="preserve">
<value>canciones...</value>
</data>
<data name="Shuffle_ButtonMessage3" xml:space="preserve">
<value>¡terminado!</value>
</data>
<data name="Shuffle_Continuous" xml:space="preserve">
<value>Aleatorio continuo</value>
</data>
<data name="Shuffle_ContinuousEnable" xml:space="preserve">
<value>Empezar aleatorio continuo</value>
</data>
<data name="Shuffle_Filter" xml:space="preserve">
<value>Filtro</value>
</data>
<data name="Shuffle_FilterQuery" xml:space="preserve">
<value>Búsqueda de filtro</value>
</data>
<data name="Shuffle_FilterReset" xml:space="preserve">
<value>Reinicializar</value>
</data>
<data name="Shuffle_FilterSongNumber" xml:space="preserve">
<value>Canciones en el filtro:</value>
</data>
<data name="Shuffle_Querying1" xml:space="preserve">
<value>Búsqueda de filtro...</value>
</data>
<data name="Shuffle_Querying2" xml:space="preserve">
<value>¡terminado!</value>
</data>
<data name="Shuffle_Queue" xml:space="preserve">
<value>Agregar a la fila</value>
</data>
<data name="Shuffle_QueueSongs" xml:space="preserve">
<value>Canciones para agregar</value>
</data>
<data name="Snapcast_Popup1" xml:space="preserve">
<value>Error Snapcast</value>
</data>
@ -390,6 +276,9 @@
<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>
@ -408,37 +297,10 @@
<data name="Stats_TotalTimePlayed" xml:space="preserve">
<value>Tiempo total jugado:</value>
</data>
<data name="Stats_UpdateDBMessage1" xml:space="preserve">
<value>Actualizando base de datos...</value>
</data>
<data name="Stats_UpdateDBMessage2" xml:space="preserve">
<value> ¡terminado!</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>
<data name="Update_ButtonCheck" xml:space="preserve">
<value>Buscar actualización</value>
</data>
<data name="Update_ButtonStart" xml:space="preserve">
<value>Actualizar</value>
</data>
<data name="Update_Message1" xml:space="preserve">
<value>¡Actualización disponible! La nueva versión es la</value>
</data>
<data name="Update_Message2" xml:space="preserve">
<value>¿Instalar ahora?</value>
</data>
<data name="Update_NoUpdate" xml:space="preserve">
<value>No actualización disponible.</value>
</data>
<data name="Update_String1" xml:space="preserve">
<value>¡Nueva versión</value>
</data>
<data name="Update_String2" xml:space="preserve">
<value>disponible!</value>
</data>
</root>

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

@ -112,62 +112,14 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Database" xml:space="preserve">
<value>Base de donnée</value>
</data>
<data name="Day" xml:space="preserve">
<value>jour</value>
</data>
<data name="Days" xml:space="preserve">
<value>jours</value>
</data>
<data name="Exit" xml:space="preserve">
<value>Quitter</value>
</data>
<data name="FilterType_Album" xml:space="preserve">
<value>Album</value>
</data>
<data name="FilterType_Artist" xml:space="preserve">
<value>Artiste</value>
</data>
<data name="FilterType_Directory" xml:space="preserve">
<value>Dossier</value>
</data>
<data name="FilterType_Genre" xml:space="preserve">
<value>Genre</value>
</data>
<data name="FilterType_Song" xml:space="preserve">
<value>Chanson</value>
</data>
<data name="FilterType_Year" xml:space="preserve">
<value>Année</value>
</data>
<data name="Hour" xml:space="preserve">
<value>heure</value>
</data>
<data name="Hours" xml:space="preserve">
<value>heures</value>
</data>
<data name="Minute" xml:space="preserve">
<value>minute</value>
</data>
<data name="Minutes" xml:space="preserve">
<value>minutes</value>
</data>
<data name="Operator_Contains" xml:space="preserve">
<value>contient</value>
</data>
<data name="Operator_Is" xml:space="preserve">
<value>est</value>
</data>
<data name="Operator_IsNot" xml:space="preserve">
<value>n'est pas</value>
</data>
<data name="Radios" xml:space="preserve">
<value>Radios</value>
</data>
@ -195,12 +147,6 @@
<data name="Radio_Tags" xml:space="preserve">
<value>Tags</value>
</data>
<data name="Second" xml:space="preserve">
<value>seconde</value>
</data>
<data name="Seconds" xml:space="preserve">
<value>secondes</value>
</data>
<data name="Settings" xml:space="preserve">
<value>Configuration</value>
</data>
@ -267,21 +213,6 @@
<data name="Settings_ShowWindow" xml:space="preserve">
<value>Afficher la fenêtre</value>
</data>
<data name="Settings_Shuffle1" xml:space="preserve">
<value>La fenêtre aléatoire permet d'ajouter des chansons aléatoires à la file. Les deux options prennent en compte le filtre.</value>
</data>
<data name="Settings_Shuffle2" xml:space="preserve">
<value>Si le filtre est vide, l'intégralité de la bibliothèque est prise en compte.</value>
</data>
<data name="Settings_Shuffle3" xml:space="preserve">
<value>Le filtre est recherché à chaque fois que les options Ajouter à la file ou Aléatoire continu sont utilisées.</value>
</data>
<data name="Settings_Shuffle4" xml:space="preserve">
<value>Ajoute un nombre fixe de chansons à la file. Pour des raisons techniques, cette option est limitée à 100 chansons aléatoires sans filtre, et à 1000 chansons avec filtre.</value>
</data>
<data name="Settings_Shuffle5" xml:space="preserve">
<value>En activant cette option, unison va ajouter automatiquement des chansons à la file pour ne jamais arriver à cours de chansons à écouter.</value>
</data>
<data name="Settings_SnapcastInfo1" xml:space="preserve">
<value>Il est possible de mettre votre version localement installé de Snapcast avec un </value>
</data>
@ -312,9 +243,6 @@
<data name="Settings_SourceCode2" xml:space="preserve">
<value>ici</value>
</data>
<data name="Settings_UpdateDatabase" xml:space="preserve">
<value>Mettre à jour la base de donnée</value>
</data>
<data name="Settings_Version" xml:space="preserve">
<value>Version :</value>
</data>
@ -333,48 +261,6 @@
<data name="ShowWindow" xml:space="preserve">
<value>Montrer la fenêtre</value>
</data>
<data name="Shuffle" xml:space="preserve">
<value>Aléatoire</value>
</data>
<data name="Shuffle_ButtonMessage1" xml:space="preserve">
<value>Ajout de</value>
</data>
<data name="Shuffle_ButtonMessage2" xml:space="preserve">
<value>chansons...</value>
</data>
<data name="Shuffle_ButtonMessage3" xml:space="preserve">
<value>fini !</value>
</data>
<data name="Shuffle_Continuous" xml:space="preserve">
<value>Aléatoire continu</value>
</data>
<data name="Shuffle_ContinuousEnable" xml:space="preserve">
<value>Activer le mode aléatoire continu</value>
</data>
<data name="Shuffle_Filter" xml:space="preserve">
<value>Filtre</value>
</data>
<data name="Shuffle_FilterQuery" xml:space="preserve">
<value>Recherche du filtre</value>
</data>
<data name="Shuffle_FilterReset" xml:space="preserve">
<value>Réinitialiser</value>
</data>
<data name="Shuffle_FilterSongNumber" xml:space="preserve">
<value>Nombre de chansons dans le filtre :</value>
</data>
<data name="Shuffle_Querying1" xml:space="preserve">
<value>Recherche du filtre...</value>
</data>
<data name="Shuffle_Querying2" xml:space="preserve">
<value>fini !</value>
</data>
<data name="Shuffle_Queue" xml:space="preserve">
<value>Ajouter à la file</value>
</data>
<data name="Shuffle_QueueSongs" xml:space="preserve">
<value>Chansons à ajouter</value>
</data>
<data name="Snapcast_Popup1" xml:space="preserve">
<value>Erreur Snapcast</value>
</data>
@ -390,6 +276,9 @@
<data name="StartSnapcast" xml:space="preserve">
<value>Démarrer Snapcast</value>
</data>
<data name="Stats" xml:space="preserve">
<value>Stats</value>
</data>
<data name="Stats_Albums" xml:space="preserve">
<value>Albums :</value>
</data>
@ -408,37 +297,10 @@
<data name="Stats_TotalTimePlayed" xml:space="preserve">
<value>Temps d'écoute écoulé :</value>
</data>
<data name="Stats_UpdateDBMessage1" xml:space="preserve">
<value>Mise à jour de la base de donnée...</value>
</data>
<data name="Stats_UpdateDBMessage2" xml:space="preserve">
<value> fini !</value>
</data>
<data name="Stats_Uptime" xml:space="preserve">
<value>MPD lancé depuis :</value>
<value>MPD lancé depuis : </value>
</data>
<data name="StopSnapcast" xml:space="preserve">
<value>Stopper Snapcast</value>
</data>
<data name="Update_ButtonCheck" xml:space="preserve">
<value>Vérifier les mises à jour</value>
</data>
<data name="Update_ButtonStart" xml:space="preserve">
<value>Mettre à jour</value>
</data>
<data name="Update_Message1" xml:space="preserve">
<value>Mise à jour disponible ! La nouvelle version est la</value>
</data>
<data name="Update_Message2" xml:space="preserve">
<value>Installer maintenant ?</value>
</data>
<data name="Update_NoUpdate" xml:space="preserve">
<value>Pas de mise à jour disponible.</value>
</data>
<data name="Update_String1" xml:space="preserve">
<value>Nouvelle version</value>
</data>
<data name="Update_String2" xml:space="preserve">
<value>disponible !</value>
</data>
</root>

150
Resources/Resources.resx
View File

@ -112,62 +112,14 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Database" xml:space="preserve">
<value>Database</value>
</data>
<data name="Day" xml:space="preserve">
<value>day</value>
</data>
<data name="Days" xml:space="preserve">
<value>days</value>
</data>
<data name="Exit" xml:space="preserve">
<value>Exit</value>
</data>
<data name="FilterType_Album" xml:space="preserve">
<value>Album</value>
</data>
<data name="FilterType_Artist" xml:space="preserve">
<value>Artist</value>
</data>
<data name="FilterType_Directory" xml:space="preserve">
<value>Directory</value>
</data>
<data name="FilterType_Genre" xml:space="preserve">
<value>Genre</value>
</data>
<data name="FilterType_Song" xml:space="preserve">
<value>Song</value>
</data>
<data name="FilterType_Year" xml:space="preserve">
<value>Year</value>
</data>
<data name="Hour" xml:space="preserve">
<value>hour</value>
</data>
<data name="Hours" xml:space="preserve">
<value>hours</value>
</data>
<data name="Minute" xml:space="preserve">
<value>minute</value>
</data>
<data name="Minutes" xml:space="preserve">
<value>minutes</value>
</data>
<data name="Operator_Contains" xml:space="preserve">
<value>contains</value>
</data>
<data name="Operator_Is" xml:space="preserve">
<value>is</value>
</data>
<data name="Operator_IsNot" xml:space="preserve">
<value>is not</value>
</data>
<data name="Radios" xml:space="preserve">
<value>Radios</value>
</data>
@ -195,12 +147,6 @@
<data name="Radio_Tags" xml:space="preserve">
<value>Tags</value>
</data>
<data name="Second" xml:space="preserve">
<value>second</value>
</data>
<data name="Seconds" xml:space="preserve">
<value>seconds</value>
</data>
<data name="Settings" xml:space="preserve">
<value>Settings</value>
</data>
@ -217,7 +163,7 @@
<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), they are saved as is in the setting file.</value>
<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>
@ -267,21 +213,6 @@
<data name="Settings_ShowWindow" xml:space="preserve">
<value>Show window</value>
</data>
<data name="Settings_Shuffle1" xml:space="preserve">
<value>The shuffle window allows to add random songs to your queue. Both options take into account the filter.</value>
</data>
<data name="Settings_Shuffle2" xml:space="preserve">
<value>If the filter is empty, the entire music library is taken into account.</value>
</data>
<data name="Settings_Shuffle3" xml:space="preserve">
<value>The filter is queried each time you use the Add to queue or Continuous shuffle options.</value>
</data>
<data name="Settings_Shuffle4" xml:space="preserve">
<value>Add a fixed number of songs to the queue. For technical reasons, it is limited to 100 random songs without a filter, and to 1000 songs with a filter.</value>
</data>
<data name="Settings_Shuffle5" xml:space="preserve">
<value>By enabling this option, unison will automatically add songs to the queue so you never run out of songs to listen to.</value>
</data>
<data name="Settings_SnapcastInfo1" xml:space="preserve">
<value>You can change to your own locally installed version of the Snapcast client with an</value>
</data>
@ -312,9 +243,6 @@
<data name="Settings_SourceCode2" xml:space="preserve">
<value>here</value>
</data>
<data name="Settings_UpdateDatabase" xml:space="preserve">
<value>Update database</value>
</data>
<data name="Settings_Version" xml:space="preserve">
<value>Version:</value>
</data>
@ -333,48 +261,6 @@
<data name="ShowWindow" xml:space="preserve">
<value>Show window</value>
</data>
<data name="Shuffle" xml:space="preserve">
<value>Shuffle</value>
</data>
<data name="Shuffle_ButtonMessage1" xml:space="preserve">
<value>Adding</value>
</data>
<data name="Shuffle_ButtonMessage2" xml:space="preserve">
<value>songs...</value>
</data>
<data name="Shuffle_ButtonMessage3" xml:space="preserve">
<value>done!</value>
</data>
<data name="Shuffle_Continuous" xml:space="preserve">
<value>Continuous shuffle</value>
</data>
<data name="Shuffle_ContinuousEnable" xml:space="preserve">
<value>Enable continuous shuffle</value>
</data>
<data name="Shuffle_Filter" xml:space="preserve">
<value>Filter</value>
</data>
<data name="Shuffle_FilterQuery" xml:space="preserve">
<value>Query filter</value>
</data>
<data name="Shuffle_FilterReset" xml:space="preserve">
<value>Reset</value>
</data>
<data name="Shuffle_FilterSongNumber" xml:space="preserve">
<value>Number of songs in filter:</value>
</data>
<data name="Shuffle_Querying1" xml:space="preserve">
<value>Querying filter...</value>
</data>
<data name="Shuffle_Querying2" xml:space="preserve">
<value>done!</value>
</data>
<data name="Shuffle_Queue" xml:space="preserve">
<value>Add to queue</value>
</data>
<data name="Shuffle_QueueSongs" xml:space="preserve">
<value>Songs to add</value>
</data>
<data name="Snapcast_Popup1" xml:space="preserve">
<value>Snapcast error</value>
</data>
@ -390,6 +276,9 @@
<data name="StartSnapcast" xml:space="preserve">
<value>Start Snapcast</value>
</data>
<data name="Stats" xml:space="preserve">
<value>Stats</value>
</data>
<data name="Stats_Albums" xml:space="preserve">
<value>Albums:</value>
</data>
@ -408,37 +297,10 @@
<data name="Stats_TotalTimePlayed" xml:space="preserve">
<value>Total time played:</value>
</data>
<data name="Stats_UpdateDBMessage1" xml:space="preserve">
<value>Updating database...</value>
</data>
<data name="Stats_UpdateDBMessage2" xml:space="preserve">
<value>done!</value>
</data>
<data name="Stats_Uptime" xml:space="preserve">
<value>MPD uptime:</value>
</data>
<data name="StopSnapcast" xml:space="preserve">
<value>Stop Snapcast</value>
</data>
<data name="Update_ButtonCheck" xml:space="preserve">
<value>Check for updates</value>
</data>
<data name="Update_ButtonStart" xml:space="preserve">
<value>Start update</value>
</data>
<data name="Update_Message1" xml:space="preserve">
<value>Update available! New version is</value>
</data>
<data name="Update_Message2" xml:space="preserve">
<value>Install now?</value>
</data>
<data name="Update_NoUpdate" xml:space="preserve">
<value>No update available.</value>
</data>
<data name="Update_String1" xml:space="preserve">
<value>New version</value>
</data>
<data name="Update_String2" xml:space="preserve">
<value>available!</value>
</data>
</root>

BIN
Screenshots/screen-mainwindow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

0
Screenshots/screen4.png → Screenshots/screen-radio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
Screenshots/screen-shortcuts.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
Screenshots/screen-shuffle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
Screenshots/screen-systray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
Screenshots/screen1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
Screenshots/screen2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
Screenshots/screen3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

6
Views/MainWindow.xaml
View File

@ -6,7 +6,7 @@
xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
xmlns:properties="clr-namespace:unison.Resources"
mc:Ignorable="d"
Title="unison" Closing="Window_Closing" LocationChanged="Window_LocationChanged" Icon="/Resources/icon-full.ico" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight">
Title="unison" Closing="Window_Closing" Icon="/Resources/icon-full.ico" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight">
<Window.Resources>
<Style TargetType="Border" x:Key="UnselectedButton">
@ -17,7 +17,7 @@
</Style>
</Window.Resources>
<Grid Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" MinHeight="270" MinWidth="700">
<Grid Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" MinHeight="270" MinWidth="650">
<Grid x:Name="TopLayout" Margin="10,0,10,0" VerticalAlignment="Stretch" Width="Auto" Height="Auto">
<Grid x:Name="Display" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="225,0,0,0" Height="Auto" Width="Auto">
<GroupBox Height="220" VerticalAlignment="Center">
@ -115,7 +115,7 @@
<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 Text="{x:Static properties:Resources.Shuffle}" Margin="5, 0, 0, 0"/>
<TextBlock Text="Shuffle" Margin="5, 0, 0, 0"/>
</StackPanel>
</Button>

50
Views/MainWindow.xaml.cs
View File

@ -7,8 +7,8 @@ using System.Windows.Interop;
using System.Windows.Input;
using System.Windows.Controls.Primitives;
using System.Diagnostics;
using System.Data;
using MpcNET.Commands.Playback;
using System.Linq;
using System.Threading.Tasks;
namespace unison
{
@ -20,16 +20,12 @@ namespace unison
private readonly DispatcherTimer _timer;
private readonly MPDHandler _mpd;
public Settings GetSettings() => _settingsWin;
public MainWindow()
{
InitHwnd();
InitializeComponent();
DefaultState(true);
WindowState = WindowState.Minimized;
Top = Properties.Settings.Default.MainWindowTop;
Left = Properties.Settings.Default.MainWindowLeft;
_settingsWin = new Settings();
_radiosWin = new Radios();
@ -51,17 +47,12 @@ namespace unison
TimeSlider.Value = _mpd.GetCurrentTime() / _mpd.GetCurrentSong().Time * 100;
}
public void UpdateStats()
{
_mpd.QueryStats();
_settingsWin.UpdateStats();
}
public void OnConnectionChanged(object sender, EventArgs e)
{
if (_mpd.IsConnected())
{
UpdateStats();
_mpd.QueryStats();
_settingsWin.UpdateStats();
ConnectionOkIcon.Visibility = Visibility.Visible;
ConnectionFailIcon.Visibility = Visibility.Collapsed;
@ -133,18 +124,21 @@ namespace unison
EndTime.Text = FormatSeconds(_mpd.GetCurrentSong().Time);
}
Trace.WriteLine("Song changed called!");
Debug.WriteLine("Song changed called!");
if (_shuffleWin.GetContinuous())
{
// force consume: there's no other way to be sure
// that we don't get to the end of the queue with nothing to play
_mpd.SendCommand(new ConsumeCommand(true));
if (!_shuffleWin.GetContinuous())
return;
Debug.WriteLine("playlist length => " + _mpd.GetStatus().PlaylistLength);
if (_mpd.GetStatus().PlaylistLength > 4)
return;
Debug.WriteLine("start continuous handling");
_mpd.CanPrevNext = false;
await _shuffleWin.HandleContinuous();
_mpd.CanPrevNext = true;
}
Debug.WriteLine("finished continuous");
}
public void OnStatusChanged(object sender, EventArgs e)
@ -231,12 +225,12 @@ namespace unison
border.Style = b ? (Style)Resources["SelectedButton"] : (Style)Resources["UnselectedButton"];
}
public static string FormatSeconds(int time)
public string FormatSeconds(int time)
{
TimeSpan timespan = TimeSpan.FromSeconds(time);
return timespan.ToString(@"mm\:ss");
}
public static string FormatSeconds(double time)
public string FormatSeconds(double time)
{
TimeSpan timespan = TimeSpan.FromSeconds(time);
return timespan.ToString(@"mm\:ss");
@ -308,11 +302,6 @@ namespace unison
slider.ToolTip = (int)slider.Value;
}
public void UpdateUpdateStatus(string version)
{
_settingsWin.UpdateUpdateStatus(version);
}
protected override void OnSourceInitialized(EventArgs e)
{
base.OnSourceInitialized(e);
@ -343,12 +332,5 @@ namespace unison
WindowState = WindowState.Minimized;
Hide();
}
private void Window_LocationChanged(object sender, EventArgs e)
{
Properties.Settings.Default.MainWindowTop = Top;
Properties.Settings.Default.MainWindowLeft = Left;
Properties.Settings.Default.Save();
}
}
}

2
Views/Radios.xaml
View File

@ -37,7 +37,7 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<Button x:Name="SearchButton" Content="{x:Static properties:Resources.Radio_Search}" Click="Search_Clicked" Padding="5, 2"/>
<Button Content="{x:Static properties:Resources.Radio_Search}" Click="Search_Clicked" Padding="5, 2"/>
<Button Content="{x:Static properties:Resources.Radio_Reset}" Click="Reset_Clicked" Margin="10,0,0,0" Padding="5, 2"/>
<TextBlock x:Name="SearchStatus" Margin="15,1,0,0" FontStyle="Italic" />
</StackPanel>

121
Views/Radios.xaml.cs
View File

@ -1,42 +1,88 @@
using System;
using RadioBrowser;
using RadioBrowser.Models;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System;
using System.ComponentModel;
using System.Windows.Interop;
using System.Windows.Controls;
using System.Windows.Input;
using System.Collections.Generic;
using unison.Handlers;
using RadioBrowser.Models;
namespace unison
{
public class CountryListItem
{
public uint Count { get; set; }
public string Name { get; set; }
public override string ToString()
{
if (Name == "")
return "None";
return $"{Name} ({Count})";
}
}
public class StationListItem
{
public string Name { get; set; }
public string Codec { get; set; }
public string Tags { get; set; }
public int Bitrate { get; set; }
public Uri Url { get; set; }
private string _country;
public string Country
{
get
{
if (_country.Length == 0)
return "🏴‍☠️";
return string.Concat(_country.ToUpper().Select(x => char.ConvertFromUtf32(x + 0x1F1A5))); // return emoji
}
set
{
_country = value;
}
}
}
public partial class Radios : Window
{
private RadioBrowserClient _radioBrowser;
private MPDHandler _mpd;
private RadioHandler _radio;
private bool _connected = true;
public bool IsConnected() => _radio.IsConnected();
public bool IsConnected() => _connected;
public Radios()
{
InitializeComponent();
try
{
_radioBrowser = new RadioBrowserClient();
Initialize();
}
catch (Exception e)
{
Debug.WriteLine("Exception while connecting to RadioBrowser: " + e.Message);
return;
}
_connected = true;
}
public async void Initialize()
{
_radio = new RadioHandler();
if (!_radio.IsConnected())
SearchButton.IsEnabled = false;
try
{
List<NameAndCount> Countries = await _radioBrowser.Lists.GetCountriesAsync();
CountryList.Items.Add(new CountryListItem { Name = "", Count = 0 });
List<NameAndCount> Countries = await _radio.GetCountries();
foreach (NameAndCount Country in Countries)
{
CountryList.Items.Add(new CountryListItem
@ -48,50 +94,28 @@ namespace unison
}
catch (Exception e)
{
Trace.WriteLine("Exception while getting countries in RadioBrowser: " + e.Message);
Debug.WriteLine("Exception while getting countries in RadioBrowser: " + e.Message);
return;
}
}
private static string CleanString(string str)
private string CleanString(string str)
{
return str.Replace("\r\n", "").Replace("\n", "").Replace("\r", "");
}
private void SearchHandler(object sender, KeyEventArgs e)
{
if (e.Key == Key.Return)
Search_Clicked(null, null);
}
private async void Search_Clicked(object sender, RoutedEventArgs e)
{
try
{
CountryListItem a = (CountryListItem)CountryList.SelectedItem;
await SearchAdvanced(NameSearch.Text, a?.Name, TagSearch.Text);
}
catch (Exception except)
{
Trace.WriteLine("Error on RadioBrowser search: " + except.Message);
}
}
public async Task SearchAdvanced(string name, string country, string tags)
{
try
{
SearchStatus.Text = unison.Resources.Resources.Radio_Loading;
List<StationInfo> advancedSearch = await Task.Run(async () =>
{
return await _radio.AdvancedSearch(new AdvancedSearchOptions
List<StationInfo> advancedSearch = await _radioBrowser.Search.AdvancedAsync(new AdvancedSearchOptions
{
Name = name,
Country = country,
TagList = tags
});
});
RadioListGrid.Items.Clear();
if (advancedSearch.Count > 0)
@ -116,7 +140,7 @@ namespace unison
}
catch (Exception except)
{
Trace.WriteLine("Error on RadioBrowser search advanced: " + except.Message);
Debug.WriteLine("Error on RadioBrowser search advanced: " + except.Message);
}
}
@ -136,13 +160,13 @@ namespace unison
}
catch (ArgumentOutOfRangeException)
{
Trace.WriteLine("Error: Invalid index.");
Debug.WriteLine("Error: Invalid index.");
return;
}
if (station.Url == null)
{
Trace.WriteLine("Error: Invalid station.");
Debug.WriteLine("Error: Invalid station.");
return;
}
@ -150,6 +174,19 @@ namespace unison
_mpd.ClearAddAndPlay(station.Url.AbsoluteUri);
}
private async void Search_Clicked(object sender, RoutedEventArgs e)
{
try
{
CountryListItem a = (CountryListItem)CountryList.SelectedItem;
await SearchAdvanced(NameSearch.Text, a?.Name, TagSearch.Text);
}
catch (Exception except)
{
Debug.WriteLine("Error on RadioBrowser search: " + except.Message);
}
}
private void Reset_Clicked(object sender, RoutedEventArgs e)
{
NameSearch.Text = "";
@ -157,6 +194,12 @@ namespace unison
CountryList.SelectedIndex = 0;
}
private void SearchHandler(object sender, KeyEventArgs e)
{
if (e.Key == Key.Return)
Search_Clicked(null, null);
}
private void Window_Closing(object sender, CancelEventArgs e)
{
e.Cancel = true;

66
Views/Settings.xaml
View File

@ -17,7 +17,7 @@
</x:Array>
</Window.Resources>
<Grid MinWidth="390">
<Grid>
<StackPanel Orientation="Vertical">
<TabControl Margin="10">
<TabItem Header="MPD">
@ -33,18 +33,18 @@
<StackPanel>
<StackPanel>
<TextBlock Text="{x:Static properties:Resources.Settings_Host}" TextWrapping="Wrap" Margin="5,0,0,0"/>
<TextBox x:Name="MpdHost" KeyDown="ConnectHandler" TextChanged="MpdConnectTextBox" TextWrapping="Wrap" 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" PreviewTextInput="NumberValidationTextBox" MaxLength="5" TextWrapping="Wrap" 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="{x:Static properties:Resources.Settings_Password}" TextWrapping="Wrap" Margin="5,0,0,0"/>
<PasswordBox x:Name="MpdPassword" KeyDown="ConnectHandler" Margin="10,2,0,0"/>
<TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="390"/>
<PasswordBox x:Name="MpdPassword" KeyDown="ConnectHandler" Width="250" Margin="10,2,0,0"/>
<TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="250" HorizontalAlignment="Left"/>
</StackPanel>
<TextBlock TextWrapping="Wrap" Margin="5,10,0,0">
@ -52,7 +52,7 @@
<Run x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}"/>
</TextBlock>
<Button x:Name="ConnectButton" Content="{x:Static properties:Resources.Settings_ConnectButton}" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked" />
<Button x:Name="ConnectButton" Content="{x:Static properties:Resources.Settings_ConnectButton}" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked"/>
</StackPanel>
</Grid>
</GroupBox>
@ -182,13 +182,13 @@
<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" Margin="10,2,5,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" Margin="10,2,5,0"/>
<TextBlock TextWrapping="Wrap" Margin="5,5,0,0" TextAlignment="Left" Width="390">
<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}" Width="120" Click="SnapcastReset_Clicked" Margin="0,5,0,0" BorderThickness="1,1,1,1"/>
<Button Content="{x:Static properties:Resources.Settings_SnapcastResetButton}" Margin="0,10,0,0" Width="120" Click="SnapcastReset_Clicked"/>
</StackPanel>
</StackPanel>
</Grid>
@ -196,28 +196,27 @@
</DockPanel>
</TabItem>
<TabItem Header="{x:Static properties:Resources.Shuffle}">
<TabItem Header="Shuffle">
<DockPanel Margin="8">
<GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
<GroupBox.Header>
<TextBlock>
<emoji:EmojiInline Text="🔁 "/>
<Run Text="{x:Static properties:Resources.Shuffle}"></Run>
<Run Text="Shuffle"></Run>
</TextBlock>
</GroupBox.Header>
<Grid MaxWidth="500">
<StackPanel>
<TextBlock TextWrapping="Wrap">
<Run Text="{x:Static properties:Resources.Settings_Shuffle1}"></Run>
<Run Text="{x:Static properties:Resources.Settings_Shuffle2}"></Run><LineBreak/>
<Run Text="{x:Static properties:Resources.Settings_Shuffle3}"></Run><LineBreak/><LineBreak/>
<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" Text="{x:Static properties:Resources.Shuffle_Queue}"></Run><LineBreak/>
<Run Text="{x:Static properties:Resources.Settings_Shuffle4}"></Run>
<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>
<LineBreak/><LineBreak/>
<Run FontWeight="Bold" Text="{x:Static properties:Resources.Shuffle_Continuous}"></Run><LineBreak/>
<Run Text="{x:Static properties:Resources.Settings_Shuffle5}"></Run>
<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>
</TextBlock>
</StackPanel>
</Grid>
@ -225,17 +224,15 @@
</DockPanel>
</TabItem>
<TabItem Header="{x:Static properties:Resources.Database}" Height="20" VerticalAlignment="Bottom">
<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.Database}"/>
<Run Text="{x:Static properties:Resources.Stats}"/>
</TextBlock>
</GroupBox.Header>
<StackPanel>
<Grid VerticalAlignment="Top">
<TextBlock>
<Run Text="{x:Static properties:Resources.Stats_Songs}"/><Run Text=" "/><Run x:Name="StatSong"/><LineBreak/>
@ -247,13 +244,6 @@
<Run Text="{x:Static properties:Resources.Stats_LastDatabaseUpdate}"/><Run Text=" "/><Run x:Name="StatDatabaseUpdate"/>
</TextBlock>
</Grid>
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<Button x:Name="UpdateDatabaseButton" Content="{x:Static properties:Resources.Settings_UpdateDatabase}" Click="MPDDatabaseUpdate_Clicked" MinWidth="120" Padding="3,1,3,1" FocusVisualStyle="{x:Null}"/>
<TextBlock x:Name="UpdateDBMessage" Text="{x:Static properties:Resources.Stats_UpdateDBMessage1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<TextBlock x:Name="UpdateDBMessage2" Text="{x:Static properties:Resources.Stats_UpdateDBMessage2}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
</StackPanel>
</StackPanel>
</GroupBox>
</DockPanel>
</TabItem>
@ -266,24 +256,16 @@
</GroupBox.Header>
<Grid VerticalAlignment="Top">
<StackPanel Orientation="Vertical">
<TextBlock TextWrapping="Wrap" VerticalAlignment="Top">
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" VerticalAlignment="Top">
<Run Text="{x:Static properties:Resources.Settings_Version}"/>
<Run Text="{Binding GetVersion, Mode = OneWay}"/>
</TextBlock>
<TextBlock x:Name="UpdateText" TextWrapping="Wrap" VerticalAlignment="Top">
<Run x:Name="UpdateText2" Text="New version X.X.X available!" FontWeight="Bold"/>
</TextBlock>
<Button x:Name="UpdateButton" Content="{x:Static properties:Resources.Update_ButtonCheck}" Margin="0,3,0,10" Width="150" Click="CheckUpdates" HorizontalAlignment="Left"/>
<TextBlock TextWrapping="Wrap" VerticalAlignment="Top">
<Run Text="{x:Static properties:Resources.Settings_AboutInfo}" /><LineBreak/>
※ <Hyperlink NavigateUri="https://github.com/Difegue/MpcNET" RequestNavigate="Hyperlink_RequestNavigate">MpcNET</Hyperlink><LineBreak/>
※ <Hyperlink NavigateUri="https://github.com/hardcodet/wpf-notifyicon" RequestNavigate="Hyperlink_RequestNavigate">wpf-notifyicon</Hyperlink><LineBreak/>
※ <Hyperlink NavigateUri="https://github.com/samhocevar/emoji.wpf" RequestNavigate="Hyperlink_RequestNavigate">Emoji.WPF</Hyperlink><LineBreak/>
※ <Hyperlink NavigateUri="https://github.com/tof4/RadioBrowser" RequestNavigate="Hyperlink_RequestNavigate">RadioBrowser</Hyperlink><LineBreak/>
※ <Hyperlink NavigateUri="https://github.com/ravibpatel/AutoUpdater.NET" RequestNavigate="Hyperlink_RequestNavigate">AutoUpdater.NET</Hyperlink><LineBreak/>
※ <Hyperlink NavigateUri="https://github.com/badaix/snapcast" RequestNavigate="Hyperlink_RequestNavigate">Snapcast</Hyperlink>
※ <Hyperlink NavigateUri="https://github.com/tof4/RadioBrowser" RequestNavigate="Hyperlink_RequestNavigate">RadioBrowser</Hyperlink>
</TextBlock>
<TextBlock Margin="0,10,0,0">
<Run Text="{x:Static properties:Resources.Settings_SourceCode1}" />
@ -300,11 +282,7 @@
</StackPanel>
</Grid>
</GroupBox>
</DockPanel>
</TabItem>
<TabItem Header="{x:Static properties:Resources.Settings_License}" Height="20" VerticalAlignment="Bottom">
<DockPanel Margin="8">
<GroupBox DockPanel.Dock="Top" Padding="0,4,0,0" Margin="0,10,0,0">
<GroupBox.Header>
<TextBlock>

69
Views/Settings.xaml.cs
View File

@ -1,19 +1,15 @@
using System;
using System.ComponentModel;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Navigation;
using System.Windows.Threading;
using unison.Handlers;
namespace unison
{
@ -39,7 +35,8 @@ namespace unison
}
}
readonly HotkeyHandler _hotkeys = (HotkeyHandler)Application.Current.Properties["hotkeys"];
HotkeyHandler _hotkeys = (HotkeyHandler)Application.Current.Properties["hotkeys"];
public Settings()
{
@ -63,8 +60,6 @@ namespace unison
SnapcastPort.Text = Properties.Settings.Default.snapcast_port.ToString();
VolumeOffset.Text = Properties.Settings.Default.volume_offset.ToString();
UpdateText.Visibility = Visibility.Collapsed;
InitializeShortcuts();
}
@ -75,13 +70,11 @@ namespace unison
{
ConnectionStatus.Text = $"{unison.Resources.Resources.Settings_ConnectionStatusConnected} {mpd.GetVersion()}.";
ConnectButton.IsEnabled = false;
UpdateDatabaseButton.IsEnabled = true;
}
else
{
ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusOffline;
ConnectButton.IsEnabled = true;
UpdateDatabaseButton.IsEnabled = false;
}
}
@ -105,7 +98,7 @@ namespace unison
private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
{
ProcessStartInfo psi = new ProcessStartInfo(e.Uri.AbsoluteUri);
ProcessStartInfo psi = new(e.Uri.AbsoluteUri);
psi.UseShellExecute = true;
Process.Start(psi);
e.Handled = true;
@ -122,7 +115,7 @@ namespace unison
ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusConnecting;
MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
Task.Run(async () => { await mpd.Initialize(); });
System.Threading.Tasks.Task.Run(async () => { await mpd.Initialize(); });
}
private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)
@ -149,50 +142,6 @@ namespace unison
MPDConnect_Clicked(null, null);
}
private void MPDDatabaseUpdate_Clicked(object sender, RoutedEventArgs e)
{
MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
if (mpd.IsConnected())
mpd.UpdateDB();
}
private static void TimedText(TextBlock textBlock, int time)
{
DispatcherTimer Timer = new DispatcherTimer();
Timer.Interval = TimeSpan.FromSeconds(time);
Timer.Tick += (sender, args) =>
{
Timer.Stop();
textBlock.Visibility = Visibility.Collapsed;
};
Timer.Start();
}
public void MPDDatabaseUpdate_Start()
{
UpdateDBMessage.Visibility = Visibility.Visible;
}
public void MPDDatabaseUpdate_Stop()
{
UpdateDBMessage2.Visibility = Visibility.Visible;
TimedText(UpdateDBMessage, 2);
TimedText(UpdateDBMessage2, 2);
}
private void CheckUpdates(object sender, RoutedEventArgs e)
{
UpdateHandler updater = (UpdateHandler)Application.Current.Properties["updater"];
updater.Start(true);
}
public void UpdateUpdateStatus(string version)
{
UpdateText.Visibility = Visibility.Visible;
UpdateText2.Text = unison.Resources.Resources.Update_String1 + " " + version + " " + unison.Resources.Resources.Update_String2;
UpdateButton.Content = unison.Resources.Resources.Update_ButtonStart;
}
private void Window_Closing(object sender, CancelEventArgs e)
{
e.Cancel = true;
@ -382,7 +331,7 @@ namespace unison
HotkeyChanged();
}
private static HotkeyHandler.VK GetVirtualKey(Key key)
private HotkeyHandler.VK GetVirtualKey(Key key)
{
foreach (object value in System.Enum.GetValues(typeof(HotkeyHandler.VK)))
{
@ -392,7 +341,7 @@ namespace unison
return HotkeyHandler.VK.None;
}
private static HotkeyHandler.MOD GetMOD(string str)
private HotkeyHandler.MOD GetMOD(string str)
{
foreach (object value in System.Enum.GetValues(typeof(HotkeyHandler.MOD)))
{
@ -424,12 +373,12 @@ namespace unison
InitializeShortcuts();
}
private static uint GetMod(StackPanel stackPanel)
public uint GetMod(StackPanel stackPanel)
{
return (uint)(GetMOD(stackPanel.Children.OfType<ComboBox>().First().SelectedItem.ToString()) | GetMOD(stackPanel.Children.OfType<ComboBox>().Last().SelectedItem.ToString()));
}
private static uint GetVk(StackPanel stackPanel)
public uint GetVk(StackPanel stackPanel)
{
Button button = stackPanel.Children.OfType<Button>().First();
TextBlock textBlock = (TextBlock)button.Content;

58
Views/Shuffle.xaml
View File

@ -4,30 +4,30 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
xmlns:properties="clr-namespace:unison.Resources" xmlns:sys="clr-namespace:System;assembly=System.Runtime"
xmlns:local="clr-namespace:unison" xmlns:sys="clr-namespace:System;assembly=System.Runtime"
mc:Ignorable="d"
Title="Shuffle" Closing="Window_Closing" SizeToContent="WidthAndHeight" ResizeMode="NoResize">
<Window.Resources>
<x:Array x:Key="FilterType" Type="sys:String">
<x:Static Member="properties:Resources.FilterType_Song"/>
<x:Static Member="properties:Resources.FilterType_Artist"/>
<x:Static Member="properties:Resources.FilterType_Album"/>
<x:Static Member="properties:Resources.FilterType_Year"/>
<x:Static Member="properties:Resources.FilterType_Genre"/>
<x:Static Member="properties:Resources.FilterType_Directory"/>
<sys:String>Song</sys:String>
<sys:String>Artist</sys:String>
<sys:String>Album</sys:String>
<sys:String>Year</sys:String>
<sys:String>Genre</sys:String>
<sys:String>Directory</sys:String>
</x:Array>
<x:Array x:Key="OperatorTypeA" Type="sys:String">
<x:Static Member="properties:Resources.Operator_Contains"/>
<x:Static Member="properties:Resources.Operator_Is"/>
<x:Static Member="properties:Resources.Operator_IsNot"/>
<sys:String>contains</sys:String>
<sys:String>is</sys:String>
<sys:String>is not</sys:String>
</x:Array>
<x:Array x:Key="OperatorTypeB" Type="sys:String">
<x:Static Member="properties:Resources.Operator_Is"/>
<x:Static Member="properties:Resources.Operator_IsNot"/>
<sys:String>is</sys:String>
<sys:String>is not</sys:String>
</x:Array>
<x:Array x:Key="OperatorTypeC" Type="sys:String">
<x:Static Member="properties:Resources.Operator_Is"/>
<sys:String>is</sys:String>
</x:Array>
<DataTemplate x:Key="FilterPanel">
@ -35,7 +35,7 @@
<ComboBox x:Name="FilterType" SelectionChanged="FilterType_SelectionChanged" ItemsSource="{StaticResource FilterType}" SelectedIndex="0" Width="100" ScrollViewer.CanContentScroll="False" FocusVisualStyle="{x:Null}"/>
<ComboBox x:Name="FilterOperator" SelectionChanged="OperatorType_SelectionChanged" ItemsSource="{StaticResource OperatorTypeA}" SelectedIndex="0" Width="80" ScrollViewer.CanContentScroll="False" Margin="5,0,0,0" FocusVisualStyle="{x:Null}"/>
<ComboBox x:Name="FilterList" SelectedIndex="0" Width="240" Visibility="Collapsed" ScrollViewer.CanContentScroll="False" Margin="5,0,0,0" FocusVisualStyle="{x:Null}"/>
<TextBox x:Name="FilterValue" KeyUp="QueryFilterHandler" Width="240" Margin="5,0,0,0"/>
<TextBox x:Name="FilterValue" Width="240" Margin="5,0,0,0"/>
<Button Content="-" Padding="5, 2" Click="RemoveFilter_Clicked" Width="20" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
<Button Content="+" Padding="5, 2" Click="AddFilter_Clicked" Width="20" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
</StackPanel>
@ -49,7 +49,7 @@
<GroupBox.Header>
<TextBlock>
<emoji:EmojiInline Text="🔡"/>
<Run Text="{x:Static properties:Resources.Shuffle_Filter}"/>
<Run Text="Filter"/>
</TextBlock>
</GroupBox.Header>
<StackPanel Orientation="Vertical" Margin="5,0,5,0">
@ -60,16 +60,15 @@
<StackPanel x:Name="SongFilterPanel" Margin="0,10,0,0">
<TextBlock>
<Run Text="{x:Static properties:Resources.Shuffle_FilterSongNumber}"/><Run Text=" "/><Run x:Name="SongFilterNumber" FontWeight="Bold"/>
<Run Text="Number of songs in filter: "/><Run x:Name="SongFilterNumber" FontWeight="Bold"/>
</TextBlock>
</StackPanel>
<StackPanel Margin="0,5,0,0">
<StackPanel Orientation="Horizontal" Margin="0,5,0,5">
<Button Content="{x:Static properties:Resources.Shuffle_FilterQuery}" Click="UpdateFilter_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="0,0,10,0"/>
<Button Content="{x:Static properties:Resources.Shuffle_FilterReset}" Click="Reset_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
<TextBlock x:Name="QueryFilterText" Text="{x:Static properties:Resources.Shuffle_Querying1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<TextBlock x:Name="QueryFilterText2" Text="{x:Static properties:Resources.Shuffle_Querying2}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
<Button Content="Query filter" Click="UpdateFilter_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="0,0,10,0"/>
<Button Content="Reset" Click="Reset_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
<TextBlock Text="Querying filter..." Margin="15,3,0,0" FontStyle="Italic" Visibility="Visible" />
</StackPanel>
</StackPanel>
</StackPanel>
@ -77,38 +76,37 @@
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
<GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="300">
<GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="248">
<GroupBox.Header>
<TextBlock>
<emoji:EmojiInline Text="➕"/>
<Run Text="{x:Static properties:Resources.Shuffle_Queue}"/>
<Run Text="Add to queue"/>
</TextBlock>
</GroupBox.Header>
<StackPanel Orientation="Vertical" Margin="5,5,5,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Text="{x:Static properties:Resources.Shuffle_QueueSongs}" Margin="0,0,5,5"/>
<TextBox x:Name="SongNumber" KeyUp="AddToQueueHandler" PreviewTextInput="QueueValidationTextBox" MaxLength="4" Text="15" Width="35" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<TextBlock Text="Songs to add" Margin="0,0,5,5"/>
<TextBox x:Name="SongNumber" PreviewTextInput="QueueValidationTextBox" MaxLength="4" Text="15" Width="35" HorizontalAlignment="Left" VerticalAlignment="Top"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
<Button Content="{x:Static properties:Resources.Shuffle_Queue}" Click="AddToQueue_Clicked" Padding="5, 2" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
<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="{x:Static properties:Resources.Shuffle_ButtonMessage1}"/><Run Text=" "/><Run x:Name="NumberAddedSongs"/><Run Text=" "/><Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage2}"/>
<Run Text="Added "/><Run x:Name="NumberAddedSongs"/><Run Text=" songs"/>
</TextBlock>
<TextBlock x:Name="SearchStatus2" Text="{x:Static properties:Resources.Shuffle_ButtonMessage3}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed"/>
</StackPanel>
</StackPanel>
</GroupBox>
<GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="260" Margin="0,0,5,0">
<GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="248" Margin="0,0,5,0">
<GroupBox.Header>
<TextBlock>
<emoji:EmojiInline Text="♾️"/>
<Run Text="{x:Static properties:Resources.Shuffle_Continuous}"/>
<Run Text="Continuous shuffle"/>
</TextBlock>
</GroupBox.Header>
<StackPanel Orientation="Horizontal" Margin="5,7,5,0">
<CheckBox x:Name="ContinuousShuffle" Checked="ContinuousShuffle_Checked" Unchecked="ContinuousShuffle_Checked" FocusVisualStyle="{x:Null}" VerticalAlignment="Top">
<TextBlock Text="{x:Static properties:Resources.Shuffle_ContinuousEnable}" TextWrapping="Wrap"/>
<TextBlock Text="Enable continuous shuffle" TextWrapping="Wrap"/>
</CheckBox>
</StackPanel>
</GroupBox>

350
Views/Shuffle.xaml.cs
View File

@ -1,40 +1,37 @@
using System;
using MpcNET.Commands.Database;
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.Controls;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Input;
using System.Windows.Threading;
using System.Linq;
using System.Windows.Input;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using MpcNET.Commands.Database;
using MpcNET.Tags;
using MpcNET.Types;
using MpcNET.Types.Filters;
namespace unison
{
public partial class Shuffle : Window
{
private readonly MPDHandler _mpd;
private readonly ShuffleHandler _shuffle;
List<string> GenreList { get; }
List<string> FolderList { get; }
List<IFilter> Filters { get; }
private MPDHandler _mpd;
private ShuffleHandler _shuffle;
bool _continuous = false;
List<string> _genreList { get; }
List<string> _folderList { get; }
List<IFilter> _filters { get; }
public Shuffle()
{
InitializeComponent();
GenreList = new();
FolderList = new();
Filters = new();
_genreList = new();
_folderList = new();
_filters = new();
SongFilterNumber.Text = "0";
_mpd = (MPDHandler)Application.Current.Properties["mpd"];
@ -43,16 +40,13 @@ namespace unison
public void Initialize()
{
ListGenre(_mpd._cancelCommand.Token);
ListFolder(_mpd._cancelCommand.Token);
ListGenre();
ListFolder();
}
private async void ListGenre(CancellationToken token)
public async void ListGenre()
{
if (GenreList.Count != 0)
return;
if (token.IsCancellationRequested)
if (_genreList.Count != 0)
return;
List<string> Response = await _mpd.SafelySendCommandAsync(new ListCommand(MpdTags.Genre, null, null));
@ -61,15 +55,12 @@ namespace unison
return;
foreach (string genre in Response)
GenreList.Add(genre);
_genreList.Add(genre);
}
private async void ListFolder(CancellationToken token)
public async void ListFolder()
{
if (FolderList.Count != 0)
return;
if (token.IsCancellationRequested)
if (_folderList.Count != 0)
return;
IEnumerable<IMpdFilePath> Response = await _mpd.SafelySendCommandAsync(new LsInfoCommand(""));
@ -78,16 +69,34 @@ namespace unison
return;
foreach (IMpdFilePath folder in Response)
FolderList.Add(folder.Name);
_folderList.Add(folder.Name);
}
private bool IsFilterEmpty()
{
if (Filters.Count == 0)
if (_filters.Count() == 0)
return true;
return false;
}
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 bool IsOnMainThread()
{
return App.Current.Dispatcher.Thread == System.Threading.Thread.CurrentThread;
}
private T FindParent<T>(DependencyObject child) where T : DependencyObject
{
var parent = VisualTreeHelper.GetParent(child);
@ -121,35 +130,94 @@ namespace unison
FilterPanel.Children.RemoveRange(0, FilterPanel.Children.Count);
FilterPanel.Children.Add(new ContentPresenter { ContentTemplate = (DataTemplate)FindResource("FilterPanel") });
SongFilterNumber.Text = "0";
_shuffle.SongList.Clear();
_shuffle._songList.Clear();
}
private static ITag FilterEquivalence_Type(string value)
private ITag FilterEquivalence_Type(string value)
{
if (value == unison.Resources.Resources.FilterType_Song)
if (value == "Song")
return MpdTags.Title;
else if (value == unison.Resources.Resources.FilterType_Artist)
else if (value == "Artist")
return MpdTags.Artist;
else if (value == unison.Resources.Resources.FilterType_Album)
else if (value == "Album")
return MpdTags.Album;
else if (value == unison.Resources.Resources.FilterType_Year)
else if (value == "Year")
return MpdTags.Date;
else if (value == unison.Resources.Resources.FilterType_Genre)
else if (value == "Genre")
return MpdTags.Genre;
return MpdTags.Title;
}
private static FilterOperator FilterEquivalence_Operator(string value)
private FilterOperator FilterEquivalence_Operator(string value)
{
if (value == unison.Resources.Resources.Operator_Contains)
if (value == "contains")
return FilterOperator.Contains;
else if (value == unison.Resources.Resources.Operator_Is)
else if (value == "is")
return FilterOperator.Equal;
else if (value == unison.Resources.Resources.Operator_IsNot)
else if (value == "is not")
return FilterOperator.Different;
return FilterOperator.Equal;
}
private async void UpdateFilter_Clicked(object sender, RoutedEventArgs e)
{
await UpdateFilter();
}
private async Task UpdateFilter()
{
Debug.WriteLine("update filter => start");
_filters.Clear();
Debug.WriteLine("is on main thread => " + IsOnMainThread());
foreach (ContentPresenter superChild in FilterPanel.Children)
{
ITag tag = MpdTags.Title;
FilterOperator op = FilterOperator.None;
string value = "";
bool isDir = false;
StackPanel stackPanel = VisualTreeHelper.GetChild(superChild, 0) as StackPanel;
foreach (TextBox child in stackPanel.Children.OfType<TextBox>())
{
if (child.Name == "FilterValue")
value = child.Text;
}
foreach (ComboBox child in stackPanel.Children.OfType<ComboBox>())
{
if (child.Name == "FilterType")
{
if (child.SelectedItem.ToString() == "Directory")
isDir = true;
else
tag = FilterEquivalence_Type(child.SelectedItem.ToString());
}
if (child.Name == "FilterOperator")
op = FilterEquivalence_Operator(child.SelectedItem.ToString());
if (child.Name == "FilterList" && child.Visibility == Visibility.Visible)
value = child.SelectedItem.ToString();
}
if (value != "")
{
if (!isDir)
_filters.Add(new FilterTag(tag, value, op));
else
_filters.Add(new FilterBase(value, FilterOperator.None));
await _shuffle.GetSongsFromFilter(_filters);
SongFilterPanel.Visibility = Visibility.Visible;
SongFilterNumber.Text = _shuffle._songList.Count.ToString();
}
}
Debug.WriteLine("update filter => stop");
}
private void FilterType_Change(object sender, string Operator, List<string> Listing)
{
ComboBox comboBox = sender as ComboBox;
@ -180,10 +248,10 @@ namespace unison
private void FilterType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
string item = e.AddedItems[0].ToString();
if (item == unison.Resources.Resources.FilterType_Genre)
FilterType_Change(sender, "OperatorTypeB", GenreList);
else if (item == unison.Resources.Resources.FilterType_Directory)
FilterType_Change(sender, "OperatorTypeC", FolderList);
if (item == "Genre")
FilterType_Change(sender, "OperatorTypeB", _genreList);
else if (item == "Directory")
FilterType_Change(sender, "OperatorTypeC", _folderList);
else
{
ComboBox combobox = sender as ComboBox;
@ -210,90 +278,10 @@ namespace unison
private void OperatorType_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
Debug.WriteLine("selection changed => operator type");
SongFilterNumber.Text = "0";
}
private async void UpdateFilter_Clicked(object sender, RoutedEventArgs e)
{
QueryFilterText.Visibility = Visibility.Visible;
await UpdateFilter();
QueryFilterText2.Visibility = Visibility.Visible;
TimedText(QueryFilterText, 1);
TimedText(QueryFilterText2, 1);
}
private static void TimedText(TextBlock textBlock, int time)
{
DispatcherTimer Timer = new DispatcherTimer();
Timer.Interval = TimeSpan.FromSeconds(time);
Timer.Tick += (sender, args) =>
{
Timer.Stop();
textBlock.Visibility = Visibility.Collapsed;
};
Timer.Start();
}
private async Task UpdateFilter()
{
Filters.Clear();
foreach (ContentPresenter superChild in FilterPanel.Children)
{
ITag tag = MpdTags.Title;
FilterOperator op = FilterOperator.None;
string value = "";
bool isDir = false;
StackPanel stackPanel = VisualTreeHelper.GetChild(superChild, 0) as StackPanel;
foreach (TextBox child in stackPanel.Children.OfType<TextBox>())
{
if (child.Name == "FilterValue")
value = child.Text;
}
foreach (ComboBox child in stackPanel.Children.OfType<ComboBox>())
{
if (child.Name == "FilterType")
{
if (child.SelectedItem.ToString() == unison.Resources.Resources.FilterType_Directory)
isDir = true;
else
tag = FilterEquivalence_Type(child.SelectedItem.ToString());
}
if (child.Name == "FilterOperator")
op = FilterEquivalence_Operator(child.SelectedItem.ToString());
if (child.Name == "FilterList" && child.Visibility == Visibility.Visible)
value = child.SelectedItem.ToString();
}
if (value != "")
{
if (!isDir)
Filters.Add(new FilterTag(tag, value, op));
else
Filters.Add(new FilterBase(value, FilterOperator.None));
await Task.Run(async () =>
{
await _shuffle.GetSongsFromFilter(Filters, _mpd._cancelCommand.Token);
});
SongFilterPanel.Visibility = Visibility.Visible;
SongFilterNumber.Text = _shuffle.SongList.Count.ToString();
}
}
}
private void QueryFilterHandler(object sender, KeyEventArgs e)
{
if (e.Key == Key.Return)
UpdateFilter_Clicked(null, null);
}
private void QueueValidationTextBox(object sender, TextCompositionEventArgs e)
{
Regex regex = new Regex("[^0-9]+");
@ -302,77 +290,48 @@ namespace unison
private void QueueValidationNumber()
{
int Number;
try
{
Number = int.Parse(SongNumber.Text);
}
catch (Exception)
{
return;
}
if (Number < 1)
if (int.Parse(SongNumber.Text) < 1)
SongNumber.Text = "1";
if (IsFilterEmpty())
{
if (Number > 100)
SongNumber.Text = "100";
}
else
{
if (Number > 1000)
if (int.Parse(SongNumber.Text) > 1000)
SongNumber.Text = "1000";
}
}
private async void AddToQueue()
private async void AddToQueue_Clicked(object sender, RoutedEventArgs e)
{
QueueValidationNumber();
if (_mpd.GetStats() == null)
return;
await UpdateFilter();
QueueValidationNumber();
NumberAddedSongs.Text = SongNumber.Text;
NumberAddedSongs.Text = "0";
SearchStatus.Visibility = Visibility.Visible;
int Num = int.Parse(SongNumber.Text);
await AddToQueue_Internal(Num);
// start dispatcher
// write _shuffle.AddedSongs in dispatcher
SearchStatus2.Visibility = Visibility.Visible;
await AddToQueue(int.Parse(SongNumber.Text));
TimedText(SearchStatus, 2);
TimedText(SearchStatus2, 2);
Debug.WriteLine("add to queue finished");
SearchStatus.Visibility = Visibility.Collapsed;
}
private async Task AddToQueue_Internal(int Num)
private async Task AddToQueue(int NumberToAdd)
{
await UpdateFilter();
Debug.WriteLine("check filters");
if (IsFilterEmpty())
{
await Task.Run(async () =>
{
await _shuffle.AddToQueueRandom(Num, _mpd._cancelCommand.Token);
});
}
await _shuffle.AddToQueueRandom(NumberToAdd);
else
{
await Task.Run(async () =>
{
await _shuffle.AddToQueueFilter(Num, _mpd._cancelCommand.Token);
});
}
Debug.WriteLine("add to queue filter - before");
await _shuffle.AddToQueueFilter(NumberToAdd);
Debug.WriteLine("add to queue filter - after");
}
private void AddToQueueHandler(object sender, KeyEventArgs e)
{
if (e.Key == Key.Return)
AddToQueue();
}
private void AddToQueue_Clicked(object sender, RoutedEventArgs e)
{
AddToQueue();
Debug.WriteLine("add to queue finished");
}
public bool GetContinuous()
@ -383,16 +342,14 @@ namespace unison
public async Task HandleContinuous()
{
if (!_continuous)
{
Debug.WriteLine("continuous return nothing!");
return;
}
int PlaylistLength = _mpd.GetStatus().PlaylistLength;
int Num = 50 - PlaylistLength;
if (PlaylistLength > 25)
return;
await UpdateFilter();
await AddToQueue_Internal(Num);
Debug.WriteLine("continuous __before__ add to queue");
await AddToQueue(5);
Debug.WriteLine("continuous __after__ add to queue");
}
private async void ContinuousShuffle_Checked(object sender, RoutedEventArgs e)
@ -402,21 +359,8 @@ namespace unison
else
_continuous = false;
if (_mpd.GetStatus().PlaylistLength < 10)
if (_mpd.GetStatus().PlaylistLength < 5)
await HandleContinuous();
}
private void Window_Closing(object sender, CancelEventArgs e)
{
e.Cancel = true;
WindowState = WindowState.Minimized;
Hide();
}
public void InitHwnd()
{
WindowInteropHelper helper = new(this);
helper.EnsureHandle();
}
}
}

8
Views/SystrayViewModel.cs
View File

@ -32,7 +32,7 @@ namespace unison
CanExecuteFunc = () => true
};
public static string SnapcastText
public string SnapcastText
{
get
{
@ -59,7 +59,7 @@ namespace unison
}
}
public static ICommand Radios
public ICommand Radios
{
get
{
@ -71,7 +71,7 @@ namespace unison
}
}
public static ICommand Shuffle
public ICommand Shuffle
{
get
{
@ -83,7 +83,7 @@ namespace unison
}
}
public static ICommand Settings
public ICommand Settings
{
get
{

5
unison.csproj
View File

@ -7,7 +7,7 @@
<ApplicationIcon>Resources\icon-full.ico</ApplicationIcon>
<Win32Resource></Win32Resource>
<StartupObject>unison.App</StartupObject>
<Version>1.4</Version>
<Version>1.3.1</Version>
<Company />
<Authors>Théo Marchal</Authors>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@ -52,8 +52,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.7.6" />
<PackageReference Include="Emoji.Wpf" Version="0.3.4" />
<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.4.0" />