Move Serilog packagse. Rename DisplayManager.

bitbound · Nov 15, 2024 · 7b2e999 · 7b2e999
1 parent 5ca0d82
commit 7b2e999
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 20 deletions.
diff --git a/ControlR.Streamer/ControlR.Streamer.csproj b/ControlR.Streamer/ControlR.Streamer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <ApplicationIcon>appicon.ico</ApplicationIcon>

diff --git a/ControlR.Streamer/Program.cs b/ControlR.Streamer/Program.cs
@@ -8,6 +8,7 @@
 using ControlR.Libraries.Shared.Services.Buffers;
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.SignalR.Client;
+using ControlR.Libraries.DevicesCommon.Extensions;
 
 var sessionIdOption = new Option<Guid>(
     ["-s", "--session-id"],
@@ -85,7 +86,7 @@
   services.AddSingleton(WeakReferenceMessenger.Default);
   services.AddSingleton<IWin32Interop, Win32Interop>();
   services.AddSingleton<IToaster, Toaster>();
-  services.AddSingleton<IDisplayManager, DisplayManager>();
+  services.AddSingleton<IDesktopCapturer, DisplayManager>();
   services.AddSingleton<IInputSimulator, InputSimulatorWindows>();
   services.AddSingleton<IMemoryProvider, MemoryProvider>();
   services.AddSingleton<ISystemTime, SystemTime>();

diff --git a/ControlR.Streamer/Services/DisplayManager.cs → ...rolR.Streamer/Services/DesktopCapturer.cs b/ControlR.Streamer/Services/DisplayManager.cs → ...rolR.Streamer/Services/DesktopCapturer.cs
@@ -11,7 +11,7 @@
 
 namespace ControlR.Streamer.Services;
 
-internal interface IDisplayManager
+internal interface IDesktopCapturer
 {
   Task ChangeDisplays(string displayId);
   Task<Point> ConvertPercentageLocationToAbsolute(double percentX, double percentY);
@@ -24,7 +24,7 @@ internal interface IDisplayManager
   Task StartCapturingChanges();
 }
 
-internal class DisplayManager : IDisplayManager
+internal class DisplayManager : IDesktopCapturer
 {
   private const int DefaultImageQuality = 75;
   private const int MinimumQuality = 20;

diff --git a/ControlR.Streamer/Services/DtoHandler.cs b/ControlR.Streamer/Services/DtoHandler.cs
@@ -5,15 +5,15 @@
 namespace ControlR.Streamer.Services;
 
 internal class DtoHandler(
-  IDisplayManager displayManager,
+  IDesktopCapturer desktopCapturer,
   IClipboardManager clipboardManager,
   IInputSimulator inputSimulator,
   IHostApplicationLifetime appLifetime,
   IMessenger messenger,
   IStreamerStreamingClient streamingClient,
   ILogger<DtoHandler> logger) : IHostedService
 {
-  private readonly IDisplayManager _displayManager = displayManager;
+  private readonly IDesktopCapturer _desktopCapturer = desktopCapturer;
   private readonly IClipboardManager _clipboardManager = clipboardManager;
   private readonly IInputSimulator _inputSimulator = inputSimulator;
   private readonly IHostApplicationLifetime _appLifetime = appLifetime;
@@ -53,13 +53,13 @@ private async Task HandleDtoReceivedMessage(object subscriber, DtoReceivedMessag
         case DtoType.ChangeDisplays:
           {
             var payload = wrapper.GetPayload<ChangeDisplaysDto>();
-            await _displayManager.ChangeDisplays(payload.DisplayId);
+            await _desktopCapturer.ChangeDisplays(payload.DisplayId);
             break;
           }
         case DtoType.WheelScroll:
           {
             var payload = wrapper.GetPayload<WheelScrollDto>();
-            var point = await _displayManager.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
+            var point = await _desktopCapturer.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
             _inputSimulator.ScrollWheel(point.X, point.Y, (int)payload.ScrollY, (int)payload.ScrollX);
             break;
           }
@@ -98,22 +98,22 @@ private async Task HandleDtoReceivedMessage(object subscriber, DtoReceivedMessag
         case DtoType.MovePointer:
           {
             var payload = wrapper.GetPayload<MovePointerDto>();
-            var point = await _displayManager.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
+            var point = await _desktopCapturer.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
             _inputSimulator.MovePointer(point.X, point.Y, MovePointerType.Absolute);
             break;
           }
         case DtoType.MouseButtonEvent:
           {
             var payload = wrapper.GetPayload<MouseButtonEventDto>();
-            var point = await _displayManager.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
+            var point = await _desktopCapturer.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
             _inputSimulator.MovePointer(point.X, point.Y, MovePointerType.Absolute);
             _inputSimulator.InvokeMouseButtonEvent(point.X, point.Y, payload.Button, payload.IsPressed);
             break;
           }
         case DtoType.MouseClick:
           {
             var payload = wrapper.GetPayload<MouseClickDto>();
-            var point = await _displayManager.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
+            var point = await _desktopCapturer.ConvertPercentageLocationToAbsolute(payload.PercentX, payload.PercentY);
             _inputSimulator.MovePointer(point.X, point.Y, MovePointerType.Absolute);
             _inputSimulator.InvokeMouseButtonEvent(point.X, point.Y, payload.Button, true);
             _inputSimulator.InvokeMouseButtonEvent(point.X, point.Y, payload.Button, false);

diff --git a/ControlR.Streamer/Services/StreamerStreamingClient.cs b/ControlR.Streamer/Services/StreamerStreamingClient.cs
@@ -18,7 +18,7 @@ internal sealed class StreamerStreamingClient(
   IMessenger messenger,
   IHostApplicationLifetime appLifetime,
   IToaster toaster,
-  IDisplayManager displayManager,
+  IDesktopCapturer displayManager,
   IClipboardManager clipboardManager,
   IMemoryProvider memoryProvider,
   IInputSimulator inputSimulator,
@@ -28,7 +28,7 @@ internal sealed class StreamerStreamingClient(
 {
   private readonly IHostApplicationLifetime _appLifetime = appLifetime;
   private readonly IClipboardManager _clipboardManager = clipboardManager;
-  private readonly IDisplayManager _displayManager = displayManager;
+  private readonly IDesktopCapturer _displayManager = displayManager;
   private readonly IInputSimulator _inputSimulator = inputSimulator;
   private readonly ILogger<StreamerStreamingClient> _logger = logger;
   private readonly IOptions<StartupOptions> _startupOptions = startupOptions;

diff --git a/Libraries/ControlR.Libraries.Agent/Startup/IHostBuilderExtensions.cs b/Libraries/ControlR.Libraries.Agent/Startup/IHostBuilderExtensions.cs
@@ -7,6 +7,7 @@
 using ControlR.Libraries.Agent.Services.Linux;
 using ControlR.Libraries.Agent.Services.Mac;
 using ControlR.Libraries.Agent.Services.Windows;
+using ControlR.Libraries.DevicesCommon.Extensions;
 using ControlR.Libraries.DevicesNative.Services;
 using ControlR.Libraries.Shared.Interfaces.HubClients;
 using ControlR.Libraries.Shared.Services.Buffers;

diff --git a/Libraries/ControlR.Libraries.DevicesCommon/ControlR.Libraries.DevicesCommon.csproj b/Libraries/ControlR.Libraries.DevicesCommon/ControlR.Libraries.DevicesCommon.csproj
@@ -18,6 +18,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="Bitbound.SimpleMessenger" Version="2.3.14" />
+    <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...hared/Extensions/SerilogHostExtensions.cs → ...ommon/Extensions/SerilogHostExtensions.cs b/...hared/Extensions/SerilogHostExtensions.cs → ...ommon/Extensions/SerilogHostExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
-namespace ControlR.Libraries.Shared.Extensions;
+namespace ControlR.Libraries.DevicesCommon.Extensions;
 
 public static class SerilogHostExtensions
 {

diff --git a/Libraries/ControlR.Libraries.ScreenCapture/BitmapUtility.cs b/Libraries/ControlR.Libraries.ScreenCapture/BitmapUtility.cs
@@ -38,7 +38,6 @@ public byte[] EncodeJpeg(Bitmap bitmap, int quality)
     //using var encoderParams = new EncoderParameters(1);
     //encoderParams.Param[0] = new EncoderParameter(Encoder.Quality, quality);
     //bitmap.Save(ms, _jpegEncoder, encoderParams);
-    bitmap.Save(ms, ImageFormat.Jpeg);
     return ms.ToArray();
   }
 

diff --git a/Libraries/ControlR.Libraries.Shared/ControlR.Libraries.Shared.csproj b/Libraries/ControlR.Libraries.Shared/ControlR.Libraries.Shared.csproj
@@ -12,11 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+
   </ItemGroup>
 
   <ItemGroup>