fix(event): bypass sta thread error when code is running in task and better report errors with inner exceptions

Also moved webservice check report message after first check

Author: NPavie

Common/DaisyAddinWPFLib/WPFEventsHandler.cs

@@ -17,19 +17,30 @@ public class WPFEventsHandler : Daisy.SaveAsDAISY.Conversion.Events.IConversionE
     {
 
         public ConversionProgress Dialog = null;
+        private Dispatcher _dispatcher;
 
         #region Conversion progress dialog
         public void TryInitializeProgress(string message, int maximum = 1, int step = 1)
         {
-            if(Dialog == null) {
-                Dialog = new ConversionProgress();
-                Dialog.Closed += Dialog_Closed;
-                if(cancelButtonClicked != null) {
-                    Dialog.setCancelClickListener(cancelButtonClicked);
+            Dispatcher.CurrentDispatcher.Invoke((Action)delegate {
+                try {
+                    if (Dialog == null) {
+                        Dialog = new ConversionProgress();
+                        Dialog.Closed += Dialog_Closed;
+                        if (cancelButtonClicked != null) {
+                            Dialog.setCancelClickListener(cancelButtonClicked);
+                        }
+                        Dialog.Show();
+                        _dispatcher = Dispatcher.CurrentDispatcher;
+                    }
+                    _dispatcher.Invoke(() => Dialog.InitializeProgress(message, maximum, step));
+                    //Dialog.Dispatcher.Invoke(() => Dialog.InitializeProgress(message, maximum, step));
+
                 }
-                Dialog.Show();
-            }
-            Dialog.Dispatcher.Invoke(() => Dialog.InitializeProgress(message, maximum, step));
+                catch (Exception e) {
+                    AddinLogger.Error("Unable to show message in progress dialog: " + message);
+                }
+            });
         }
 
         private event CancelClickListener cancelButtonClicked = null;
@@ -49,12 +60,21 @@ private void Dialog_Closed(object sender, EventArgs e)
 
         private void TryShowMessage(string message, bool isProgress = false)
         {
-            if (Dialog == null) {
-                Dialog = new ConversionProgress();
-                Dialog.Closed += Dialog_Closed;
-                Dialog.Show();
-            }
-            Dialog.Dispatcher.Invoke(() => Dialog.AddMessage(message, isProgress));
+            Dispatcher.CurrentDispatcher.Invoke((Action)delegate {
+                try {
+                    if (Dialog == null) {
+                        Dialog = new ConversionProgress();
+                        Dialog.Closed += Dialog_Closed;
+                        Dialog.Show();
+                        _dispatcher = Dispatcher.CurrentDispatcher;
+                    }
+                    _dispatcher.Invoke(() => Dialog.AddMessage(message, isProgress));
+                    //Dialog.Dispatcher.Invoke(() => Dialog.AddMessage(message, isProgress));
+                }
+                catch (Exception e) {
+                    AddinLogger.Error("Unable to show message in progress dialog: " + message);
+                }
+            });
         }
 
 
@@ -223,15 +243,13 @@ public void onPostProcessingSuccess(ConversionParameters conversion)
                     + conversion.OutputPath,
                 true
             );
-            TryClosingDialog(3000);
         }
 
         #endregion
 
         public void onConversionCanceled()
         {
             TryShowMessage("Canceling conversion");
-            TryClosingDialog(3000);
         }
 
         public void onProgressMessageReceived(object sender, EventArgs e)
@@ -300,11 +318,6 @@ public bool IsContinueDTBookGenerationOnLostElements()
             return continueDTBookGenerationResult == MessageBoxResult.Yes;
         }
 
-        public void OnSuccess()
-        {
-            TryClosingDialog(3000);
-        }
-
         public void OnMasterSubValidationError(string error)
         {
             MasterSubValidation infoBox = new MasterSubValidation(error, "Validation");

Common/DaisyConverterLib/ConversionResult.cs

@@ -71,6 +71,11 @@ public string ErrorMessage
 					if(ErrorDetails is JobRequestError) {
 						message += "\r\n" + ((JobRequestError)ErrorDetails).Description;
                     }
+                    var inner = ErrorDetails.InnerException;
+                    while (inner != null) {
+                        message += "\r\n" + inner.Message;
+						inner = inner.InnerException;
+                    }
                     return message;
 				}
 				return null;

Common/DaisyConverterLib/Pipeline/Webservice.cs

@@ -33,11 +33,13 @@ public void WaitForActivation(IConversionEventsHandler events = null)
             int attempt = 20;
             bool isWorking = false;
             do {
-                events?.onProgressMessageReceived(this, new DaisyEventArgs($"Checking engine web service status ({attempt} attempts remaining)..."));
                 attempt--;
                 try {
                     AliveData data = this.Alive();
                     isWorking = !(data == null || !data.Alive);
+                    if (!isWorking) {
+                        events?.onProgressMessageReceived(this, new DaisyEventArgs($"Checking engine web service status ({attempt} attempts remaining)..."));
+                    }
                 }
                 catch (AggregateException e) {
                     isWorking = false;
@@ -126,6 +128,7 @@ public List<ScriptDefinition> GetScripts()
                 foreach (XmlElement scriptNode in scriptsElm.GetElementsByTagName("script")) {
                     scripts.Add(ScriptDefinition.FromXml(scriptNode));
                 }
+                
                 scripts = scripts.Select(s => GetScriptDetails(s)).ToList();
 
                 return scripts;