[PTRun]Improve copying error handling on plugins (#35459)

PesBandi · web-flow · commit db3c8e621e28 · 2024-10-21T13:42:11.000+01:00
diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Main.cs b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Main.cs
@@ -14,6 +14,7 @@
 
 using ManagedCommon;
 using Wox.Plugin;
+using Wox.Plugin.Logger;
 
 namespace Community.PowerToys.Run.Plugin.UnitConverter
 {
@@ -75,9 +76,10 @@ private Result GetResult(UnitConversionResult result)
                             Clipboard.SetText(result.ConvertedValue.ToString(UnitConversionResult.CopyFormat, CultureInfo.CurrentCulture));
                             ret = true;
                         }
-                        catch (ExternalException)
+                        catch (ExternalException ex)
                         {
-                            MessageBox.Show(Properties.Resources.copy_failed);
+                            Log.Exception("Copy failed", ex, GetType());
+                            MessageBox.Show(ex.Message, Properties.Resources.copy_failed);
                         }
                     });
                     thread.SetApartmentState(ApartmentState.STA);
@@ -107,9 +109,10 @@ private ContextMenuResult CreateContextMenuEntry(UnitConversionResult result)
                             Clipboard.SetText(result.ConvertedValue.ToString(UnitConversionResult.CopyFormat, CultureInfo.CurrentCulture));
                             ret = true;
                         }
-                        catch (ExternalException)
+                        catch (ExternalException ex)
                         {
-                            MessageBox.Show(Properties.Resources.copy_failed);
+                            Log.Exception("Copy failed", ex, GetType());
+                            MessageBox.Show(ex.Message, Properties.Resources.copy_failed);
                         }
                     });
                     thread.SetApartmentState(ApartmentState.STA);
diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Main.cs b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Main.cs
@@ -184,9 +184,10 @@ private Result GetResult(IComputeRequest request)
                             Clipboard.SetText(request.ResultToString());
                             ret = true;
                         }
-                        catch (ExternalException)
+                        catch (ExternalException ex)
                         {
-                            MessageBox.Show(Properties.Resources.copy_failed);
+                            Log.Exception("Copy failed", ex, GetType());
+                            MessageBox.Show(ex.Message, Properties.Resources.copy_failed);
                         }
                     });
                     thread.SetApartmentState(ApartmentState.STA);
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ResultHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ResultHelper.cs
@@ -8,6 +8,7 @@
 using System.Windows;
 
 using Wox.Plugin;
+using Wox.Plugin.Logger;
 
 namespace Microsoft.PowerToys.Run.Plugin.Calculator
 {
@@ -51,9 +52,10 @@ public static bool Action(decimal? roundedResult, CultureInfo culture)
                         Clipboard.SetText(roundedResult?.ToString(culture));
                         ret = true;
                     }
-                    catch (ExternalException)
+                    catch (ExternalException ex)
                     {
-                        MessageBox.Show(Properties.Resources.wox_plugin_calculator_copy_failed);
+                        Log.Exception("Copy failed", ex, typeof(ResultHelper));
+                        MessageBox.Show(ex.Message, Properties.Resources.wox_plugin_calculator_copy_failed);
                     }
                 });
 
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/ResultHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/ResultHelper.cs
@@ -50,13 +50,13 @@ internal static bool CopyToClipBoard(in string text)
         {
             try
             {
-                Clipboard.Clear();
                 Clipboard.SetText(text);
                 return true;
             }
             catch (Exception exception)
             {
                 Log.Exception("Can't copy to clipboard", exception, typeof(ResultHelper));
+                MessageBox.Show(exception.Message, Resources.Microsoft_plugin_timedate_copy_failed);
                 return false;
             }
         }
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.Designer.cs
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx
@@ -121,6 +121,9 @@
     <value>Copy value (Ctrl+C)</value>
     <comment>'Ctrl+C' is a shortcut</comment>
   </data>
+  <data name="Microsoft_plugin_timedate_copy_failed" xml:space="preserve">
+    <value>Copy failed</value>
+  </data>
   <data name="Microsoft_plugin_timedate_Date" xml:space="preserve">
     <value>Date</value>
   </data>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`using ManagedCommon;`
`16`	`16`	`using Wox.Plugin;`
	`17`	`+using Wox.Plugin.Logger;`
`17`	`18`
`18`	`19`	`namespace Community.PowerToys.Run.Plugin.UnitConverter`
`19`	`20`	`{`
`@@ -75,9 +76,10 @@ private Result GetResult(UnitConversionResult result)`
`75`	`76`	`Clipboard.SetText(result.ConvertedValue.ToString(UnitConversionResult.CopyFormat, CultureInfo.CurrentCulture));`
`76`	`77`	`ret = true;`
`77`	`78`	`}`
`78`		`- catch (ExternalException)`
	`79`	`+ catch (ExternalException ex)`
`79`	`80`	`{`
`80`		`- MessageBox.Show(Properties.Resources.copy_failed);`
	`81`	`+ Log.Exception("Copy failed", ex, GetType());`
	`82`	`+ MessageBox.Show(ex.Message, Properties.Resources.copy_failed);`
`81`	`83`	`}`
`82`	`84`	`});`
`83`	`85`	`thread.SetApartmentState(ApartmentState.STA);`
`@@ -107,9 +109,10 @@ private ContextMenuResult CreateContextMenuEntry(UnitConversionResult result)`
`107`	`109`	`Clipboard.SetText(result.ConvertedValue.ToString(UnitConversionResult.CopyFormat, CultureInfo.CurrentCulture));`
`108`	`110`	`ret = true;`
`109`	`111`	`}`
`110`		`- catch (ExternalException)`
	`112`	`+ catch (ExternalException ex)`
`111`	`113`	`{`
`112`		`- MessageBox.Show(Properties.Resources.copy_failed);`
	`114`	`+ Log.Exception("Copy failed", ex, GetType());`
	`115`	`+ MessageBox.Show(ex.Message, Properties.Resources.copy_failed);`
`113`	`116`	`}`
`114`	`117`	`});`
`115`	`118`	`thread.SetApartmentState(ApartmentState.STA);`
Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,10 @@ private Result GetResult(IComputeRequest request)`
`184`	`184`	`Clipboard.SetText(request.ResultToString());`
`185`	`185`	`ret = true;`
`186`	`186`	`}`
`187`		`- catch (ExternalException)`
	`187`	`+ catch (ExternalException ex)`
`188`	`188`	`{`
`189`		`- MessageBox.Show(Properties.Resources.copy_failed);`
	`189`	`+ Log.Exception("Copy failed", ex, GetType());`
	`190`	`+ MessageBox.Show(ex.Message, Properties.Resources.copy_failed);`
`190`	`191`	`}`
`191`	`192`	`});`
`192`	`193`	`thread.SetApartmentState(ApartmentState.STA);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Windows;`
`9`	`9`
`10`	`10`	`using Wox.Plugin;`
	`11`	`+using Wox.Plugin.Logger;`
`11`	`12`
`12`	`13`	`namespace Microsoft.PowerToys.Run.Plugin.Calculator`
`13`	`14`	`{`
`@@ -51,9 +52,10 @@ public static bool Action(decimal? roundedResult, CultureInfo culture)`
`51`	`52`	`Clipboard.SetText(roundedResult?.ToString(culture));`
`52`	`53`	`ret = true;`
`53`	`54`	`}`
`54`		`- catch (ExternalException)`
	`55`	`+ catch (ExternalException ex)`
`55`	`56`	`{`
`56`		`- MessageBox.Show(Properties.Resources.wox_plugin_calculator_copy_failed);`
	`57`	`+ Log.Exception("Copy failed", ex, typeof(ResultHelper));`
	`58`	`+ MessageBox.Show(ex.Message, Properties.Resources.wox_plugin_calculator_copy_failed);`
`57`	`59`	`}`
`58`	`60`	`});`
`59`	`61`
Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ internal static bool CopyToClipBoard(in string text)`
`50`	`50`	`{`
`51`	`51`	`try`
`52`	`52`	`{`
`53`		`- Clipboard.Clear();`
`54`	`53`	`Clipboard.SetText(text);`
`55`	`54`	`return true;`
`56`	`55`	`}`
`57`	`56`	`catch (Exception exception)`
`58`	`57`	`{`
`59`	`58`	`Log.Exception("Can't copy to clipboard", exception, typeof(ResultHelper));`
	`59`	`+ MessageBox.Show(exception.Message, Resources.Microsoft_plugin_timedate_copy_failed);`
`60`	`60`	`return false;`
`61`	`61`	`}`
`62`	`62`	`}`