1
0
mirror of https://github.com/ZetaKebab/MpcNET.git synced 2024-09-16 05:30:09 +00:00

Major refactoring

This commit is contained in:
Kim Hugener-Ohlsen 2018-05-18 15:14:20 +02:00
parent 245efd6477
commit 12ddc4bca4
99 changed files with 426 additions and 419 deletions

2
.gitignore vendored
View File

@ -20,3 +20,5 @@
/Sources/MpcNET/bin/Debug/netstandard2.0
/Sources/MpcNET/obj
/Sources/MpcNET.Test/obj
/Sources/MpcNET/bin
/Sources/MpcNET.Test/bin/Debug/netcoreapp2.0

View File

@ -1,10 +1,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace MpcNET.Test
namespace MpcNET.Test
{
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
public partial class LibMpcTest
{
@ -25,29 +25,34 @@ namespace MpcNET.Test
_mpdMock.Dispose();
}
internal static Mpc Mpc { get; private set; }
internal static MpcConnection Mpc { get; private set; }
private static async Task SendCommand(string command)
{
var response = await Mpc.SendAsync(new PassthroughCommand(command));
var response = await Mpc.SendAsync(_ => new PassthroughCommand(command));
TestOutput.WriteLine(response);
}
private static async Task SendCommand<T>(IMpcCommand<T> command)
{
var response = await Mpc.SendAsync(command);
var response = await Mpc.SendAsync(_ => command);
TestOutput.WriteLine(response);
}
private class PassthroughCommand : IMpcCommand<IList<string>>
{
private readonly string command;
public PassthroughCommand(string command)
{
Value = command;
this.command = command;
}
public string Value { get; }
public string Serialize()
{
return this.command;
}
public IList<string> FormatResponse(IList<KeyValuePair<string, string>> response)
public IList<string> Deserialize(IReadOnlyList<KeyValuePair<string, string>> response)
{
var result = response.Select(atrb => $"{atrb.Key}: {atrb.Value}").ToList();
return result;

View File

@ -1,25 +1,25 @@
using System;
using System.Net;
using System.Threading.Tasks;
namespace MpcNET.Test
{
using System;
using System.Net;
using System.Threading.Tasks;
public class MpcMock : IDisposable
{
public MpcMock()
{
var mpdEndpoint = new IPEndPoint(IPAddress.Loopback, 6600);
Client = new Mpc(mpdEndpoint);
this.Client = new MpcConnection(mpdEndpoint);
var connected = Task.Run(async () => await Client.ConnectAsync()).Result;
TestOutput.WriteLine($"Connected to MPD : {connected}; Version: {Client.Version}");
Task.Run(async () => await this.Client.ConnectAsync()).Wait();
TestOutput.WriteLine($"Connected to MPD Version: {this.Client.Version}");
}
public Mpc Client { get; }
public MpcConnection Client { get; }
public void Dispose()
{
Client?.DisconnectAsync().GetAwaiter().GetResult();
this.Client?.DisconnectAsync().GetAwaiter().GetResult();
TestOutput.WriteLine($"Disconnected from MPD.");
}
}

View File

@ -24,9 +24,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
</ItemGroup>
<ItemGroup>

View File

@ -1,8 +1,8 @@
using System.IO;
using System.Text;
namespace MpcNET.Test
{
using System.IO;
using System.Text;
public class MpdConf
{
private const string MPD_CONF_FILE = "mpd.conf";

View File

@ -1,24 +1,24 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
namespace MpcNET.Test
{
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
public class MpdMock : IDisposable
{
public void Start()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
SendCommand("/usr/bin/pkill mpd");
this.SendCommand("/usr/bin/pkill mpd");
}
MpdConf.Create(Path.Combine(AppContext.BaseDirectory, "Server"));
var server = GetServer();
var server = this.GetServer();
Process = new Process
this.Process = new Process
{
StartInfo = new ProcessStartInfo
{
@ -32,15 +32,15 @@ namespace MpcNET.Test
}
};
TestOutput.WriteLine($"Starting Server: {Process.StartInfo.FileName} {Process.StartInfo.Arguments}");
TestOutput.WriteLine($"Starting Server: {this.Process.StartInfo.FileName} {this.Process.StartInfo.Arguments}");
Process.Start();
TestOutput.WriteLine($"Output: {Process.StandardOutput.ReadToEnd()}");
TestOutput.WriteLine($"Error: {Process.StandardError.ReadToEnd()}");
this.Process.Start();
TestOutput.WriteLine($"Output: {this.Process.StandardOutput.ReadToEnd()}");
TestOutput.WriteLine($"Error: {this.Process.StandardError.ReadToEnd()}");
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
SendCommand("/bin/netstat -ntpl");
this.SendCommand("/bin/netstat -ntpl");
}
}
@ -87,8 +87,8 @@ namespace MpcNET.Test
public void Dispose()
{
Process?.Kill();
Process?.Dispose();
this.Process?.Kill();
this.Process?.Dispose();
TestOutput.WriteLine("Server Stopped.");
}
@ -106,9 +106,9 @@ namespace MpcNET.Test
private Server(string fileName, string workingDirectory, string arguments)
{
FileName = fileName;
WorkingDirectory = workingDirectory;
Arguments = arguments;
this.FileName = fileName;
this.WorkingDirectory = workingDirectory;
this.Arguments = arguments;
}
public string FileName { get; }

View File

@ -1,8 +1,8 @@
using System;
using MpcNET.Message;
namespace MpcNET.Test
namespace MpcNET.Test
{
using System;
using MpcNET.Message;
internal static class TestOutput
{
internal static void WriteLine(string value)

View File

@ -1,33 +1,33 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
using MpcNET.Tags;
namespace MpcNET.Test
{
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
using MpcNET.Tags;
public partial class LibMpcTest
{
[TestMethod]
public async Task ListAllTest()
{
var response = await Mpc.SendAsync(Command.Database.ListAll());
var response = await Mpc.SendAsync(commands => commands.Database.ListAll());
TestOutput.WriteLine("ListAllTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(7));
Assert.IsTrue(response.Response.Content.Count().Equals(7));
}
[TestMethod]
public async Task FindGenreTest()
{
var response = await Mpc.SendAsync(Command.Database.Find(MpdTags.Genre, "soundfx"));
var response = await Mpc.SendAsync(commands => commands.Database.Find(MpdTags.Genre, "soundfx"));
TestOutput.WriteLine("FindGenreTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(7));
Assert.IsTrue(response.Response.Content.Count().Equals(7));
}
}
}

View File

@ -1,16 +1,16 @@
using MpcNET.Message;
namespace MpcNET.Test
{
using MpcNET.Message;
public static class MpdMessageExtension
{
public static bool HasSuccessResponse<T>(this IMpdMessage<T> message)
{
return message.Response.State.Connected &&
message.Response.State.Status == "OK" &&
!message.Response.State.Error &&
message.Response.State.ErrorMessage == string.Empty &&
message.Response.State.MpdError == string.Empty;
return message.Response.Result.Connected &&
message.Response.Result.Status == "OK" &&
!message.Response.Result.Error &&
message.Response.Result.ErrorMessage == string.Empty &&
message.Response.Result.MpdError == string.Empty;
}
}
}

View File

@ -1,76 +1,75 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
namespace MpcNET.Test
{
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
public partial class LibMpcTest
{
[TestMethod]
public async Task DisableOutputTest()
{
var responseOutputs = await Mpc.SendAsync(Command.Output.Outputs());
Assert.IsTrue(responseOutputs.Response.Body.Single(output => output.Id.Equals(0)).IsEnabled);
var responseOutputs = await Mpc.SendAsync(commands => commands.Output.Outputs());
Assert.IsTrue(responseOutputs.Response.Content.Single(output => output.Id.Equals(0)).IsEnabled);
var response = await Mpc.SendAsync(Command.Output.DisableOutput(0));
var response = await Mpc.SendAsync(commands => commands.Output.DisableOutput(0));
TestOutput.WriteLine("DisableOutputTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Equals(string.Empty));
Assert.IsTrue(response.Response.State.Status.Equals("OK"));
Assert.IsTrue(response.Response.Content.Equals(string.Empty));
Assert.IsTrue(response.Response.Result.Status.Equals("OK"));
responseOutputs = await Mpc.SendAsync(Command.Output.Outputs());
Assert.IsFalse(responseOutputs.Response.Body.Single(output => output.Id.Equals(0)).IsEnabled);
responseOutputs = await Mpc.SendAsync(c => c.Output.Outputs());
Assert.IsFalse(responseOutputs.Response.Content.Single(output => output.Id.Equals(0)).IsEnabled);
}
[TestMethod]
public async Task EnableOutputTest()
{
var responseOutputs = await Mpc.SendAsync(Command.Output.Outputs());
var responseOutputs = await Mpc.SendAsync(commands => commands.Output.Outputs());
// By default should be disable from mpd.config
Assert.IsFalse(responseOutputs.Response.Body.Single(output => output.Id.Equals(1)).IsEnabled);
Assert.IsFalse(responseOutputs.Response.Content.Single(output => output.Id.Equals(1)).IsEnabled);
var response = await Mpc.SendAsync(Command.Output.EnableOutput(1));
var response = await Mpc.SendAsync(commands => commands.Output.EnableOutput(1));
TestOutput.WriteLine("EnableOutputTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Equals(string.Empty));
Assert.IsTrue(response.Response.State.Status.Equals("OK"));
Assert.IsTrue(response.Response.Content.Equals(string.Empty));
Assert.IsTrue(response.Response.Result.Status.Equals("OK"));
responseOutputs = await Mpc.SendAsync(Command.Output.Outputs());
Assert.IsTrue(responseOutputs.Response.Body.Single(output => output.Id.Equals(1)).IsEnabled);
responseOutputs = await Mpc.SendAsync(commands => commands.Output.Outputs());
Assert.IsTrue(responseOutputs.Response.Content.Single(output => output.Id.Equals(1)).IsEnabled);
}
[TestMethod]
public async Task ToggleOutputTest()
{
var responseOutputs = await Mpc.SendAsync(Command.Output.Outputs());
Assert.IsTrue(responseOutputs.Response.Body.Single(output => output.Id.Equals(2)).IsEnabled);
var responseOutputs = await Mpc.SendAsync(commands => commands.Output.Outputs());
Assert.IsTrue(responseOutputs.Response.Content.Single(output => output.Id.Equals(2)).IsEnabled);
var response = await Mpc.SendAsync(Command.Output.ToggleOutput(2));
var response = await Mpc.SendAsync(commands => commands.Output.ToggleOutput(2));
TestOutput.WriteLine("ToggleOutputTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Equals(string.Empty));
Assert.IsTrue(response.Response.State.Status.Equals("OK"));
Assert.IsTrue(response.Response.Content.Equals(string.Empty));
Assert.IsTrue(response.Response.Result.Status.Equals("OK"));
responseOutputs = await Mpc.SendAsync(Command.Output.Outputs());
Assert.IsFalse(responseOutputs.Response.Body.Single(output => output.Id.Equals(2)).IsEnabled);
responseOutputs = await Mpc.SendAsync(commands => commands.Output.Outputs());
Assert.IsFalse(responseOutputs.Response.Content.Single(output => output.Id.Equals(2)).IsEnabled);
}
[TestMethod]
public async Task LisOutputsTest()
{
var response = await Mpc.SendAsync(Command.Output.Outputs());
var response = await Mpc.SendAsync(commands => commands.Output.Outputs());
TestOutput.WriteLine("LisOutputsTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(3));
Assert.IsTrue(response.Response.Content.Count().Equals(3));
}
}
}

View File

@ -1,10 +1,10 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
namespace MpcNET.Test
namespace MpcNET.Test
{
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
public partial class LibMpcTest
{
[DataTestMethod]
@ -13,12 +13,12 @@ namespace MpcNET.Test
[DataRow("_My Playlist", 5)]
public async Task ListPlaylistTest(string playlistName, int numberOfFiles)
{
var response = await Mpc.SendAsync(Command.Playlists.Stored.GetContent(playlistName));
var response = await Mpc.SendAsync(commands => commands.StoredPlaylist.GetContent(playlistName));
TestOutput.WriteLine($"ListPlaylistTest (playlistName: {playlistName}) Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(numberOfFiles));
Assert.IsTrue(response.Response.Content.Count().Equals(numberOfFiles));
}
[DataTestMethod]
@ -27,26 +27,26 @@ namespace MpcNET.Test
[DataRow("_My Playlist", 5)]
public async Task ListPlaylistInfoTest(string playlistName, int numberOfFiles)
{
var response = await Mpc.SendAsync(Command.Playlists.Stored.GetContentWithMetadata(playlistName));
var response = await Mpc.SendAsync(commands => commands.StoredPlaylist.GetContentWithMetadata(playlistName));
TestOutput.WriteLine($"ListPlaylistTest (playlistName: {playlistName}) Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(numberOfFiles));
Assert.IsTrue(response.Response.Body.All(item => !string.IsNullOrEmpty(item.Artist)));
Assert.IsTrue(response.Response.Body.All(item => !string.IsNullOrEmpty(item.Title)));
Assert.IsTrue(response.Response.Body.All(item => !string.IsNullOrEmpty(item.Date)));
Assert.IsTrue(response.Response.Content.Count().Equals(numberOfFiles));
Assert.IsTrue(response.Response.Content.All(item => !string.IsNullOrEmpty(item.Artist)));
Assert.IsTrue(response.Response.Content.All(item => !string.IsNullOrEmpty(item.Title)));
Assert.IsTrue(response.Response.Content.All(item => !string.IsNullOrEmpty(item.Date)));
}
[TestMethod]
public async Task ListPlaylistsTest()
{
var response = await Mpc.SendAsync(Command.Playlists.Stored.GetAll());
var response = await Mpc.SendAsync(commands => commands.StoredPlaylist.GetAll());
TestOutput.WriteLine($"ListPlaylistsTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(3));
Assert.IsTrue(response.Response.Content.Count().Equals(3));
}
/// <summary>
@ -55,120 +55,120 @@ namespace MpcNET.Test
[TestMethod]
public async Task QueueTests()
{
await LoadPlaylistTest();
await ClearPlaylistTest();
await AddDirectoryTest();
await AddFileTest();
await RemovePositionTest();
await RemoveIdTest();
await this.LoadPlaylistTest();
await this.ClearPlaylistTest();
await this.AddDirectoryTest();
await this.AddFileTest();
await this.RemovePositionTest();
await this.RemoveIdTest();
}
public async Task LoadPlaylistTest()
{
await Clear_Queue();
await Check_Empty_Queue();
await Load_Playlist("Playlist One");
await Check_Queue_HasSongs(5);
await this.Clear_Queue();
await this.Check_Empty_Queue();
await this.Load_Playlist("Playlist One");
await this.Check_Queue_HasSongs(5);
}
public async Task ClearPlaylistTest()
{
await Clear_Queue();
await Check_Empty_Queue();
await Load_Playlist("Playlist One");
await Clear_Queue();
await Check_Queue_HasSongs(0);
await this.Clear_Queue();
await this.Check_Empty_Queue();
await this.Load_Playlist("Playlist One");
await this.Clear_Queue();
await this.Check_Queue_HasSongs(0);
}
public async Task AddDirectoryTest()
{
await Clear_Queue();
await Check_Empty_Queue();
await Add_Directory("Directory With Spaces");
await Check_Queue_HasSongs(3);
await this.Clear_Queue();
await this.Check_Empty_Queue();
await this.Add_Directory("Directory With Spaces");
await this.Check_Queue_HasSongs(3);
}
public async Task AddFileTest()
{
await Clear_Queue();
await Check_Empty_Queue();
await Add_File("teaspoon-stirring-mug-of-coffee.mp3");
await Check_Queue_HasSongs(1);
await this.Clear_Queue();
await this.Check_Empty_Queue();
await this.Add_File("teaspoon-stirring-mug-of-coffee.mp3");
await this.Check_Queue_HasSongs(1);
}
public async Task RemovePositionTest()
{
await Clear_Queue();
await Check_Empty_Queue();
await Add_File("teaspoon-stirring-mug-of-coffee.mp3");
await Remove_Position(0);
await Check_Queue_HasSongs(0);
await this.Clear_Queue();
await this.Check_Empty_Queue();
await this.Add_File("teaspoon-stirring-mug-of-coffee.mp3");
await this.Remove_Position(0);
await this.Check_Queue_HasSongs(0);
}
public async Task RemoveIdTest()
{
await Clear_Queue();
await Check_Empty_Queue();
await Add_File("teaspoon-stirring-mug-of-coffee.mp3");
var id = await Get_Song_Id();
await Remove_Id(id);
await Check_Queue_HasSongs(0);
await this.Clear_Queue();
await this.Check_Empty_Queue();
await this.Add_File("teaspoon-stirring-mug-of-coffee.mp3");
var id = await this.Get_Song_Id();
await this.Remove_Id(id);
await this.Check_Queue_HasSongs(0);
}
private async Task Check_Empty_Queue()
{
var message = await Mpc.SendAsync(Command.Playlists.Current.GetAllSongsInfo());
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.GetAllSongsInfo());
Assert.IsTrue(message.HasSuccessResponse());
Assert.IsFalse(message.Response.Body.Any());
Assert.IsFalse(message.Response.Content.Any());
}
private async Task Load_Playlist(string playlistName)
{
var message = await Mpc.SendAsync(Command.Playlists.Stored.Load(playlistName));
var message = await Mpc.SendAsync(commands => commands.StoredPlaylist.Load(playlistName));
Assert.IsTrue(message.HasSuccessResponse());
}
private async Task Clear_Queue()
{
var message = await Mpc.SendAsync(Command.Playlists.Current.Clear());
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.Clear());
Assert.IsTrue(message.HasSuccessResponse());
}
private async Task Check_Queue_HasSongs(int nrOfSongs)
{
var message = await Mpc.SendAsync(Command.Playlists.Current.GetAllSongsInfo());
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.GetAllSongsInfo());
Assert.IsTrue(message.HasSuccessResponse());
Assert.IsTrue(message.Response.Body.Count() == nrOfSongs);
Assert.IsTrue(message.Response.Content.Count() == nrOfSongs);
}
private async Task Add_Directory(string directory)
{
var message = await Mpc.SendAsync(Command.Playlists.Current.AddDirectory(directory));
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.AddDirectory(directory));
Assert.IsTrue(message.HasSuccessResponse());
}
private async Task Add_File(string file)
{
var message = await Mpc.SendAsync(Command.Playlists.Current.AddSong(file));
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.AddSong(file));
Assert.IsTrue(message.HasSuccessResponse());
}
private async Task Remove_Position(int position)
{
var message = await Mpc.SendAsync(Command.Playlists.Current.RemoveSongByPosition(position));
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.RemoveSongByPosition(position));
Assert.IsTrue(message.HasSuccessResponse());
}
private async Task Remove_Id(int songId)
{
var message = await Mpc.SendAsync(Command.Playlists.Current.RemoveSongById(songId));
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.RemoveSongById(songId));
Assert.IsTrue(message.HasSuccessResponse());
}
private async Task<int> Get_Song_Id()
{
var message = await Mpc.SendAsync(Command.Playlists.Current.GetAllSongMetadata());
return message.Response.Body.Single().Id;
var message = await Mpc.SendAsync(commands => commands.CurrentPlaylist.GetAllSongMetadata());
return message.Response.Content.Single().Id;
}
}
}

View File

@ -1,79 +1,79 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
namespace MpcNET.Test
{
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MpcNET.Commands;
public partial class LibMpcTest
{
[TestMethod]
public async Task CommandsTest()
{
var response = await Mpc.SendAsync(Command.Reflection.Commands());
var response = await Mpc.SendAsync(commands => commands.Reflection.Commands());
TestOutput.WriteLine($"CommandsTest (commands: {response.Response.Body.Count()}) Result:");
TestOutput.WriteLine($"CommandsTest (commands: {response.Response.Content.Count()}) Result:");
TestOutput.WriteLine(response);
// Different answer from MPD on Windows and on Linux, beacuse of Version.
// Check some of the commands.
Assert.IsTrue(response.Response.Body.Any(command => command.Equals("listall")));
Assert.IsTrue(response.Response.Body.Any(command => command.Equals("outputs")));
Assert.IsTrue(response.Response.Body.Any(command => command.Equals("pause")));
Assert.IsTrue(response.Response.Body.Any(command => command.Equals("play")));
Assert.IsTrue(response.Response.Body.Any(command => command.Equals("setvol")));
Assert.IsTrue(response.Response.Body.Any(command => command.Equals("stop")));
Assert.IsTrue(response.Response.Content.Any(command => command.Equals("listall")));
Assert.IsTrue(response.Response.Content.Any(command => command.Equals("outputs")));
Assert.IsTrue(response.Response.Content.Any(command => command.Equals("pause")));
Assert.IsTrue(response.Response.Content.Any(command => command.Equals("play")));
Assert.IsTrue(response.Response.Content.Any(command => command.Equals("setvol")));
Assert.IsTrue(response.Response.Content.Any(command => command.Equals("stop")));
}
[TestMethod]
public async Task TagTypesTest()
{
var response = await Mpc.SendAsync(Command.Reflection.TagTypes());
var response = await Mpc.SendAsync(commands => commands.Reflection.TagTypes());
TestOutput.WriteLine("TagTypesTest Result:");
TestOutput.WriteLine(response);
Assert.IsTrue(response.Response.Body.Count().Equals(17));
Assert.IsTrue(response.Response.Content.Count().Equals(17));
}
[TestMethod]
public async Task UrlHandlersTest()
{
var response = await Mpc.SendAsync(Command.Reflection.UrlHandlers());
var response = await Mpc.SendAsync(commands => commands.Reflection.UrlHandlers());
TestOutput.WriteLine($"UrlHandlersTest (handlers: {response.Response.Body.Count()}) Result:");
TestOutput.WriteLine($"UrlHandlersTest (handlers: {response.Response.Content.Count()}) Result:");
TestOutput.WriteLine(response);
// Different answer from MPD on Windows and on Linux.
// Check some of the handlers.
Assert.IsTrue(response.Response.Body.Any(handler => handler.Equals("http://")));
Assert.IsTrue(response.Response.Body.Any(handler => handler.Equals("mms://")));
Assert.IsTrue(response.Response.Body.Any(handler => handler.Equals("gopher://")));
Assert.IsTrue(response.Response.Body.Any(handler => handler.Equals("rtp://")));
Assert.IsTrue(response.Response.Content.Any(handler => handler.Equals("http://")));
Assert.IsTrue(response.Response.Content.Any(handler => handler.Equals("mms://")));
Assert.IsTrue(response.Response.Content.Any(handler => handler.Equals("gopher://")));
Assert.IsTrue(response.Response.Content.Any(handler => handler.Equals("rtp://")));
}
[TestMethod]
public async Task DecodersTest()
{
var response = await Mpc.SendAsync(Command.Reflection.Decoders());
var response = await Mpc.SendAsync(commands => commands.Reflection.Decoders());
TestOutput.WriteLine($"DecodersTest (decoders: {response.Response.Body.Count()}) Result:");
TestOutput.WriteLine($"DecodersTest (decoders: {response.Response.Content.Count()}) Result:");
TestOutput.WriteLine(response);
// Different answer from MPD on Windows and on Linux.
// Check some of the decoders.
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Name.Equals("mad")));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("mp3"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/mpeg"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Name.Equals("flac")));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("flac"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/flac"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/x-flac"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Name.Equals("ffmpeg")));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("aac"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("mpeg"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/aac"))));
Assert.IsTrue(response.Response.Body.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/mpeg"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Name.Equals("mad")));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("mp3"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/mpeg"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Name.Equals("flac")));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("flac"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/flac"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/x-flac"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Name.Equals("ffmpeg")));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("aac"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.Suffixes.Any(suffix => suffix.Equals("mpeg"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/aac"))));
Assert.IsTrue(response.Response.Content.Any(decoder => decoder.MediaTypes.Any(mediaType => mediaType.Equals("audio/mpeg"))));
}
}
}

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="CommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CurrentPlaylistCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="CurrentPlaylistCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -11,12 +11,12 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/queue.html
/// https://www.musicpd.org/doc/protocol/queue.html.
/// </summary>
public class CurrentPlaylistCommandFactory : ICurrentPlaylistCommandFactory
{
/// <summary>
/// Command: add
/// Command: add.
/// </summary>
/// <param name="directory">The directory.</param>
/// <returns>An <see cref="AddCommand"/>.</returns>
@ -26,7 +26,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: addid
/// Command: addid.
/// </summary>
/// <param name="songPath">The song path.</param>
/// <returns>An <see cref="AddIdCommand"/>.</returns>
@ -36,7 +36,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: clear
/// Command: clear.
/// </summary>
/// <returns>An <see cref="ClearCommand"/>.</returns>
public IMpcCommand<string> Clear()
@ -45,7 +45,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: playlist
/// Command: playlist.
/// </summary>
/// <returns>A <see cref="PlaylistCommand"/>.</returns>
public IMpcCommand<IEnumerable<IMpdFile>> GetAllSongsInfo()
@ -54,7 +54,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: delete
/// Command: delete.
/// </summary>
/// <param name="position">The position.</param>
/// <returns>A <see cref="DeleteCommand" />.</returns>
@ -64,7 +64,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: deleteid
/// Command: deleteid.
/// </summary>
/// <param name="songId">The song identifier.</param>
/// <returns>A <see cref="DeleteIdCommand"/>.</returns>
@ -74,7 +74,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: playlistid
/// Command: playlistid.
/// </summary>
/// <param name="songId">The song identifier.</param>
/// <returns>A <see cref="PlaylistIdCommand" />.</returns>
@ -84,7 +84,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: playlistinfo
/// Command: playlistinfo.
/// </summary>
/// <returns>A <see cref="PlaylistInfoCommand" />.</returns>
public IMpcCommand<IEnumerable<IMpdFile>> GetAllSongMetadata()

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="FindCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="FindCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ListAllCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ListAllCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -21,7 +21,7 @@ namespace MpcNET.Commands.Database
{
var rootDirectory = new List<MpdDirectory>
{
new MpdDirectory("/") // Add by default the root directory
new MpdDirectory("/"), // Add by default the root directory
};
foreach (var line in response)

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ListCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ListCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="UpdateCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="UpdateCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DatabaseCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="DatabaseCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -12,7 +12,7 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/database.html
/// https://www.musicpd.org/doc/protocol/database.html.
/// </summary>
public class DatabaseCommandFactory : IDatabaseCommandFactory
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ICurrentPlaylistCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ICurrentPlaylistCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -16,54 +16,54 @@ namespace MpcNET.Commands
public interface ICurrentPlaylistCommandFactory
{
/// <summary>
/// Command: add
/// Command: add.
/// </summary>
/// <param name="directory">The directory.</param>
/// <returns>An <see cref="AddCommand"/>.</returns>
IMpcCommand<string> AddDirectory(string directory);
/// <summary>
/// Command: addid
/// Command: addid.
/// </summary>
/// <param name="songPath">The song path.</param>
/// <returns>An <see cref="AddIdCommand"/>.</returns>
IMpcCommand<string> AddSong(string songPath);
/// <summary>
/// Command: clear
/// Command: clear.
/// </summary>
/// <returns>An <see cref="ClearCommand"/>.</returns>
IMpcCommand<string> Clear();
/// <summary>
/// Command: playlist
/// Command: playlist.
/// </summary>
/// <returns>A <see cref="PlaylistCommand"/>.</returns>
IMpcCommand<IEnumerable<IMpdFile>> GetAllSongsInfo();
/// <summary>
/// Command: delete
/// Command: delete.
/// </summary>
/// <param name="position">The position.</param>
/// <returns>A <see cref="DeleteCommand" />.</returns>
IMpcCommand<string> RemoveSongByPosition(int position);
/// <summary>
/// Command: deleteid
/// Command: deleteid.
/// </summary>
/// <param name="songId">The song identifier.</param>
/// <returns>A <see cref="DeleteIdCommand"/>.</returns>
IMpcCommand<string> RemoveSongById(int songId);
/// <summary>
/// Command: playlistid
/// Command: playlistid.
/// </summary>
/// <param name="songId">The song identifier.</param>
/// <returns>A <see cref="PlaylistIdCommand" />.</returns>
IMpcCommand<IEnumerable<IMpdFile>> GetSongMetadata(int songId);
/// <summary>
/// Command: playlistinfo
/// Command: playlistinfo.
/// </summary>
/// <returns>A <see cref="PlaylistInfoCommand" />.</returns>
IMpcCommand<IEnumerable<IMpdFile>> GetAllSongMetadata();

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IDatabaseCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IDatabaseCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IOutputCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IOutputCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IPlaybackCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IPlaybackCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IReflectionCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IReflectionCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IStatusCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IStatusCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IStoredPlaylistCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IStoredPlaylistCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -16,28 +16,28 @@ namespace MpcNET.Commands
public interface IStoredPlaylistCommandFactory
{
/// <summary>
/// Command: load
/// Command: load.
/// </summary>
/// <param name="playlistName">Name of the playlist.</param>
/// <returns>A <see cref="LoadCommand" />.</returns>
IMpcCommand<string> Load(string playlistName);
/// <summary>
/// Command: listplaylist
/// Command: listplaylist.
/// </summary>
/// <param name="playlistName">Name of the playlist.</param>
/// <returns>A <see cref="ListPlaylistCommand" />.</returns>
IMpcCommand<IEnumerable<IMpdFilePath>> GetContent(string playlistName);
/// <summary>
/// Command: listplaylistinfo
/// Command: listplaylistinfo.
/// </summary>
/// <param name="playlistName">Name of the playlist.</param>
/// <returns>A <see cref="ListPlaylistInfoCommand" />.</returns>
IMpcCommand<IEnumerable<IMpdFile>> GetContentWithMetadata(string playlistName);
/// <summary>
/// Command: listplaylists
/// Command: listplaylists.
/// </summary>
/// <returns>A <see cref="ListPlaylistsCommand" />.</returns>
IMpcCommand<IEnumerable<MpdPlaylist>> GetAll();

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DisableOutputCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="DisableOutputCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="EnableOutputCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="EnableOutputCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="OutputsCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="OutputsCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ToggleOutputCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ToggleOutputCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="OutputCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="OutputCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -11,7 +11,7 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/output_commands.html
/// https://www.musicpd.org/doc/protocol/output_commands.html.
/// </summary>
public class OutputCommandFactory : IOutputCommandFactory
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="NextCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="NextCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PlayCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PlayCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PlayPauseCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PlayPauseCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PreviousCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PreviousCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="SetVolumeCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="SetVolumeCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="StopCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="StopCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PlaybackCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PlaybackCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -10,7 +10,7 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/playback_commands.html
/// https://www.musicpd.org/doc/protocol/playback_commands.html.
/// </summary>
public class PlaybackCommandFactory : IPlaybackCommandFactory
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AddCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="AddCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AddIdCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="AddIdCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ClearCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ClearCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DeleteCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="DeleteCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DeleteIdCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="DeleteIdCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -9,7 +9,7 @@ namespace MpcNET.Commands.Playlist
using System.Collections.Generic;
/// <summary>
/// Deletes the song SONGID from the playlist
/// Deletes the song SONGID from the playlist.
/// </summary>
internal class DeleteIdCommand : IMpcCommand<string>
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ListPlaylistCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ListPlaylistCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ListPlaylistInfoCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ListPlaylistInfoCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ListPlaylistsCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ListPlaylistsCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="LoadCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="LoadCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PlaylistCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PlaylistCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PlaylistIdCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PlaylistIdCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="PlaylistInfoCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="PlaylistInfoCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -10,7 +10,7 @@ namespace MpcNET.Commands.Playlist
using MpcNET.Types;
/// <summary>
/// Displays a list of all songs in the playlist,
/// Displays a list of all songs in the playlist.
/// </summary>
internal class PlaylistInfoCommand : IMpcCommand<IEnumerable<IMpdFile>>
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CommandsCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="CommandsCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="DecodersCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="DecodersCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="TagTypesCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="TagTypesCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="UrlHandlersCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="UrlHandlersCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ReflectionCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ReflectionCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -11,7 +11,7 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/reflection_commands.html
/// https://www.musicpd.org/doc/protocol/reflection_commands.html.
/// </summary>
public class ReflectionCommandFactory : IReflectionCommandFactory
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CurrentSongCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="CurrentSongCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IdleCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IdleCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="NoIdleCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="NoIdleCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="StatusCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="StatusCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="StatusCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="StatusCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -10,7 +10,7 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/command_reference.html#status_commands
/// https://www.musicpd.org/doc/protocol/command_reference.html#status_commands.
/// </summary>
public class StatusCommandFactory : IStatusCommandFactory
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="StoredPlaylistCommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="StoredPlaylistCommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -11,12 +11,12 @@ namespace MpcNET.Commands
using MpcNET.Types;
/// <summary>
/// https://www.musicpd.org/doc/protocol/playlist_files.html
/// https://www.musicpd.org/doc/protocol/playlist_files.html.
/// </summary>
public class StoredPlaylistCommandFactory : IStoredPlaylistCommandFactory
{
/// <summary>
/// Command: load
/// Command: load.
/// </summary>
/// <param name="playlistName">Name of the playlist.</param>
/// <returns>A <see cref="LoadCommand" />.</returns>
@ -26,7 +26,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: listplaylist
/// Command: listplaylist.
/// </summary>
/// <param name="playlistName">Name of the playlist.</param>
/// <returns>A <see cref="ListPlaylistCommand" />.</returns>
@ -36,7 +36,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: listplaylistinfo
/// Command: listplaylistinfo.
/// </summary>
/// <param name="playlistName">Name of the playlist.</param>
/// <returns>A <see cref="ListPlaylistInfoCommand" />.</returns>
@ -46,7 +46,7 @@ namespace MpcNET.Commands
}
/// <summary>
/// Command: listplaylists
/// Command: listplaylists.
/// </summary>
/// <returns>A <see cref="ListPlaylistsCommand" />.</returns>
public IMpcCommand<IEnumerable<MpdPlaylist>> GetAll()

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="Constants.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="Constants.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CommandNullException.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="CommandNullException.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="EmptyResponseException.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="EmptyResponseException.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpcConnectException.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpcConnectException.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpcException.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpcException.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ICommandFactory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ICommandFactory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpcCommand.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpcCommand.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpcConnection.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpcConnection.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpcConnectionObserver.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpcConnectionReporter.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -11,7 +11,7 @@ namespace MpcNET
/// <summary>
/// Interface for implementing an observer for <see cref="MpcConnection"/>.
/// </summary>
public interface IMpcConnectionObserver
public interface IMpcConnectionReporter
{
/// <summary>
/// Called when connecting.

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ErrorMpdMessage.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ErrorMpdMessage.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ErrorMpdResponse.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ErrorMpdResponse.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpdMessage.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpdMessage.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpdRequest.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpdRequest.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpdResponse.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpdResponse.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpdResponseResult.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpdResponseResult.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdMessage.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdMessage.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdRequest.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdRequest.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdResponse.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdResponse.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdResponseResult.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdResponseResult.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpcConnection.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpcConnection.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -27,7 +27,7 @@ namespace MpcNET
{
private static readonly Encoding Encoding = new UTF8Encoding();
private readonly ICommandFactory commandFactory;
private readonly IMpcConnectionObserver mpcConnectionObserver;
private readonly IMpcConnectionReporter mpcConnectionReporter;
private readonly IPEndPoint server;
private TcpClient tcpClient;
@ -40,11 +40,11 @@ namespace MpcNET
/// </summary>
/// <param name="server">The server.</param>
/// <param name="commandFactory">The command factory.</param>
/// <param name="mpcConnectionObserver">The MPC connection logger.</param>
public MpcConnection(IPEndPoint server, ICommandFactory commandFactory = null, IMpcConnectionObserver mpcConnectionObserver = null)
/// <param name="mpcConnectionReporter">The MPC connection logger.</param>
public MpcConnection(IPEndPoint server, ICommandFactory commandFactory = null, IMpcConnectionReporter mpcConnectionReporter = null)
{
this.commandFactory = commandFactory ?? new CommandFactory();
this.mpcConnectionObserver = mpcConnectionObserver;
this.mpcConnectionReporter = mpcConnectionReporter;
this.ClearConnectionFields();
this.server = server ?? throw new ArgumentNullException("Server IPEndPoint not set.", nameof(server));
}
@ -106,7 +106,7 @@ namespace MpcNET
IReadOnlyList<string> response = new List<string>();
var sendAttempter = new Attempter(3);
var commandText = command.Serialize();
this.mpcConnectionObserver?.Sending(commandText);
this.mpcConnectionReporter?.Sending(commandText);
while (sendAttempter.Attempt())
{
try
@ -129,9 +129,9 @@ namespace MpcNET
catch (Exception exception)
{
lastException = exception;
this.mpcConnectionObserver?.SendException(commandText, sendAttempter.CurrentAttempt, exception);
this.mpcConnectionReporter?.SendException(commandText, sendAttempter.CurrentAttempt, exception);
await this.ReconnectAsync(true);
this.mpcConnectionObserver?.RetrySend(commandText, sendAttempter.CurrentAttempt);
this.mpcConnectionReporter?.RetrySend(commandText, sendAttempter.CurrentAttempt);
}
}
@ -186,14 +186,14 @@ namespace MpcNET
var connectAttempter = new Attempter(3);
while (connectAttempter.Attempt())
{
this.mpcConnectionObserver?.Connecting(isReconnect, connectAttempter.CurrentAttempt);
this.mpcConnectionReporter?.Connecting(isReconnect, connectAttempter.CurrentAttempt);
await this.DisconnectAsync(false);
this.tcpClient = new TcpClient();
await this.tcpClient.ConnectAsync(this.server.Address, this.server.Port);
if (this.tcpClient.Connected)
{
this.mpcConnectionObserver?.ConnectionAccepted(isReconnect, connectAttempter.CurrentAttempt);
this.mpcConnectionReporter?.ConnectionAccepted(isReconnect, connectAttempter.CurrentAttempt);
break;
}
}
@ -209,7 +209,7 @@ namespace MpcNET
}
this.version = firstLine.Substring(Constants.FirstLinePrefix.Length);
this.mpcConnectionObserver?.Connected(isReconnect, connectAttempter.CurrentAttempt, firstLine);
this.mpcConnectionReporter?.Connected(isReconnect, connectAttempter.CurrentAttempt, firstLine);
}
}
@ -222,7 +222,7 @@ namespace MpcNET
do
{
responseLine = await reader.ReadLineAsync();
this.mpcConnectionObserver.ReadResponse(responseLine);
this.mpcConnectionReporter.ReadResponse(responseLine);
if (responseLine == null)
{
break;
@ -238,14 +238,14 @@ namespace MpcNET
private Task DisconnectAsync(bool isExplicitDisconnect)
{
this.mpcConnectionObserver?.Disconnecting(isExplicitDisconnect);
this.mpcConnectionReporter?.Disconnecting(isExplicitDisconnect);
if (this.tcpClient == null)
{
return Task.CompletedTask;
}
this.ClearConnectionFields();
this.mpcConnectionObserver?.Disconnected(isExplicitDisconnect);
this.mpcConnectionReporter?.Disconnected(isExplicitDisconnect);
return Task.CompletedTask;
}

View File

@ -3,11 +3,13 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>MpcNET</AssemblyName>
<PackageId>MpcNET</PackageId>
<PackageId>MpcNET.SundewFork</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<RootNamespace>MpcNET</RootNamespace>
<Version>0.0.0-pre000</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -36,8 +38,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Sundew.Base" Version="3.1.0-pre013" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Sundew.Base" Version="3.2.0-pre014" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdDirectoryListing.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdDirectoryListing.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdState.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdState.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -29,6 +29,6 @@ namespace MpcNET
/// <summary>
/// The playback of the MPD is currently paused.
/// </summary>
Pause
Pause,
}
}

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdStatistics.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdStatistics.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdStatus.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdStatus.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="AssemblyInfo.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,13 +1,13 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="FindTags.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="FindTags.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
namespace MpcNET.Tags
{
/// <summary>
/// https://www.musicpd.org/doc/protocol/database.html : find {TYPE} {WHAT} [...] [window START:END]
/// https://www.musicpd.org/doc/protocol/database.html : find {TYPE} {WHAT} [...] [window START:END].
/// </summary>
public class FindTags
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="ITag.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="ITag.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,13 +1,13 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdTags.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdTags.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
namespace MpcNET.Tags
{
/// <summary>
/// https://www.musicpd.org/doc/protocol/tags.html
/// https://www.musicpd.org/doc/protocol/tags.html.
/// </summary>
public class MpdTags
{

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="Tag.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="Tag.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpdFile.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpdFile.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="IMpdFilePath.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="IMpdFilePath.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdDecoderPlugin.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdDecoderPlugin.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdDirectory.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdDirectory.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdFile.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdFile.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
@ -187,7 +187,7 @@ namespace MpcNET.Types
return new MpdFile(path, pos: pos);
}
internal static(IMpdFile mpdFile, int index) Create(
internal static (IMpdFile mpdFile, int index) Create(
IReadOnlyList<KeyValuePair<string, string>> response,
int startIndex)
{
@ -334,7 +334,7 @@ namespace MpcNET.Types
var mpdFiles = new List<IMpdFile>();
for (var index = 0; index < response.Count; index++)
{
var(mpdFile, lastIndex) = Create(response, index);
var (mpdFile, lastIndex) = Create(response, index);
if (mpdFile != null)
{
mpdFiles.Add(mpdFile);

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdOutput.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdOutput.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="MpdPlaylist.cs" company="Hukano">
// Copyright (c) Hukano. All rights reserved.
// <copyright file="MpdPlaylist.cs" company="MpcNET">
// Copyright (c) MpcNET. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

View File

@ -8,7 +8,7 @@
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
"settings": {
"documentationRules": {
"companyName": "Hukano",
"companyName": "MpcNET",
"xmlHeader": true,
"copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the {licenseName} license. See {licenseFile} file in the project root for full license information.",
"headerDecoration": "--------------------------------------------------------------------------------------------------------------------",
@ -17,8 +17,7 @@
"licenseFile": "LICENSE"
},
"documentExposedElements": false,
"documentInternalElements": false,
"documentInterfaces": false
"documentInternalElements": false
}
}
}