keb/unison
1
0
Fork 0
Code Releases 7 Activity

Working mpd handling, even if I'm not a big fan of it

Browse Source
This commit is contained in:
Théo Marchal
2021-08-19 22:00:25 +02:00
parent 5d29938589
commit 0bc80ef23b
8 changed files with 294 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MPDCtrl/BinaryDownloader.cs
View File

@ -103,19 +103,22 @@ namespace MPDCtrl.Models
string response = await _binaryReader.ReadLineAsync();
if (response.StartsWith("OK MPD "))
if (response != null)
{
MpdVersion = response.Replace("OK MPD ", string.Empty).Trim();
if (response.StartsWith("OK MPD "))
{
MpdVersion = response.Replace("OK MPD ", string.Empty).Trim();
//Debug.WriteLine("TCP Binary Connection: Connected. MPD " + VerText);
//Debug.WriteLine("TCP Binary Connection: Connected. MPD " + VerText);
//DebugCommandOutput?.Invoke(this, "<<<<" + response.Trim() + "\n" + "\n");
//DebugCommandOutput?.Invoke(this, "<<<<" + response.Trim() + "\n" + "\n");
//IsMpdCommandConnected = true;
//IsMpdCommandConnected = true;
result.IsSuccess = true;
result.IsSuccess = true;
// Done for now.
// Done for now.
}
}
else
{

94
MPDCtrl/MPC.cs
View File

@ -10,6 +10,7 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media.Imaging;
using unison;
namespace MPDCtrl.Models
{
@ -188,8 +189,8 @@ namespace MPDCtrl.Models
public delegate void MpdCurrentQueueChangedEvent(MPC sender);
public event MpdCurrentQueueChangedEvent MpdCurrentQueueChanged;
public delegate void MpdPlaylistsChangedEvent(MPC sender);
public event MpdPlaylistsChangedEvent MpdPlaylistsChanged;
//public delegate void MpdPlaylistsChangedEvent(MPC sender);
//public event MpdPlaylistsChangedEvent MpdPlaylistsChanged;
public delegate void MpdAlbumArtChangedEvent(MPC sender);
public event MpdAlbumArtChangedEvent MpdAlbumArtChanged;
@ -920,7 +921,7 @@ namespace MPDCtrl.Models
{
bool isPlayer = false;
bool isCurrentQueue = false;
bool isStoredPlaylist = false;
//bool isStoredPlaylist = false;
foreach (string line in SubSystems)
{
@ -947,7 +948,7 @@ namespace MPDCtrl.Models
if (line.ToLower() == "changed: stored_playlist")
{
// stored_playlist: a stored playlist has been modified, renamed, created or deleted
isStoredPlaylist = true;
//isStoredPlaylist = true;
}
}
@ -960,7 +961,18 @@ namespace MPDCtrl.Models
}
}
// custom test
if (isCurrentQueue)
{
CommandResult idleResult = await MpdIdleQueryCurrentSong();
if (idleResult.IsSuccess)
{
MpdCurrentQueueChanged?.Invoke(this);
}
}
// takes lot of time
/*if (isCurrentQueue)
{
CommandResult idleResult = await MpdIdleQueryCurrentQueue();
if (idleResult.IsSuccess)
@ -976,7 +988,7 @@ namespace MPDCtrl.Models
{
MpdPlaylistsChanged?.Invoke(this);
}
}
}*/
//MpcProgress?.Invoke(this, "");
@ -2609,15 +2621,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Exception@ParseStatus:" + ex.Message);
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParseStatus", ex.Message);*/
});
}
IsBusy?.Invoke(this, false);
return Task.FromResult(false);
}
@ -2696,15 +2699,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Error@ParseCurrentSong: " + ex.Message);
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParseCurrentSong", ex.Message);*/
});
}
return Task.FromResult(false);
}
finally
@ -2917,15 +2911,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Exception@ParsePlaylistInfo: " + ex.Message);
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParsePlaylistInfo", ex.Message);*/
});
}
return Task.FromResult(false);
}
finally
@ -3069,15 +3054,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Error@FillSongInfoEx: " + e.ToString());
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@FillSongInfoEx", e.Message);*/
});
}
return null;
}
}
@ -3182,15 +3158,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Error@ParsePlaylists: " + e.ToString());
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParsePlaylists", e.Message);*/
});
}
IsBusy?.Invoke(this, false);
return Task.FromResult(false);
}
@ -3277,15 +3244,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Error@ParseListAll: " + e.ToString());
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParseListAll", e.Message);*/
});
}
IsBusy?.Invoke(this, false);
return Task.FromResult(false); ;
}
@ -3424,15 +3382,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Error@ParseSearchResult: " + ex.Message);
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParseSearchResult", ex.Message);*/
});
}
IsBusy?.Invoke(this, false);
return Task.FromResult(false);
}
@ -3565,15 +3514,6 @@ namespace MPDCtrl.Models
{
Debug.WriteLine("Error@ParsePlaylistSongsResult: " + ex.Message);
if (Application.Current != null)
{
Application.Current.Dispatcher.Invoke(() =>
{
/*App app = App.Current as App;
app.AppendErrorLog("Exception@MPC@ParsePlaylistSongsResult", ex.Message);*/
});
}
return songList;
}