Handle taskcanceled exception with error message (#201)

* Handle taskcanceled exception with error message * if-else blocks
microsoft · Nov 4, 2021 · 823cb61 · 823cb61
1 parent 279c063
commit 823cb61
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/WingetCreateCLI/Commands/BaseCommand.cs b/src/WingetCreateCLI/Commands/BaseCommand.cs
@@ -292,20 +292,25 @@ protected static async Task<string> DownloadPackageFile(string installerUrl)
 
                     return null;
                 }
-
-                if (e is DownloadSizeExceededException downloadSizeExceededException)
+                else if (e is DownloadSizeExceededException downloadSizeExceededException)
                 {
                     Logger.ErrorLocalized(nameof(Resources.DownloadFileExceedsMaxSize_Error), $"{downloadSizeExceededException.MaxDownloadSizeInBytes / 1024 / 1024}");
                     return null;
                 }
-
-                if (e is InvalidOperationException)
+                else if (e is InvalidOperationException)
                 {
                     Logger.ErrorLocalized(nameof(Resources.InvalidUrl_Error));
                     return null;
                 }
-
-                throw;
+                else if (e is TaskCanceledException)
+                {
+                    Logger.ErrorLocalized(nameof(Resources.DownloadConnectionTimeout_Error));
+                    return null;
+                }
+                else
+                {
+                    throw;
+                }
             }
         }
 

diff --git a/src/WingetCreateCLI/Properties/Resources.Designer.cs b/src/WingetCreateCLI/Properties/Resources.Designer.cs
diff --git a/src/WingetCreateCLI/Properties/Resources.resx b/src/WingetCreateCLI/Properties/Resources.resx
@@ -783,4 +783,7 @@
   <data name="SelectManifestToEdit_Message" xml:space="preserve">
     <value>Which manifest do you want to edit?</value>
   </data>
+  <data name="DownloadConnectionTimeout_Error" xml:space="preserve">
+    <value>Unable to complete the download request as the connection has timed out. Please verify your installer URL and try again.</value>
+  </data>
 </root>