pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-14 12:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144 from PepperDash/hotfix/update-debug-file-path-for-vc4

Browse Source 
Updates for VC4
This commit is contained in:
Neil Dorin
2022-11-14 09:45:30 -07:00
committed by GitHub
parent 89c503c636 5c88d22f7f
commit 3fe3b63aaf
2 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs
View File

@@ -70,6 +70,11 @@ namespace PepperDash.Core
/// </summary> /// </summary>
public string DeviceReadyResponsePattern { get; set; } public string DeviceReadyResponsePattern { get; set; }
/// <summary>
/// Used when communcating to programs running in VC-4
/// </summary>
public string RoomId { get; set; }
/// <summary> /// <summary>
/// Constructor /// Constructor
/// </summary> /// </summary>

49
Pepperdash Core/Pepperdash Core/Logging/Debug.cs
View File

@@ -69,7 +69,16 @@ namespace PepperDash.Core
// Get the assembly version and print it to console and the log // Get the assembly version and print it to console and the log
GetVersion(); GetVersion();
var msg = string.Format("[App {0}] Using PepperDash_Core v{1}", InitialParametersClass.ApplicationNumber, PepperDashCoreVersion); string msg = "";
if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
{
msg = string.Format("[App {0}] Using PepperDash_Core v{1}", InitialParametersClass.ApplicationNumber, PepperDashCoreVersion);
}
else if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Server)
{
msg = string.Format("[Room {0}] Using PepperDash_Core v{1}", InitialParametersClass.RoomId, PepperDashCoreVersion);
}
CrestronConsole.PrintLine(msg); CrestronConsole.PrintLine(msg);
@@ -367,9 +376,21 @@ namespace PepperDash.Core
/// <param name="items">Object parameters</param> /// <param name="items">Object parameters</param>
public static void Console(uint level, string format, params object[] items) public static void Console(uint level, string format, params object[] items)
{ {
if (Level >= level) if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Server)
CrestronConsole.PrintLine("[{0}]App {1}:{2}", DateTime.Now.ToString("HH:mm:ss.fff"), InitialParametersClass.ApplicationNumber, {
string.Format(format, items)); var logString = string.Format("[level {0}] {1}", level, string.Format(format, items));
LogError(ErrorLogLevel.Notice, logString);
return;
}
if(Level < level)
{
return;
}
CrestronConsole.PrintLine("[{0}]App {1}:{2}", DateTime.Now.ToString("HH:mm:ss.fff"), InitialParametersClass.ApplicationNumber,
string.Format(format, items));
} }
/// <summary> /// <summary>
@@ -442,7 +463,8 @@ namespace PepperDash.Core
/// <param name="str"></param> /// <param name="str"></param>
public static void LogError(ErrorLogLevel errorLogLevel, string str) public static void LogError(ErrorLogLevel errorLogLevel, string str)
{ {
var msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
var msg = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str) : string.Format("Room {0}:{1}", InitialParametersClass.RoomId, str);
switch (errorLogLevel) switch (errorLogLevel)
{ {
case ErrorLogLevel.Error: case ErrorLogLevel.Error:
@@ -482,7 +504,11 @@ namespace PepperDash.Core
//if (!Directory.Exists(dir)) //if (!Directory.Exists(dir))
// Directory.Create(dir); // Directory.Create(dir);
using (var sw = new StreamWriter(GetMemoryFileName())) var fileName = GetMemoryFileName();
Console(0, ErrorLogLevel.Notice, "Loading debug settings file from {0}", fileName);
using (var sw = new StreamWriter(fileName))
{ {
var json = JsonConvert.SerializeObject(_contexts); var json = JsonConvert.SerializeObject(_contexts);
sw.Write(json); sw.Write(json);
@@ -519,8 +545,13 @@ namespace PepperDash.Core
/// </summary> /// </summary>
static string GetMemoryFileName() static string GetMemoryFileName()
{ {
CheckForMigration(); if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
return string.Format(@"\user\debugSettings\program{0}", InitialParametersClass.ApplicationNumber); {
CheckForMigration();
return string.Format(@"\user\debugSettings\program{0}", InitialParametersClass.ApplicationNumber);
}
return string.Format("{0}{1}user{1}debugSettings{1}{2}.json",Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
} }
private static void CheckForMigration() private static void CheckForMigration()
@@ -533,7 +564,7 @@ namespace PepperDash.Core
{ {
Console(0, ErrorLogLevel.Notice, Console(0, ErrorLogLevel.Notice,
String.Format( String.Format(
@"Debug settings file not found at \nvram\debugSettings\program{0}. Attempting to use file at \user\debugSettings\program{0}", @"Debug settings file migration not necessary. Using file at \user\debugSettings\program{0}",
InitialParametersClass.ApplicationNumber)); InitialParametersClass.ApplicationNumber));
return; return;
} }