From 507e08ab19ccfbddc50bf5b6f669ae7e31dc23ab Mon Sep 17 00:00:00 2001 From: danielgrabowski Date: Wed, 6 Nov 2019 13:47:00 +0100 Subject: [PATCH] Codecleamup --- Squirrowse.Client/Program.cs | 6 +++--- Squirrowse.Client/Service/ActionDispatcher.cs | 15 ++++++++------- Squirrowse.Client/Service/CameraFactory.cs | 13 +++++-------- Squirrowse.Client/Service/ConnectionManager.cs | 15 ++++----------- Squirrowse.Client/Service/ICameraFactory.cs | 8 ++------ Squirrowse.Client/Service/ICameraService.cs | 3 +-- Squirrowse.Client/Worker.cs | 7 ++----- Squirrowse.Core/Models/User.cs | 6 +++--- Squirrowse.Core/Services/ImgExtensions.cs | 2 +- Squirrowse.Core/Squirrowse.Core.csproj | 2 +- Squirrowse.Service/Hubs/IStreamManager.cs | 16 ++++++---------- Squirrowse.Service/Hubs/StreamHub.cs | 12 ++++++------ Squirrowse.Service/Startup.cs | 1 + 13 files changed, 43 insertions(+), 63 deletions(-) diff --git a/Squirrowse.Client/Program.cs b/Squirrowse.Client/Program.cs index 3af0c5b..8d77c6f 100644 --- a/Squirrowse.Client/Program.cs +++ b/Squirrowse.Client/Program.cs @@ -17,10 +17,10 @@ namespace Squirrowse.Client .ConfigureServices((hostContext, services) => { services.AddHostedService(); - services.AddSingleton(x=> new ConnectionManager("http://localhost", 5000)); //keep as transient for now - services.AddSingleton< ICameraService, CameraService >(x=>new CameraService(new Camera())); + services.AddSingleton(x => + new ConnectionManager("http://localhost", 5000)); //keep as transient for now + services.AddSingleton(x => new CameraService(new Camera())); services.AddSingleton(); - }); } } diff --git a/Squirrowse.Client/Service/ActionDispatcher.cs b/Squirrowse.Client/Service/ActionDispatcher.cs index dd4da7f..91295a0 100644 --- a/Squirrowse.Client/Service/ActionDispatcher.cs +++ b/Squirrowse.Client/Service/ActionDispatcher.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Client; using Microsoft.Extensions.Logging; @@ -11,18 +12,18 @@ namespace Squirrowse.Client.Service private readonly IConnectionManager connectionManager; private readonly ILogger logger; private readonly HubConnection session; - + public ActionDispatcher(ILogger logger, IConnectionManager connectionManager) { this.connectionManager = connectionManager; this.logger = logger; - session.On("Start",StartStream); - session.On("Stop",StopStream); + session.On("Start", StartStream); + session.On("Stop", StopStream); } public Task StopStream() { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } public async Task SayHello() @@ -34,13 +35,13 @@ namespace Squirrowse.Client.Service { logger.LogInformation($"{nameof(SendStreamAsync)} Start stream"); await session.SendAsync("UploadByteStream", asb); - + logger.LogInformation($"{nameof(SendStreamAsync)} End stream"); } public Task StartStream() { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/Squirrowse.Client/Service/CameraFactory.cs b/Squirrowse.Client/Service/CameraFactory.cs index 5a876d7..ef686b3 100644 --- a/Squirrowse.Client/Service/CameraFactory.cs +++ b/Squirrowse.Client/Service/CameraFactory.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Text; -using OpenCvSharp; +using OpenCvSharp; namespace Squirrowse.Client.Service { public abstract class CameraFactory - { - public abstract VideoCapture GetCamera(); - } -} + { + public abstract VideoCapture GetCamera(); + } +} \ No newline at end of file diff --git a/Squirrowse.Client/Service/ConnectionManager.cs b/Squirrowse.Client/Service/ConnectionManager.cs index 642c289..e927d5a 100644 --- a/Squirrowse.Client/Service/ConnectionManager.cs +++ b/Squirrowse.Client/Service/ConnectionManager.cs @@ -17,25 +17,18 @@ namespace Squirrowse.Client.Service .AddMessagePackProtocol() .WithAutomaticReconnect() .Build(); - } public async Task GetConnection() { - if (Connected) - { - return _connection; - } + if (Connected) return _connection; throw new Exception(); } - public async Task InitConnection() + public async Task InitConnection() { - if (_connection.State == HubConnectionState.Connected) - { - return; - } + if (_connection.State == HubConnectionState.Connected) return; await _connection.StartAsync(); await RegisterOnHub(); Connected = true; @@ -50,7 +43,7 @@ namespace Squirrowse.Client.Service private async Task RegisterOnHub() { - await _connection.SendAsync("AddUser", Environment.UserName); + await _connection.SendAsync("AddUser", Environment.UserName); } } } \ No newline at end of file diff --git a/Squirrowse.Client/Service/ICameraFactory.cs b/Squirrowse.Client/Service/ICameraFactory.cs index c687cc9..b6b025c 100644 --- a/Squirrowse.Client/Service/ICameraFactory.cs +++ b/Squirrowse.Client/Service/ICameraFactory.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Squirrowse.Client.Service +namespace Squirrowse.Client.Service { public interface ICameraFactory { } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Service/ICameraService.cs b/Squirrowse.Client/Service/ICameraService.cs index 784b1f0..be81176 100644 --- a/Squirrowse.Client/Service/ICameraService.cs +++ b/Squirrowse.Client/Service/ICameraService.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using OpenCvSharp; diff --git a/Squirrowse.Client/Worker.cs b/Squirrowse.Client/Worker.cs index 7c714e4..f8110de 100644 --- a/Squirrowse.Client/Worker.cs +++ b/Squirrowse.Client/Worker.cs @@ -1,24 +1,21 @@ -using System; -using System.Drawing; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using OpenCvSharp; using Squirrowse.Client.Service; namespace Squirrowse.Client { public class Worker : IHostedService { - private readonly ILogger logger; private readonly IConnectionManager _connectionManager; private readonly ICameraService camera; + private readonly ILogger logger; public Worker(ILogger logger, IConnectionManager connectionManager, ICameraService camera) { this.logger = logger; - this._connectionManager = connectionManager; + _connectionManager = connectionManager; this.camera = camera; } diff --git a/Squirrowse.Core/Models/User.cs b/Squirrowse.Core/Models/User.cs index 4af3ea6..01a962b 100644 --- a/Squirrowse.Core/Models/User.cs +++ b/Squirrowse.Core/Models/User.cs @@ -2,13 +2,13 @@ { public class User { - public string ConnectionId { get; set; } - public string AgentName { get; set; } - public User(string connectionId, string agentName) { ConnectionId = connectionId; AgentName = agentName; } + + public string ConnectionId { get; set; } + public string AgentName { get; set; } } } \ No newline at end of file diff --git a/Squirrowse.Core/Services/ImgExtensions.cs b/Squirrowse.Core/Services/ImgExtensions.cs index bcca8d5..c1c4437 100644 --- a/Squirrowse.Core/Services/ImgExtensions.cs +++ b/Squirrowse.Core/Services/ImgExtensions.cs @@ -13,7 +13,7 @@ namespace Squirrowse.Core.Services public static Mat ConvertByteToMat(this byte[] bytearr) { - var tempMat = Cv2.ImDecode(bytearr, ImreadModes.Unchanged); //keep as disposable + var tempMat = Cv2.ImDecode(bytearr, ImreadModes.Unchanged); //keep as disposable return tempMat ?? new Mat(); } } diff --git a/Squirrowse.Core/Squirrowse.Core.csproj b/Squirrowse.Core/Squirrowse.Core.csproj index 2400b66..a77ee0b 100644 --- a/Squirrowse.Core/Squirrowse.Core.csproj +++ b/Squirrowse.Core/Squirrowse.Core.csproj @@ -8,4 +8,4 @@ - + \ No newline at end of file diff --git a/Squirrowse.Service/Hubs/IStreamManager.cs b/Squirrowse.Service/Hubs/IStreamManager.cs index 41dc26f..e5fb077 100644 --- a/Squirrowse.Service/Hubs/IStreamManager.cs +++ b/Squirrowse.Service/Hubs/IStreamManager.cs @@ -1,16 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; namespace Squirrowse.Service.Hubs { public interface IStreamManager { - Task AddUser(string connectionId, string agentName); - Task RemoveUserbyConnectionId(string connectionId); - Task RemoveUserByUserName(string agentName); - bool CheckUser(string agentName); - + Task AddUser(string connectionId, string agentName); + Task RemoveUserbyConnectionId(string connectionId); + Task RemoveUserByUserName(string agentName); + bool CheckUser(string agentName); } -} +} \ No newline at end of file diff --git a/Squirrowse.Service/Hubs/StreamHub.cs b/Squirrowse.Service/Hubs/StreamHub.cs index d9d8113..31f498a 100644 --- a/Squirrowse.Service/Hubs/StreamHub.cs +++ b/Squirrowse.Service/Hubs/StreamHub.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; @@ -13,6 +12,8 @@ namespace Squirrowse.Service.Hubs { private readonly ILogger logger; private readonly IStreamManager manager; + public Window okno = new Window("test"); + public StreamHub(ILogger logger, IStreamManager manager) { this.logger = logger; @@ -21,7 +22,7 @@ namespace Squirrowse.Service.Hubs public async Task AddUser(string UserName) { - await manager.AddUser(Context.ConnectionId, UserName); + await manager.AddUser(Context.ConnectionId, UserName); } public async Task AddToGroup(Groups group, string user = "") @@ -62,16 +63,15 @@ namespace Squirrowse.Service.Hubs await client.SendAsync("Stop"); } - public Window okno = new Window("test"); + public async Task UploadByteStream(IAsyncEnumerable stream) { - await foreach (var frame in stream) { using var imgbuffer = frame.ConvertByteToMat(); okno.ShowImage(imgbuffer); Cv2.WaitKey(1); - // logger.LogInformation($"Got frame size: {frame.Length} "); + // logger.LogInformation($"Got frame size: {frame.Length} "); // await Task.Delay(100); //leave some delay for debug purpose } } diff --git a/Squirrowse.Service/Startup.cs b/Squirrowse.Service/Startup.cs index 8ec5463..51dbdce 100644 --- a/Squirrowse.Service/Startup.cs +++ b/Squirrowse.Service/Startup.cs @@ -25,6 +25,7 @@ namespace Squirrowse.Service services.AddControllers(); services.AddMediatR(Assembly.GetAssembly(typeof(Startup))); services.AddTransient(); + services.AddTransient(); services.AddCoreModule(); services.AddSignalR() .AddHubOptions