icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-01-11 19:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ConnectPro_v1.8' into ConnectPro_v1.9

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Chris Cameron
2021-02-04 11:34:06 -05:00
parent 8427f2c0c6 5bf8fcc71f
commit 1db7d4b45d
4 changed files with 26 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed
- Added GetParentUri method to UriExtensions
## [14.2.0] - 2021-02-04
### Changed
- ProcessorUtils Uptime methods changed to StartTime
## [14.1.0] - 2021-01-21
### Added
- Added overload to GuidUtils that takes an enumerable of guids and combines them into a new deterministic guid

48
ICD.Common.Utils/ProcessorUtils.SimplSharp.cs
View File

@@ -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,26 +247,27 @@ namespace ICD.Common.Utils
/// </summary>
/// <returns></returns>
[PublicAPI]
public static TimeSpan GetProgramUptime()
public static DateTime? GetProgramStartTime()
{
if (s_ProgramUptimeStartTimeUtc == null)
{
string uptime = GetProgramUptimeFeedback((int)ProgramUtils.ProgramNumber);
Match match = Regex.Match(uptime, UPTIME_REGEX);
if (!match.Success)
return default(TimeSpan);
if (s_ProgramUptimeStartTimeUtc != null)
return s_ProgramUptimeStartTimeUtc;
int days = int.Parse(match.Groups["days"].Value);
int hours = int.Parse(match.Groups["hours"].Value);
int minutes = int.Parse(match.Groups["minutes"].Value);
int seconds = int.Parse(match.Groups["seconds"].Value);
int milliseconds = int.Parse(match.Groups["milliseconds"].Value);
TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
s_ProgramUptimeStartTimeUtc = IcdEnvironment.GetUtcTime() - span;
}
string uptime = GetProgramUptimeFeedback((int)ProgramUtils.ProgramNumber);
Match match = Regex.Match(uptime, UPTIME_REGEX);
if (!match.Success)
return null;
return IcdEnvironment.GetUtcTime() - s_ProgramUptimeStartTimeUtc.Value;
int days = int.Parse(match.Groups["days"].Value);
int hours = int.Parse(match.Groups["hours"].Value);
int minutes = int.Parse(match.Groups["minutes"].Value);
int seconds = int.Parse(match.Groups["seconds"].Value);
int milliseconds = int.Parse(match.Groups["milliseconds"].Value);
TimeSpan span = new TimeSpan(days, hours, minutes, seconds, milliseconds);
s_ProgramUptimeStartTimeUtc = IcdEnvironment.GetUtcTime() - span;
return s_ProgramUptimeStartTimeUtc;
}
#endregion

18
ICD.Common.Utils/ProcessorUtils.Standard.cs
View File

@@ -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

2
ICD.Common.Utils/Properties/AssemblyInfo.cs
View File

@@ -4,4 +4,4 @@ using System.Reflection;
[assembly: AssemblyCompany("ICD Systems")]
[assembly: AssemblyProduct("ICD.Common.Utils")]
[assembly: AssemblyCopyright("Copyright © ICD Systems 2021")]
[assembly: AssemblyVersion("14.1.0.0")]
[assembly: AssemblyVersion("14.2.0.0")]