fix: show message that the plugin is still trying to initialize and r…

…emove automatic GitHub issue link
Quriz · Aug 7, 2024 · e8503ca · e8503ca
1 parent 2b1f3a0
commit e8503ca
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 31 deletions.
diff --git a/Community.PowerToys.Run.Plugin.Scoop/Main.cs b/Community.PowerToys.Run.Plugin.Scoop/Main.cs
@@ -35,14 +35,12 @@ public class Main : IPlugin, IPluginI18n, IDelayedExecutionPlugin, IContextMenu,
 
     public static string PluginID => "be0142a36ee54bd6ab789086d5828b4b";
 
-    private static readonly CompositeFormat RepositoryNewIssueUrlFormat = CompositeFormat.Parse("https://github.com/Quriz/PowerToysRunScoop/issues/new?labels=bug&title={0}&body={1}");
     private static readonly CompositeFormat PluginNoResultFormat = CompositeFormat.Parse(Properties.Resources.plugin_no_result);
     private static readonly CompositeFormat ErrorHomepageFormat = CompositeFormat.Parse(Properties.Resources.error_homepage);
 
     private Action<string> onPluginError = null!;
 
     private Scoop _scoop = null!;
-    private Exception _initException = null!;
     private bool _isInitializing = false;
 
     private PluginInitContext _context = null!;
@@ -89,7 +87,7 @@ private async void InitScoop()
             }
             catch (Exception e)
             {
-                _initException = e;
+                // ignored
             }
 
             // Wait 30s before retrying
@@ -111,7 +109,7 @@ public List<Result> Query(Query query, bool delayedExecution)
         if (!_scoop.IsInitialized)
         {
             Task.Run(InitScoop);
-            return InitErrorQueryResult();
+            return IsInitializingQueryResult();
         }
 
         if (!delayedExecution || query is null || string.IsNullOrWhiteSpace(query.Search))
@@ -151,23 +149,16 @@ private List<Result> ScoopNotInstalledQueryResult()
         ];
     }
 
-    private List<Result> InitErrorQueryResult()
+    private List<Result> IsInitializingQueryResult()
     {
         return
         [
             new Result
             {
-                Title = Properties.Resources.error_init,
-                SubTitle = Properties.Resources.error_init_sub,
+                Title = Properties.Resources.is_init,
+                SubTitle = Properties.Resources.is_init_sub,
                 QueryTextDisplay = " ", // Empty string doesn't work
                 IcoPath = _iconPath,
-                Action = _ =>
-                {
-                    // Create a new issue describing the error
-                    var title = HttpUtility.UrlEncode("Bug: Initialization Failed");
-                    var body = HttpUtility.UrlEncode(_initException?.ToString());
-                    return OpenUrlInBrowser(string.Format(CultureInfo.CurrentCulture, RepositoryNewIssueUrlFormat, title, body));
-                },
             },
         ];
     }

diff --git a/Community.PowerToys.Run.Plugin.Scoop/Properties/Resources.Designer.cs b/Community.PowerToys.Run.Plugin.Scoop/Properties/Resources.Designer.cs
diff --git a/Community.PowerToys.Run.Plugin.Scoop/Properties/Resources.resx b/Community.PowerToys.Run.Plugin.Scoop/Properties/Resources.resx
@@ -144,11 +144,11 @@
   <data name="plugin_description_sub" xml:space="preserve">
     <value>Search, install, update, and uninstall Scoop packages.</value>
   </data>
-  <data name="error_init" xml:space="preserve">
-    <value>Failed to initialize plugin.</value>
+  <data name="is_init" xml:space="preserve">
+    <value>Plugin is initializing.</value>
   </data>
-  <data name="error_init_sub" xml:space="preserve">
-    <value>If you believe this is a plugin error, press Enter to open an issue.</value>
+  <data name="is_init_sub" xml:space="preserve">
+    <value>If you think this is a plugin bug, please open an issue on GitHub.</value>
   </data>
   <data name="message_add_bucket" xml:space="preserve">
     <value>To install this package, you need to add the bucket '{0}'. Do you want to continue?</value>

diff --git a/Community.PowerToys.Run.Plugin.Scoop/plugin.json b/Community.PowerToys.Run.Plugin.Scoop/plugin.json
@@ -4,7 +4,7 @@
     "IsGlobal": false,
     "Name": "Scoop",
     "Author": "Quriz",
-    "Version": "1.3.2",
+    "Version": "1.3.3",
     "Language": "csharp",
     "Website": "https://github.com/Quriz/PowerToysRunScoop",
     "IcoPathDark": "Images\\scoop.png",