Bug fix #358 : pdf downoad errors in CLI were crashing the rest of th…

…e loop
rmcrackan · Aug 16, 2022 · e0999dc · e0999dc
1 parent a0f3d44
commit e0999dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Source/LibationCli/Options/LiberateOptions.cs b/Source/LibationCli/Options/LiberateOptions.cs
@@ -25,9 +25,10 @@ private static Processable CreateBackupBook()
 			var downloadPdf = CreateProcessable<DownloadPdf>();
 
 			//Chain pdf download on DownloadDecryptBook.Completed
-			async void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
+			void onDownloadDecryptBookCompleted(object sender, LibraryBook e)
 			{
-				await downloadPdf.TryProcessAsync(e);
+				// this is fast anyway. run as sync for easy exception catching
+				downloadPdf.TryProcessAsync(e).GetAwaiter().GetResult();
 			}
 
 			var downloadDecryptBook = CreateProcessable<DownloadDecryptBook>(onDownloadDecryptBookCompleted);

diff --git a/Source/LibationCli/Options/_ProcessableOptionsBase.cs b/Source/LibationCli/Options/_ProcessableOptionsBase.cs
@@ -19,7 +19,17 @@ protected static TProcessable CreateProcessable<TProcessable>(EventHandler<Libra
 			strProc.Begin += (o, e) => Console.WriteLine($"{typeof(TProcessable).Name} Begin: {e}");
 			strProc.Completed += (o, e) => Console.WriteLine($"{typeof(TProcessable).Name} Completed: {e}");
 
-			strProc.Completed += completedAction;
+			strProc.Completed += (s, e) =>
+			{
+				try
+				{
+					completedAction?.Invoke(s, e);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "CLI error");
+				}
+			};
 
 			return strProc;
 		}