watsonb8/aurora
1
1
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity

Adding a shared library for common classes

Browse Source
This commit is contained in:
Brandon Watson
2021-04-12 20:58:44 -04:00
parent 6b14d1264a
commit 4acf091511
28 changed files with 587 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.xaml.cs
View File

@ -315,6 +315,7 @@ namespace Aurora.Design.Views.Main
}
var view = (View)Activator.CreateInstance(viewType);
vm.SetView = this.SetView;
//Assign viewModel
_lastViewModel = vm;

28
aurora-sharp-desktop/Aurora/UserInterface/Views/Party/BasePartyViewModel.cs
View File

@ -2,36 +2,32 @@ using System.Collections.ObjectModel;
using Aurora.Proto.Party;
using Aurora.Models.Media;
using Aurora.Services.Settings;
using Aurora.Services;
namespace Aurora.Design.Views.Party
{
public enum PartyStateV2
{
SelectingHost,
InParty,
Hosting,
Connecting,
}
public class BasePartyViewModel : BasePlayerViewModel
{
protected string _hostname;
private PartyStateV2 _state;
protected Global _global;
protected ISettingsService _settingsService;
private ObservableCollection<Member> _members;
private ObservableCollection<BaseMedia> _queue;
private BaseMedia _selectedMedia;
private ISettingsService _settingsService;
private int _selectedTabIndex;
public BasePartyViewModel(
ISettingsService settingsService
ISettingsService settingsService,
Global global
)
{
_members = new ObservableCollection<Member>();
_queue = new ObservableCollection<BaseMedia>();
this._settingsService = settingsService;
this._global = global;
}
public int SelectedTabIndex
@ -60,16 +56,10 @@ namespace Aurora.Design.Views.Party
/// Public property for the currently selected song.
/// </summary>
/// <value></value>
public BaseMedia SelectedSong
public BaseMedia SelectedMedia
{
get { return _selectedMedia; }
set { SetProperty(ref _selectedMedia, value); }
}
public PartyStateV2 State
{
get { return _state; }
set { _state = value;}
}
}
}

169
aurora-sharp-desktop/Aurora/UserInterface/Views/Party/HostPartyViewModel.cs
View File

@ -1,24 +1,59 @@
using System;
using System.Threading.Tasks;
using Aurora.Design.Views.Party.NewPartyDialog;
using System.Net;
using System.Net.Sockets;
using Grpc.Core;
using Xamarin.Forms;
using Aurora.Services.Server;
using Aurora.Services.EventManager;
using Aurora.Services.Library;
using Aurora.Services.Settings;
using Aurora.Services;
using Aurora.Proto.Party;
using Aurora.Models.Media;
using Aurora.Services.Controllers;
using Aurora.Utils;
namespace Aurora.Design.Views.Party
{
public class HostPartyViewModel : BasePartyViewModel
{
private IServerService _serverService;
private IEventManager _eventManager;
private ILibraryService _libraryService;
private Grpc.Core.Server _server;
private RemotePartyService.RemotePartyServiceClient _remotePartyClient;
private Channel _channel;
private int _port = 8080;
private bool _isServerStarted = false;
public HostPartyViewModel(
ISettingsService settingsService,
IServerService serverService,
IEventManager eventManager
): base(settingsService)
IEventManager eventManager,
ILibraryService libraryService,
Global global
): base(settingsService, global)
{
this._serverService = serverService;
this._eventManager = eventManager;
this._global.State = PartyState.Hosting;
this._libraryService = libraryService;
// Create and start grpc server
string host = IpUtil.GetLocalIPAddress();
if(string.IsNullOrWhiteSpace(host))
{
// TODO display error to screen
throw new System.Exception("This device does not have a valid IP address");
}
this._hostname = IpUtil.GetLocalIPAddress();
this.StartServer("test", "test description");
this.StartClient();
// Register commands
PlayCommand = new Command(OnDoubleClickCommandExecute, CanDoubleClickCommandExecute);
LeavePartyCommand = new Command(OnLeavePartyCommandExecute, CanLeavePartyCommandExecute);
}
#region Properties
@ -43,7 +78,14 @@ namespace Aurora.Design.Views.Party
/// <returns></returns>
public override Task OnActive()
{
// Start server if not already started
if(!this._isServerStarted)
{
this._hostname = IpUtil.GetLocalIPAddress();
this.StartServer("test", "test description");
this.StartClient();
}
return Task.FromResult<object>(null);
}
@ -55,20 +97,13 @@ namespace Aurora.Design.Views.Party
{
return Task.FromResult<object>(null);
}
private async void OnHostCommandExecute()
{
}
private bool CanHostCommandExecute()
{
return true;
}
private async void OnLeavePartyCommandExecute()
{
await this._channel.ShutdownAsync();
await this._server.ShutdownAsync();
this._global.State = PartyState.Idle;
this.SetView(typeof(PartyView), typeof(PartyViewModel));
}
private bool CanLeavePartyCommandExecute()
@ -78,22 +113,43 @@ namespace Aurora.Design.Views.Party
public override void OnPlayButtonCommandExecute()
{
if (base.IsPlaying())
{
//Fire play stopped event
AudioMetadata meta = SelectedMedia.Metadata as AudioMetadata;
MediaPausedEvent mediaPaused = new MediaPausedEvent();
_eventManager.FireEvent(new BaseEvent()
{
MediaPausedEvent = mediaPaused
});
}
else
{
//Fire play resume event
AudioMetadata meta = SelectedMedia.Metadata as AudioMetadata;
MediaResumedEvent mediaResumed = new MediaResumedEvent();
_eventManager.FireEvent(new BaseEvent()
{
MediaResumedEvent = mediaResumed
});
}
}
public override bool CanPlayButtonCommandExecute()
{
return this.State == PartyStateV2.Hosting;
return true;
}
public override bool CanNextButtonCommandExecute()
{
return this.State == PartyStateV2.Hosting;
return true;
}
public override bool CanPreviousButtonCommandExecute()
{
return this.State == PartyStateV2.Hosting;
return true;
}
/// <summary>
@ -101,12 +157,77 @@ namespace Aurora.Design.Views.Party
/// </summary>
public void OnDoubleClickCommandExecute()
{
//Fire Playing event
AudioMetadata meta = SelectedMedia.Metadata as AudioMetadata;
NewMediaPlayingEvent mediaPlaying = new NewMediaPlayingEvent()
{
Media = new Media()
{
//TODO need full resource name
Name = SelectedMedia.Id,
Title = meta.Title,
Artist = meta.Artist,
Album = meta.Album,
}
};
_eventManager.FireEvent(new BaseEvent()
{
NewMediaPlayingEvent = mediaPlaying
});
}
public bool CanDoubleClickCommandExecute()
{
return this.State == PartyStateV2.Hosting;
return true;
}
#region Private Methods
private void StartServer(string partyName, string description)
{
try
{
// TODO bmw replace with display in UI
Console.WriteLine(string.Format("Starting gRPC server at hostname: {0}, port: {1}", _hostname, _port));
_server = new Grpc.Core.Server
{
Ports = { new ServerPort(_hostname, _port, ServerCredentials.Insecure) }
};
//Construct implementations
RemotePartyController remotePartyController = new RemotePartyController(
partyName,
description,
this._libraryService,
base._settingsService,
_eventManager);
// Register grpc RemoteService with singleton server service
RemotePartyService.BindService(remotePartyController);
_server.Start();
this._isServerStarted = true;
}
catch (Exception ex)
{
// TODO bmw replace with display in UI
Console.WriteLine(string.Format("Error starting gRPC server: {0}", ex.Message));
}
}
private void StartClient()
{
_channel = new Channel(string.Format("{0}:{1}", this._hostname, this._port), ChannelCredentials.Insecure);
_remotePartyClient = new RemotePartyService.RemotePartyServiceClient(_channel);
}
#endregion Private Methods
}
}

28
aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyViewModel.cs
View File

@ -1,34 +1,16 @@
using System;
using System.Collections.ObjectModel;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Threading;
using System.Linq;
using Xamarin.Forms;
using Aurora.Proto.Party;
using Aurora.Models.Media;
using Aurora.Services.Client;
using Aurora.Design.Views.Party.NewPartyDialog;
using Aurora.Services.Settings;
using Aurora.Services.Server;
using Aurora.Services.EventManager;
using Grpc.Core;
using Aurora.Services;
namespace Aurora.Design.Views.Party
{
//TODO refactor
enum PartyState
{
SelectingHost,
InParty,
Hosting,
Connecting,
}
delegate void EventHandler(BaseEvent e);
public class PartyViewModel : BasePartyViewModel
{
public PartyViewModel(ISettingsService settingsService): base(settingsService)
public PartyViewModel(ISettingsService settingsService, Global global): base(settingsService, global)
{
}
@ -39,14 +21,14 @@ namespace Aurora.Design.Views.Party
public override Task OnActive()
{
OnPropertyChanged("SelectedTabIndex");
switch(this.State)
switch(this._global.State)
{
case PartyStateV2.Hosting:
case PartyState.Hosting:
{
this.SetView.Invoke(typeof(PartyView), typeof(HostPartyViewModel));
break;
}
case PartyStateV2.InParty:
case PartyState.InParty:
{
// TODO
break;