Merge tag '1.13.3-hotfix-2156' into feature/DmHdcpEnhancements

Update PD Core to 1.2.1 DEV

PepperDashEssentials/ControlSystem.cs

@@ -93,26 +93,25 @@ namespace PepperDash.Essentials
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}{1}", tl, CrestronEnvironment.NewLine);
+                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 CrestronConsole.ConsoleCommandResponse
-                    ("Current running configuration. This is the merged system and template configuration" + CrestronEnvironment.NewLine);
+                    ("Current running configuration. This is the merged system and template configuration");
                 CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
                     (ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
             }, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s => 
                 CrestronConsole.ConsoleCommandResponse(
-                "This system can be found at the following URLs:{2}" +
+                "This system can be found at the following URLs:\r\n" +
-                "System URL:   {0}{2}" +
+                "System URL:   {0}\r\n" +
-                "Template URL: {1}{2}",
+                "Template URL: {1}", 
                 ConfigReader.ConfigObject.SystemUrl, 
-                ConfigReader.ConfigObject.TemplateUrl,
+                ConfigReader.ConfigObject.TemplateUrl), 
-                CrestronEnvironment.NewLine),
                 "portalinfo", 
                 "Shows portal URLS from configuration", 
                 ConsoleAccessLevelEnum.AccessOperator);

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -388,17 +388,17 @@ namespace PepperDash.Essentials.Core
             var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
 	        if (inputPorts != null)
 	        {
-                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:{2}", s, inputPorts.Count, CrestronEnvironment.NewLine);
+                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:", s, inputPorts.Count);
 	            foreach (var routingInputPort in inputPorts)
 	            {
-                    CrestronConsole.ConsoleCommandResponse("{0}{1}", routingInputPort.Key, CrestronEnvironment.NewLine);
+                    CrestronConsole.ConsoleCommandResponse("{0}", routingInputPort.Key);
 	            }
 	        }
             if (outputPorts == null) return;
-            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:{2}", s, outputPorts.Count, CrestronEnvironment.NewLine);
+            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:", s, outputPorts.Count);
             foreach (var routingOutputPort in outputPorts)
             {
-                CrestronConsole.ConsoleCommandResponse("{0}{1}", routingOutputPort.Key, CrestronEnvironment.NewLine);
+                CrestronConsole.ConsoleCommandResponse("{0}", routingOutputPort.Key);
             }
 	    }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/File/FileIO.cs

@@ -23,9 +23,10 @@ namespace PepperDash.Essentials.Core
 		/// <returns></returns>
         public static FileInfo[] GetFiles(string fileName)
         {
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
+            string fullFilePath = Global.FilePathPrefix + fileName;
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
+            DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
+            var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath));
+            Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fullFilePath);
             if (files.Count() > 0)
             {
                 return files;
@@ -38,9 +39,10 @@ namespace PepperDash.Essentials.Core
 
         public static FileInfo GetFile(string fileName)
         {
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
+            string fullFilePath = Global.FilePathPrefix + fileName;
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
+            DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
+            var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath));
+            Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fullFilePath);
             if (files.Count() > 0)
             {
                 return files.FirstOrDefault();
@@ -81,7 +83,7 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
+					DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
 					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
 					if (File.Exists(file.FullName))
@@ -202,7 +204,7 @@ namespace PepperDash.Essentials.Core
 		public static void WriteDataToFile(string data, string filePath)
 		{
 			Thread _WriteFileThread;
-			_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
+            _WriteFileThread = new Thread((O) => _WriteFileMethod(data, Global.FilePathPrefix + "/" + filePath), null, Thread.eThreadStartOptions.CreateSuspended);
 			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
 			_WriteFileThread.Start();
 			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
@@ -217,6 +219,7 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
+
                     using (StreamWriter sw = new StreamWriter(filePath))
 					{
 						sw.Write(data);

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -195,12 +195,13 @@ namespace PepperDash.Essentials
         public static void ReportAssemblyVersions(string command)
         {
 
-            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:" + CrestronEnvironment.NewLine);
+            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:");
             foreach (var assembly in LoadedAssemblies)
             {
-                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}" + CrestronEnvironment.NewLine, assembly.Name, assembly.Version);
+                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}", assembly.Name, assembly.Version);
             }
         }
+
         /// <summary>
         /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
         /// </summary>