From e91a5143dd673fd4c9a599868a05ea0259900eb5 Mon Sep 17 00:00:00 2001 From: danielgrabowski Date: Mon, 4 Nov 2019 09:29:37 +0100 Subject: [PATCH] Codecleanup --- Squirrowse.Client/Program.cs | 14 +++++------ .../Properties/launchSettings.json | 2 +- Squirrowse.Client/Service/CameraService.cs | 9 +++----- .../Service/ConnectionManager.cs | 6 +++-- Squirrowse.Client/Service/ICameraService.cs | 13 ++++------- .../Service/IConnectionManager.cs | 1 - Squirrowse.Client/Service/IStreamService.cs | 9 +++----- Squirrowse.Client/Service/StreamService.cs | 23 ++++++------------- Squirrowse.Client/Worker.cs | 6 ++--- .../appsettings.Development.json | 2 +- Squirrowse.Client/appsettings.json | 2 +- Squirrowse.Core/CoreModule.cs | 5 ++-- Squirrowse.Core/Models/Groups.cs | 12 ++++------ Squirrowse.Core/Services/ImgExtensions.cs | 3 +-- Squirrowse.Service/Hubs/IStreamHub.cs | 12 ++++------ Squirrowse.Service/Hubs/StreamHub.cs | 22 ++++++++---------- Squirrowse.Service/IUserProvider.cs | 9 ++------ Squirrowse.Service/Program.cs | 6 ++--- .../Properties/launchSettings.json | 2 +- Squirrowse.Service/Squirrowse.Service.csproj | 2 +- Squirrowse.Service/Startup.cs | 3 ++- Squirrowse.Service/UserProvider.cs | 5 +--- .../appsettings.Development.json | 2 +- 23 files changed, 64 insertions(+), 106 deletions(-) diff --git a/Squirrowse.Client/Program.cs b/Squirrowse.Client/Program.cs index 483029b..df4e7ae 100644 --- a/Squirrowse.Client/Program.cs +++ b/Squirrowse.Client/Program.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Squirrowse.Client.Service; @@ -15,12 +11,14 @@ namespace Squirrowse.Client CreateHostBuilder(args).Build().Run(); } - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) + public static IHostBuilder CreateHostBuilder(string[] args) + { + return Host.CreateDefaultBuilder(args) .ConfigureServices((hostContext, services) => { services.AddHostedService(); - services.AddTransient();//keep as transient for now + services.AddTransient(); //keep as transient for now }); + } } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Properties/launchSettings.json b/Squirrowse.Client/Properties/launchSettings.json index 4858d8e..477a920 100644 --- a/Squirrowse.Client/Properties/launchSettings.json +++ b/Squirrowse.Client/Properties/launchSettings.json @@ -7,4 +7,4 @@ } } } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Service/CameraService.cs b/Squirrowse.Client/Service/CameraService.cs index 5cdbe0c..0df48b5 100644 --- a/Squirrowse.Client/Service/CameraService.cs +++ b/Squirrowse.Client/Service/CameraService.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; using OpenCvSharp; @@ -8,15 +6,14 @@ namespace Squirrowse.Client.Service { public class CameraService : ICameraService { - public VideoCapture GetCamera(int height=480,int widght=640,double fps=15f,bool disposable = false) + public VideoCapture GetCamera(int height = 480, int widght = 640, double fps = 15f, bool disposable = false) { - var cam = new VideoCapture(CaptureDevice.Any); cam.Fps = fps; cam.FrameHeight = height; cam.FrameWidth = widght; cam.IsEnabledDispose = disposable; - + return cam; } @@ -25,4 +22,4 @@ namespace Squirrowse.Client.Service throw new NotImplementedException(); } } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Service/ConnectionManager.cs b/Squirrowse.Client/Service/ConnectionManager.cs index e2bf587..28c8f54 100644 --- a/Squirrowse.Client/Service/ConnectionManager.cs +++ b/Squirrowse.Client/Service/ConnectionManager.cs @@ -14,9 +14,11 @@ namespace Squirrowse.Client.Service .AddMessagePackProtocol() .WithAutomaticReconnect() .Build(); - } - public HubConnection Connect() => _connection; + public HubConnection Connect() + { + return _connection; + } } } \ No newline at end of file diff --git a/Squirrowse.Client/Service/ICameraService.cs b/Squirrowse.Client/Service/ICameraService.cs index 3849785..3c9d75d 100644 --- a/Squirrowse.Client/Service/ICameraService.cs +++ b/Squirrowse.Client/Service/ICameraService.cs @@ -1,14 +1,11 @@ -using OpenCvSharp; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; +using System.Threading.Tasks; +using OpenCvSharp; namespace Squirrowse.Client.Service { public interface ICameraService { - public VideoCapture GetCamera(int height = 480, int widght = 640, double fps = 15f, bool disposable = false); - public Task GetFrame(VideoCapture video); + VideoCapture GetCamera(int height = 480, int widght = 640, double fps = 15f, bool disposable = false); + Task GetFrame(VideoCapture video); } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Service/IConnectionManager.cs b/Squirrowse.Client/Service/IConnectionManager.cs index d014347..c530417 100644 --- a/Squirrowse.Client/Service/IConnectionManager.cs +++ b/Squirrowse.Client/Service/IConnectionManager.cs @@ -5,6 +5,5 @@ namespace Squirrowse.Client.Service public interface IConnectionManager { HubConnection Connect(); - } } \ No newline at end of file diff --git a/Squirrowse.Client/Service/IStreamService.cs b/Squirrowse.Client/Service/IStreamService.cs index a56662e..8dbe9f5 100644 --- a/Squirrowse.Client/Service/IStreamService.cs +++ b/Squirrowse.Client/Service/IStreamService.cs @@ -1,14 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using System.Threading.Tasks; namespace Squirrowse.Client.Service { - public interface IStreamService + public interface IStreamService { Task SendStreamAsync(IAsyncEnumerable asb); Task SayHello(); - } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Service/StreamService.cs b/Squirrowse.Client/Service/StreamService.cs index c9292f6..b25ae02 100644 --- a/Squirrowse.Client/Service/StreamService.cs +++ b/Squirrowse.Client/Service/StreamService.cs @@ -1,10 +1,8 @@ -using Microsoft.AspNetCore.SignalR.Client; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR.Client; using Microsoft.Extensions.Logging; using Squirrowse.Core.Models; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; namespace Squirrowse.Client.Service { @@ -13,6 +11,7 @@ namespace Squirrowse.Client.Service private readonly IConnectionManager connectionManager; private readonly ILogger logger; private readonly HubConnection session; + public StreamService(ILogger logger, IConnectionManager connectionManager) { this.connectionManager = connectionManager; @@ -23,14 +22,7 @@ namespace Squirrowse.Client.Service public async Task SayHello() { - try - { - await session.SendAsync("AddToGroup",Groups.debug); - } - finally - { - - } + await session.SendAsync("AddToGroup", Groups.debug); } public async Task SendStreamAsync(IAsyncEnumerable asb) @@ -38,8 +30,7 @@ namespace Squirrowse.Client.Service try { logger.LogInformation($"{nameof(SendStreamAsync)} Start stream"); - await session.SendAsync("UploadByteStream", asb, default); - + await session.SendAsync("UploadByteStream", asb); } finally { @@ -47,4 +38,4 @@ namespace Squirrowse.Client.Service } } } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/Worker.cs b/Squirrowse.Client/Worker.cs index ac2a609..74d05be 100644 --- a/Squirrowse.Client/Worker.cs +++ b/Squirrowse.Client/Worker.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting; @@ -25,9 +23,9 @@ namespace Squirrowse.Client while (!stoppingToken.IsCancellationRequested) { _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now); - + await Task.Delay(1000, stoppingToken); } } } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/appsettings.Development.json b/Squirrowse.Client/appsettings.Development.json index e203e94..f999bc2 100644 --- a/Squirrowse.Client/appsettings.Development.json +++ b/Squirrowse.Client/appsettings.Development.json @@ -6,4 +6,4 @@ "Microsoft": "Information" } } -} +} \ No newline at end of file diff --git a/Squirrowse.Client/appsettings.json b/Squirrowse.Client/appsettings.json index 8983e0f..45fe774 100644 --- a/Squirrowse.Client/appsettings.json +++ b/Squirrowse.Client/appsettings.json @@ -6,4 +6,4 @@ "Microsoft.Hosting.Lifetime": "Information" } } -} +} \ No newline at end of file diff --git a/Squirrowse.Core/CoreModule.cs b/Squirrowse.Core/CoreModule.cs index 693e5c8..0937e25 100644 --- a/Squirrowse.Core/CoreModule.cs +++ b/Squirrowse.Core/CoreModule.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; namespace Squirrowse.Core @@ -13,4 +12,4 @@ namespace Squirrowse.Core return services; } } -} +} \ No newline at end of file diff --git a/Squirrowse.Core/Models/Groups.cs b/Squirrowse.Core/Models/Groups.cs index 8285440..4b20976 100644 --- a/Squirrowse.Core/Models/Groups.cs +++ b/Squirrowse.Core/Models/Groups.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Squirrowse.Core.Models +namespace Squirrowse.Core.Models { - public enum Groups + public enum Groups { - debug=-1, + debug = -1, normal, superUser } -} +} \ No newline at end of file diff --git a/Squirrowse.Core/Services/ImgExtensions.cs b/Squirrowse.Core/Services/ImgExtensions.cs index 1d73542..26382fa 100644 --- a/Squirrowse.Core/Services/ImgExtensions.cs +++ b/Squirrowse.Core/Services/ImgExtensions.cs @@ -1,5 +1,4 @@ using System.Linq; -using System.Runtime.CompilerServices; using OpenCvSharp; namespace Squirrowse.Core.Services @@ -8,7 +7,7 @@ namespace Squirrowse.Core.Services { public static byte[] ConvertToJpgByte(this Mat mat) { - Cv2.ImEncode(".jpg", mat, out var imgbuffer);//no need to dispose + Cv2.ImEncode(".jpg", mat, out var imgbuffer); //no need to dispose return imgbuffer.Any() ? imgbuffer : new byte[] { }; } diff --git a/Squirrowse.Service/Hubs/IStreamHub.cs b/Squirrowse.Service/Hubs/IStreamHub.cs index 81fb63c..32e0a0a 100644 --- a/Squirrowse.Service/Hubs/IStreamHub.cs +++ b/Squirrowse.Service/Hubs/IStreamHub.cs @@ -1,7 +1,6 @@ -using Squirrowse.Core.Models; -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Squirrowse.Core.Models; namespace Squirrowse.Service.Hubs { @@ -11,9 +10,8 @@ namespace Squirrowse.Service.Hubs Task UploadByteStream(IAsyncEnumerable stream); Task Startstream(string userId); Task StopStream(string userId); - Task ExecCommandOnAll(string command,object[] act);//gni - Task AddToGroup(Groups group,string user=""); - Task RemoveFromGroup(Groups group,string user=""); - + Task ExecCommandOnAll(string command, object[] act); //gni + Task AddToGroup(Groups group, string user = ""); + Task RemoveFromGroup(Groups group, string user = ""); } } \ No newline at end of file diff --git a/Squirrowse.Service/Hubs/StreamHub.cs b/Squirrowse.Service/Hubs/StreamHub.cs index fab0661..9a18994 100644 --- a/Squirrowse.Service/Hubs/StreamHub.cs +++ b/Squirrowse.Service/Hubs/StreamHub.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Security.AccessControl; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; -using NLog; using Squirrowse.Core.Models; namespace Squirrowse.Service.Hubs @@ -13,7 +10,7 @@ namespace Squirrowse.Service.Hubs public class StreamHub : Hub, IStreamHub //fujka { private readonly ILogger logger; - + public StreamHub(ILogger logger) { this.logger = logger; @@ -26,24 +23,24 @@ namespace Squirrowse.Service.Hubs public async Task AddToGroup(Groups group, string user = "") { - string connectionId = string.IsNullOrWhiteSpace(user) ? Context.ConnectionId : user; + var connectionId = string.IsNullOrWhiteSpace(user) ? Context.ConnectionId : user; await Groups.AddToGroupAsync(connectionId, group.ToString()); logger.LogInformation($"{nameof(AddToGroup)}: {connectionId} joined to {group}"); } + /// - /// USE ONLY FOR DEBUG + /// USE ONLY FOR DEBUG /// /// /// DESTRUCTION - public async Task ExecCommandOnAll(string command,object[] act) + public async Task ExecCommandOnAll(string command, object[] act) { - await Clients.All.SendCoreAsync(command,act); + await Clients.All.SendCoreAsync(command, act); } public async Task RemoveFromGroup(Groups group, string user = "") { - - string connectionId = string.IsNullOrWhiteSpace(user) ? Context.ConnectionId : user; + var connectionId = string.IsNullOrWhiteSpace(user) ? Context.ConnectionId : user; await Groups.RemoveFromGroupAsync(connectionId, group.ToString()); logger.LogInformation($"{nameof(AddToGroup)}: {connectionId} joined to {group}"); } @@ -52,7 +49,7 @@ namespace Squirrowse.Service.Hubs { var client = Clients.Client(clientId); - await client.SendAsync("Start"); + await client.SendAsync("Start"); } @@ -71,6 +68,5 @@ namespace Squirrowse.Service.Hubs await Task.Delay(100); //leave some delay for debug purpose } } - } -} +} \ No newline at end of file diff --git a/Squirrowse.Service/IUserProvider.cs b/Squirrowse.Service/IUserProvider.cs index 6c98471..64425be 100644 --- a/Squirrowse.Service/IUserProvider.cs +++ b/Squirrowse.Service/IUserProvider.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Squirrowse.Service +namespace Squirrowse.Service { public interface IUserProvider { string GetUserId(); } -} +} \ No newline at end of file diff --git a/Squirrowse.Service/Program.cs b/Squirrowse.Service/Program.cs index 7fc9e0e..34c05db 100644 --- a/Squirrowse.Service/Program.cs +++ b/Squirrowse.Service/Program.cs @@ -1,14 +1,12 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using NLog; using NLog.Extensions.Logging; using NLog.Web; + namespace Squirrowse.Service { public class Program @@ -65,4 +63,4 @@ namespace Squirrowse.Service return logger; } } -} +} \ No newline at end of file diff --git a/Squirrowse.Service/Properties/launchSettings.json b/Squirrowse.Service/Properties/launchSettings.json index c54b9fa..78db389 100644 --- a/Squirrowse.Service/Properties/launchSettings.json +++ b/Squirrowse.Service/Properties/launchSettings.json @@ -27,4 +27,4 @@ } } } -} +} \ No newline at end of file diff --git a/Squirrowse.Service/Squirrowse.Service.csproj b/Squirrowse.Service/Squirrowse.Service.csproj index c705037..efe8c59 100644 --- a/Squirrowse.Service/Squirrowse.Service.csproj +++ b/Squirrowse.Service/Squirrowse.Service.csproj @@ -22,4 +22,4 @@ - + \ No newline at end of file diff --git a/Squirrowse.Service/Startup.cs b/Squirrowse.Service/Startup.cs index d11e0be..aae1577 100644 --- a/Squirrowse.Service/Startup.cs +++ b/Squirrowse.Service/Startup.cs @@ -24,7 +24,8 @@ namespace Squirrowse.Service services.AddControllers(); services.AddMediatR(Assembly.GetAssembly(typeof(Startup))); services.AddSignalR() - .AddHubOptions(opt => opt.MaximumReceiveMessageSize = 102400000)//~100mb per frame instead of 32kb default + .AddHubOptions(opt => opt.MaximumReceiveMessageSize = 102400000) //~100mb per frame instead of 32kb default .AddMessagePackProtocol(); } diff --git a/Squirrowse.Service/UserProvider.cs b/Squirrowse.Service/UserProvider.cs index 9b4279b..eb1d2a3 100644 --- a/Squirrowse.Service/UserProvider.cs +++ b/Squirrowse.Service/UserProvider.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace Squirrowse.Service { @@ -12,4 +9,4 @@ namespace Squirrowse.Service throw new NotImplementedException(); } } -} +} \ No newline at end of file diff --git a/Squirrowse.Service/appsettings.Development.json b/Squirrowse.Service/appsettings.Development.json index e203e94..f999bc2 100644 --- a/Squirrowse.Service/appsettings.Development.json +++ b/Squirrowse.Service/appsettings.Development.json @@ -6,4 +6,4 @@ "Microsoft": "Information" } } -} +} \ No newline at end of file