Merge pull request #3616 from Flow-Launcher/force_web_url

Add New API to Force Web Url

Author: jjw24

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -306,13 +306,28 @@ public interface IPublicAPI
         public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null);
 
         /// <summary>
-        /// Opens the URL with the given Uri object. 
+        /// Opens the URL using the browser with the given Uri object, even if the URL is a local file.
+        /// The browser and mode used is based on what's configured in Flow's default browser settings.
+        /// </summary>
+        public void OpenWebUrl(Uri url, bool? inPrivate = null);
+
+        /// <summary>
+        /// Opens the URL using the browser with the given string, even if the URL is a local file.
+        /// The browser and mode used is based on what's configured in Flow's default browser settings.
+        /// Non-C# plugins should use this method.
+        /// </summary>
+        public void OpenWebUrl(string url, bool? inPrivate = null);
+
+        /// <summary>
+        /// Opens the URL with the given Uri object in browser if scheme is Http or Https.
+        /// If the URL is a local file, it will instead be opened with the default application for that file type.
         /// The browser and mode used is based on what's configured in Flow's default browser settings.
         /// </summary>
         public void OpenUrl(Uri url, bool? inPrivate = null);
 
         /// <summary>
-        /// Opens the URL with the given string. 
+        /// Opens the URL with the given string in browser if scheme is Http or Https.
+        /// If the URL is a local file, it will instead be opened with the default application for that file type.
         /// The browser and mode used is based on what's configured in Flow's default browser settings.
         /// Non-C# plugins should use this method.
         /// </summary>

Flow.Launcher/PublicAPIInstance.cs

@@ -389,10 +389,9 @@ public void OpenDirectory(string directoryPath, string fileNameOrFilePath = null
             }
         }
 
-
-        private void OpenUri(Uri uri, bool? inPrivate = null)
+        private void OpenUri(Uri uri, bool? inPrivate = null, bool forceBrowser = false)
         {
-            if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
+            if (forceBrowser || uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
             {
                 var browserInfo = _settings.CustomBrowser;
 
@@ -433,6 +432,16 @@ private void OpenUri(Uri uri, bool? inPrivate = null)
             }
         }
 
+        public void OpenWebUrl(string url, bool? inPrivate = null)
+        {
+            OpenUri(new Uri(url), inPrivate, true);
+        }
+
+        public void OpenWebUrl(Uri url, bool? inPrivate = null)
+        {
+            OpenUri(url, inPrivate, true);
+        }
+
         public void OpenUrl(string url, bool? inPrivate = null)
         {
             OpenUri(new Uri(url), inPrivate);

Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs

@@ -71,7 +71,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
                         Score = score,
                         Action = c =>
                         {
-                            _context.API.OpenUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)));
+                            _context.API.OpenWebUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(keyword)));
 
                             return true;
                         },
@@ -135,7 +135,7 @@ private async Task<IEnumerable<Result>> SuggestionsAsync(string keyword, string
                 ActionKeywordAssigned = searchSource.ActionKeyword == SearchSourceGlobalPluginWildCardSign ? string.Empty : searchSource.ActionKeyword,
                 Action = c =>
                 {
-                    _context.API.OpenUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)));
+                    _context.API.OpenWebUrl(searchSource.Url.Replace("{q}", Uri.EscapeDataString(o)));
 
                     return true;
                 },