From 7d1cc3139f6dbab34e2649607ac9b13a21c7c6ec Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 8 Apr 2019 14:00:47 -0400 Subject: [PATCH 1/6] chore: Updating nuget packages --- .../ICD.Common.Utils.Tests_NetStandard.csproj | 4 ++-- ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj b/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj index e42abf3..c0662b9 100644 --- a/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj +++ b/ICD.Common.Utils.Tests/ICD.Common.Utils.Tests_NetStandard.csproj @@ -20,9 +20,9 @@ - + - + diff --git a/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj b/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj index bed20df..31eb3a4 100644 --- a/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj +++ b/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj @@ -39,7 +39,7 @@ - + From 23afa8e0252a8ddfc7b2e497e8b2843016659088 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 8 Apr 2019 15:47:52 -0400 Subject: [PATCH 2/6] feat: Windows and VC4 use Config directory for configuration --- ICD.Common.Utils/PathUtils.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ICD.Common.Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs index 64e21a6..b1e47b7 100644 --- a/ICD.Common.Utils/PathUtils.cs +++ b/ICD.Common.Utils/PathUtils.cs @@ -61,10 +61,16 @@ namespace ICD.Common.Utils { get { - if (IcdEnvironment.RuntimeEnvironment == IcdEnvironment.eRuntimeEnvironment.SimplSharpProMono) - return Join(RootConfigPath, "ProgramConfig"); + string directoryName = "Config"; + + switch (IcdEnvironment.RuntimeEnvironment) + { + case IcdEnvironment.eRuntimeEnvironment.SimplSharp: + case IcdEnvironment.eRuntimeEnvironment.SimplSharpPro: + directoryName = string.Format("Program{0:D2}Config", ProgramUtils.ProgramNumber); + break; + } - string directoryName = string.Format("Program{0:D2}Config", ProgramUtils.ProgramNumber); return Join(RootConfigPath, directoryName); } } From 8892e6e22390a587e19b7c4325582fba29395dca Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 8 Apr 2019 15:48:05 -0400 Subject: [PATCH 3/6] feat: Adding ProgramLogsPath to PathUtils --- ICD.Common.Utils/PathUtils.cs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ICD.Common.Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs index b1e47b7..9abce80 100644 --- a/ICD.Common.Utils/PathUtils.cs +++ b/ICD.Common.Utils/PathUtils.cs @@ -93,6 +93,29 @@ namespace ICD.Common.Utils [PublicAPI] public static string ProgramLibPath { get { return Join(ProgramConfigPath, "Lib"); } } + /// + /// Returns the absolute path to the logs directory. + /// + /// + [PublicAPI] + public static string ProgramLogsPath + { + get + { + string directoryName = "Logs"; + + switch (IcdEnvironment.RuntimeEnvironment) + { + case IcdEnvironment.eRuntimeEnvironment.SimplSharp: + case IcdEnvironment.eRuntimeEnvironment.SimplSharpPro: + directoryName = string.Format("Program{0:D2}Logs", ProgramUtils.ProgramNumber); + break; + } + + return Join(RootConfigPath, directoryName); + } + } + #endregion #region Methods From 26b924dd484a87a4e347679a3e97a729a96d572e Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 8 Apr 2019 16:31:53 -0400 Subject: [PATCH 4/6] feat: IcdStreamWriter exposes WriteLine(string) --- ICD.Common.Utils/IO/IcdStreamWriter.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ICD.Common.Utils/IO/IcdStreamWriter.cs b/ICD.Common.Utils/IO/IcdStreamWriter.cs index 9e0da04..78b7eae 100644 --- a/ICD.Common.Utils/IO/IcdStreamWriter.cs +++ b/ICD.Common.Utils/IO/IcdStreamWriter.cs @@ -17,5 +17,10 @@ namespace ICD.Common.Utils.IO public IcdStreamWriter(StreamWriter baseStreamWriter) : base(baseStreamWriter) { } + + public void WriteLine(string value) + { + WrappedStreamWriter.WriteLine(value); + } } } \ No newline at end of file From d8741773c55aafad9349e187cf897f77f625889a Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 8 Apr 2019 16:38:01 -0400 Subject: [PATCH 5/6] refactor: Removing unused code --- ICD.Common.Utils/Services/Logging/LogItem.cs | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/ICD.Common.Utils/Services/Logging/LogItem.cs b/ICD.Common.Utils/Services/Logging/LogItem.cs index 9e55de4..fe45131 100644 --- a/ICD.Common.Utils/Services/Logging/LogItem.cs +++ b/ICD.Common.Utils/Services/Logging/LogItem.cs @@ -1,5 +1,4 @@ using System; -using System.Text; using ICD.Common.Properties; namespace ICD.Common.Utils.Services.Logging @@ -21,11 +20,6 @@ namespace ICD.Common.Utils.Services.Logging [PublicAPI] public DateTime Timestamp { get { return m_Timestamp; } } - /// - /// Gets the log time in local time. - /// - public DateTime LocalTimestamp { get { return Timestamp.ToLocalTime(); } } - /// /// Get/Set for severity level. /// @@ -56,24 +50,6 @@ namespace ICD.Common.Utils.Services.Logging #region Methods - /// - /// Return the text format to send to Fusion - /// - /// text format for fusion, including timestamp, severity, and message - [PublicAPI] - public string GetFusionLogText() - { - StringBuilder s = new StringBuilder(); - - s.Append(Timestamp.ToString("yyyyMMddHHmmss")); - s.Append("||"); - s.Append((int)Severity); - s.Append("||"); - s.Append(Message); - - return s.ToString(); - } - /// /// Implementing default equality. /// From 715c198763875f3234320dbba6425156039c137d Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 8 Apr 2019 17:00:10 -0400 Subject: [PATCH 6/6] feat: Keeping paths as they were until we can agree on an approach going forwards --- ICD.Common.Utils/PathUtils.cs | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ICD.Common.Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs index 9abce80..338a9aa 100644 --- a/ICD.Common.Utils/PathUtils.cs +++ b/ICD.Common.Utils/PathUtils.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using ICD.Common.Properties; using ICD.Common.Utils.Extensions; @@ -61,14 +62,22 @@ namespace ICD.Common.Utils { get { - string directoryName = "Config"; + string directoryName; switch (IcdEnvironment.RuntimeEnvironment) { case IcdEnvironment.eRuntimeEnvironment.SimplSharp: case IcdEnvironment.eRuntimeEnvironment.SimplSharpPro: + case IcdEnvironment.eRuntimeEnvironment.Standard: directoryName = string.Format("Program{0:D2}Config", ProgramUtils.ProgramNumber); break; + + case IcdEnvironment.eRuntimeEnvironment.SimplSharpProMono: + directoryName = "ProgramConfig"; + break; + + default: + throw new ArgumentOutOfRangeException(); } return Join(RootConfigPath, directoryName); @@ -102,14 +111,22 @@ namespace ICD.Common.Utils { get { - string directoryName = "Logs"; + string directoryName; switch (IcdEnvironment.RuntimeEnvironment) { case IcdEnvironment.eRuntimeEnvironment.SimplSharp: case IcdEnvironment.eRuntimeEnvironment.SimplSharpPro: + case IcdEnvironment.eRuntimeEnvironment.Standard: directoryName = string.Format("Program{0:D2}Logs", ProgramUtils.ProgramNumber); break; + + case IcdEnvironment.eRuntimeEnvironment.SimplSharpProMono: + directoryName = "ProgramLogs"; + break; + + default: + throw new ArgumentOutOfRangeException(); } return Join(RootConfigPath, directoryName);