feat: Changed ProcessorUtils Uptimes to StartTime

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+ - ProcessorUtils Uptime methods changed to StartTime
 
 ## [14.1.0] - 2021-01-21
 ### Added

ICD.Common.Utils/ProcessorUtils.SimplSharp.cs

@@ -228,21 +228,6 @@ namespace ICD.Common.Utils
 			IcdConsole.SendControlSystemCommand("reboot", ref consoleResult);
 		}
 
-		/// <summary>
-		/// Gets the uptime for the system
-		/// </summary>
-		/// <returns></returns>
-		[PublicAPI]
-		public static TimeSpan GetSystemUptime()
-		{
-			if (s_SystemUptimeStartTimeUtc == null)
-				UpdateSystemStartTime();
-
-			if (s_SystemUptimeStartTimeUtc != null)
-				return IcdEnvironment.GetUtcTime() - s_SystemUptimeStartTimeUtc.Value;
-			return default(TimeSpan);
-		}
-
 		/// <summary>
 		/// Gets the time the system was started
 		/// DateTime that uptime starts
@@ -262,14 +247,16 @@ namespace ICD.Common.Utils
 		/// </summary>
 		/// <returns></returns>
 		[PublicAPI]
-		public static TimeSpan GetProgramUptime()
-		{
-			if (s_ProgramUptimeStartTimeUtc == null)
+		public static DateTime? GetProgramStartTime()
 		{
+			if (s_ProgramUptimeStartTimeUtc != null)
+				return s_ProgramUptimeStartTimeUtc;
+
+
 			string uptime = GetProgramUptimeFeedback((int)ProgramUtils.ProgramNumber);
 			Match match = Regex.Match(uptime, UPTIME_REGEX);
 			if (!match.Success)
-					return default(TimeSpan);
+				return null;
 
 			int days = int.Parse(match.Groups["days"].Value);
 			int hours = int.Parse(match.Groups["hours"].Value);
@@ -279,9 +266,8 @@ namespace ICD.Common.Utils
 
 			TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
 			s_ProgramUptimeStartTimeUtc = IcdEnvironment.GetUtcTime() - span;
-			}
 
-			return IcdEnvironment.GetUtcTime() - s_ProgramUptimeStartTimeUtc.Value;
+			return s_ProgramUptimeStartTimeUtc;
 		}
 
 		#endregion

ICD.Common.Utils/ProcessorUtils.Standard.cs

@@ -137,16 +137,6 @@ namespace ICD.Common.Utils
 			throw new NotSupportedException();
 		}
 
-		/// <summary>
-		/// Gets the uptime for the system
-		/// </summary>
-		/// <returns></returns>
-		[PublicAPI]
-		public static TimeSpan GetSystemUptime()
-		{
-			return TimeSpan.FromMilliseconds(Environment.TickCount);
-		}
-
 		/// <summary>
 		/// Gets the time the system was started
 		/// DateTime that uptime starts
@@ -162,14 +152,14 @@ namespace ICD.Common.Utils
 		}
 
 		/// <summary>
-		/// Gets the uptime 
+		/// Gets the time the program was started
+		/// Datetime the program starts
 		/// </summary>
 		/// <returns></returns>
 		[PublicAPI]
-		public static TimeSpan GetProgramUptime()
+		public static DateTime? GetProgramStartTime()
 		{
-			var current = System.Diagnostics.Process.GetCurrentProcess();
-			return IcdEnvironment.GetLocalTime() - current.StartTime;
+			return GetSystemStartTime();
 		}
 
 		#endregion