diff --git a/ATxCommon/Serializables/ServiceStatus.cs b/ATxCommon/Serializables/ServiceStatus.cs index f99735e01bca70b4254ca15329acbe5808a42023..4510c12ded5bee5f577740826245f358e904f452 100644 --- a/ATxCommon/Serializables/ServiceStatus.cs +++ b/ATxCommon/Serializables/ServiceStatus.cs @@ -331,13 +331,13 @@ namespace ATxCommon.Serializables $"TransferInProgress: {TransferInProgress}\n" + $"CurrentTransferSize: {CurrentTransferSize}\n" + $"LastStatusUpdate: {LastStatusUpdate:yyyy-MM-dd HH:mm:ss}" + - $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastStatusUpdate))})\n" + + $" ({TimeUtils.HumanSince(LastStatusUpdate)})\n" + $"LastStorageNotification: {LastStorageNotification:yyyy-MM-dd HH:mm:ss}" + - $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastStorageNotification))})\n" + + $" ({TimeUtils.HumanSince(LastStorageNotification)})\n" + $"LastAdminNotification: {LastAdminNotification:yyyy-MM-dd HH:mm:ss}" + - $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastAdminNotification))})\n" + + $" ({TimeUtils.HumanSince(LastAdminNotification)})\n" + $"LastGraceNotification: {LastGraceNotification:yyyy-MM-dd HH:mm:ss}" + - $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastGraceNotification))})\n"; + $" ({TimeUtils.HumanSince(LastGraceNotification)})\n"; } #endregion validate and report diff --git a/ATxCommon/TimeUtils.cs b/ATxCommon/TimeUtils.cs index fae6dfde01ebb23d1d2d75f8cb35460278e42bf7..1cc9d94ec7485e03dd65d52f5891ae7697e51c71 100644 --- a/ATxCommon/TimeUtils.cs +++ b/ATxCommon/TimeUtils.cs @@ -97,5 +97,14 @@ namespace ATxCommon public static string DaysToHuman(long delta) { return MinutesToHuman(delta * 60 * 24); } + + /// <summary> + /// Wrapper to convert a date into a human readable string relative to now. + /// </summary> + /// <param name="refDate">The reference DateTime to check.</param> + /// <returns>A string describing the delta, e.g. "12 days" or "3 weeks".</returns> + public static string HumanSince(DateTime refDate) { + return SecondsToHuman(SecondsSince(refDate)); + } } }