Fix #339: User backup restores throws errors (disabled csharp programs)

genielabs · Oct 5, 2018 · de20703 · de20703
1 parent 489b25e
commit de20703
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/BaseFiles/Common/html/pages/configure/programengine/_programslist.js b/BaseFiles/Common/html/pages/configure/programengine/_programslist.js
@@ -509,12 +509,12 @@ HG.WebApp.ProgramsList = HG.WebApp.ProgramsList || new function () { var $$ = th
             if (propObj != null) statusProperty = propObj.Value;
         }
         //
-        if (statusProperty == 'Running') {
+        if (statusProperty === 'Running') {
             statusColor = 'green';
-        } else if (statusProperty == 'Background') {
+        } else if (statusProperty === 'Background') {
             statusColor = 'blue';
         } else if (prog.IsEnabled) {
-            if (hasErrors)
+            if (hasErrors || statusProperty === 'Interrupted')
                 statusColor = 'red';
             else
                 statusColor = 'yellow';
@@ -737,4 +737,4 @@ HG.WebApp.ProgramsList = HG.WebApp.ProgramsList || new function () { var $$ = th
         });
     };
 
-};
+};
diff --git a/HomeGenie/Automation/Engines/CSharpAppFactory.cs b/HomeGenie/Automation/Engines/CSharpAppFactory.cs
@@ -41,7 +41,7 @@ public static int ProgramCodeOffset
         }
 
         // TODO: move this to a config file
-        static readonly string[] Includes =
+        private static readonly string[] Includes =
         {
             "System",
             "System.Text",

diff --git a/HomeGenie/Automation/Engines/CSharpEngine.cs b/HomeGenie/Automation/Engines/CSharpEngine.cs
@@ -61,9 +61,9 @@ public CSharpEngine(ProgramBlock pb) : base(pb)
         public bool Load()
         {
             var success = LoadAssembly();
-            if (!success)
+            if (!success && String.IsNullOrEmpty(ProgramBlock.ScriptErrors))
             {
-                ProgramBlock.ScriptErrors = "Program update is required.";
+                ProgramBlock.ScriptErrors = "Program is not compiled.";
             }
             return success;
         }
@@ -97,17 +97,19 @@ public override List<ProgramError> Compile()
             }
 
             // dispose assembly and interrupt current task (if any)
+            bool wasEnabled = ProgramBlock.IsEnabled;
+            ProgramBlock.ScriptErrors = "";
             ProgramBlock.IsEnabled = false;
 
             // clean up old assembly files
             try
             {
                 // If the file to be deleted does not exist, no exception is thrown.
-                File.Delete(this.AssemblyFile);
-                File.Delete(this.AssemblyFile + ".mdb");
-                File.Delete(this.AssemblyFile.Replace(".dll", ".mdb"));
-                File.Delete(this.AssemblyFile + ".pdb");
-                File.Delete(this.AssemblyFile.Replace(".dll", ".pdb"));
+                File.Delete(AssemblyFile);
+                File.Delete(AssemblyFile + ".mdb");
+                File.Delete(AssemblyFile.Replace(".dll", ".mdb"));
+                File.Delete(AssemblyFile + ".pdb");
+                File.Delete(AssemblyFile.Replace(".dll", ".pdb"));
             }
             catch (Exception ex)
             {
@@ -196,6 +198,11 @@ public override List<ProgramError> Compile()
                 HomeGenieService.LogError(ee);
             }
 
+            if (errors.Count == 0 && wasEnabled)
+            {
+                ProgramBlock.IsEnabled = true;
+            }
+
             return errors;
         }
 
@@ -265,9 +272,6 @@ private string AssemblyFile
 
         private bool LoadAssembly()
         {
-            if (ProgramBlock.Type.ToLower() != "csharp")
-                return false;
-
             try
             {
                 var assemblyData = File.ReadAllBytes(this.AssemblyFile);