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 @@
-
+
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
diff --git a/ICD.Common.Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs
index 64e21a6..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,10 +62,24 @@ namespace ICD.Common.Utils
{
get
{
- if (IcdEnvironment.RuntimeEnvironment == IcdEnvironment.eRuntimeEnvironment.SimplSharpProMono)
- return Join(RootConfigPath, "ProgramConfig");
+ 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();
+ }
- string directoryName = string.Format("Program{0:D2}Config", ProgramUtils.ProgramNumber);
return Join(RootConfigPath, directoryName);
}
}
@@ -87,6 +102,37 @@ 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;
+
+ 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);
+ }
+ }
+
#endregion
#region Methods
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.
///