Use AppVersionHelper in DeviceInfoGeneratorBase.

immense · May 3, 2023 · 757086b · 757086b
1 parent 3cf0de4
commit 757086b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 34 deletions.
diff --git a/Agent/Interfaces/IDeviceInformationService.cs b/Agent/Interfaces/IDeviceInformationService.cs
@@ -10,10 +10,5 @@ namespace Remotely.Agent.Interfaces
     public interface IDeviceInformationService
     {
         Task<Device> CreateDevice(string deviceId, string orgId);
-        Device GetDeviceBase(string deviceID, string orgID);
-        (double usedStorage, double totalStorage) GetSystemDriveInfo();
-        (double usedGB, double totalGB) GetMemoryInGB();
-        string GetAgentVersion();
-        List<Drive> GetAllDrives();
     }
 }
diff --git a/Agent/Services/DeviceInfoGeneratorBase.cs b/Agent/Services/DeviceInfoGeneratorBase.cs
@@ -1,15 +1,11 @@
 using Microsoft.Extensions.Logging;
 using Remotely.Shared.Models;
-using Remotely.Shared.Services;
 using Remotely.Shared.Utilities;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Remotely.Agent.Services
 {
@@ -22,7 +18,7 @@ public DeviceInfoGeneratorBase(ILogger<DeviceInfoGeneratorBase> logger)
             _logger = logger;
         }
 
-        public Device GetDeviceBase(string deviceID, string orgID)
+        protected Device GetDeviceBase(string deviceID, string orgID)
         {
 
             return new Device()
@@ -35,11 +31,12 @@ public Device GetDeviceBase(string deviceID, string orgID)
                 OSDescription = RuntimeInformation.OSDescription,
                 Is64Bit = Environment.Is64BitOperatingSystem,
                 IsOnline = true,
-                OrganizationID = orgID
-            };
+                OrganizationID = orgID,
+                AgentVersion = AppVersionHelper.GetAppVersion()
+        };
         }
 
-        public (double usedStorage, double totalStorage) GetSystemDriveInfo()
+        protected (double usedStorage, double totalStorage) GetSystemDriveInfo()
         {
             try
             {
@@ -77,24 +74,7 @@ public Device GetDeviceBase(string deviceID, string orgID)
             return (0, 0);
         }
 
-        public string GetAgentVersion()
-        {
-            try
-            {
-                if (File.Exists("Remotely_Agent.dll"))
-                {
-                    return FileVersionInfo.GetVersionInfo("Remotely_Agent.dll").FileVersion.ToString().Trim();
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error getting agent version.");
-            }
-
-            return "0.0.0.0";
-        }
-
-        public List<Drive> GetAllDrives()
+        protected List<Drive> GetAllDrives()
         {
             try
             {

diff --git a/Agent/Services/Linux/DeviceInfoGeneratorLinux.cs b/Agent/Services/Linux/DeviceInfoGeneratorLinux.cs
@@ -43,7 +43,6 @@ public Task<Device> CreateDevice(string deviceId, string orgId)
                 device.UsedMemory = usedMemory;
                 device.TotalMemory = totalMemory;
                 device.CpuUtilization = _cpuUtilSampler.CurrentUtilization;
-                device.AgentVersion = GetAgentVersion();
             }
             catch (Exception ex)
             {

diff --git a/Agent/Services/MacOS/DeviceInfoGeneratorMac.cs b/Agent/Services/MacOS/DeviceInfoGeneratorMac.cs
@@ -38,7 +38,6 @@ public async Task<Device> CreateDevice(string deviceId, string orgId)
                 device.UsedMemory = usedMemory;
                 device.TotalMemory = totalMemory;
                 device.CpuUtilization = await GetCpuUtilization();
-                device.AgentVersion = GetAgentVersion();
             }
             catch (Exception ex)
             {

diff --git a/Agent/Services/Windows/DeviceInfoGeneratorWin.cs b/Agent/Services/Windows/DeviceInfoGeneratorWin.cs
@@ -39,7 +39,6 @@ public Task<Device> CreateDevice(string deviceId, string orgId)
                 device.UsedMemory = usedMemory;
                 device.TotalMemory = totalMemory;
                 device.CpuUtilization = _cpuUtilSampler.CurrentUtilization;
-                device.AgentVersion = GetAgentVersion();
             }
             catch (Exception ex)
             {