prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #968 from Flow-Launcher/websearchUri

Browse source 
Support Application Uri in OpenUrl API call
This commit is contained in:
Jeremy Wu 2022-01-31 08:43:21 +11:00 committed by GitHub
commit af313ebb78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
View file

@ -231,5 +231,10 @@ namespace Flow.Launcher.Plugin
/// Opens the url. The browser and mode used is based on what's configured in Flow's default browser settings. /// Opens the url. The browser and mode used is based on what's configured in Flow's default browser settings.
/// </summary> /// </summary>
public void OpenUrl(string url, bool? inPrivate = null); public void OpenUrl(string url, bool? inPrivate = null);
/// <summary>
/// Opens the application URI.
/// </summary>
public void OpenAppUri(string appUri);
} }
} }

4
Flow.Launcher.Plugin/SharedCommands/SearchWeb.cs
View file

@ -60,7 +60,7 @@ namespace Flow.Launcher.Plugin.SharedCommands
try try
{ {
Process.Start(psi); Process.Start(psi)?.Dispose();
} }
catch (System.ComponentModel.Win32Exception) catch (System.ComponentModel.Win32Exception)
{ {
@ -100,7 +100,7 @@ namespace Flow.Launcher.Plugin.SharedCommands
psi.FileName = url; psi.FileName = url;
} }
Process.Start(psi); Process.Start(psi)?.Dispose();
} }
// This error may be thrown if browser path is incorrect // This error may be thrown if browser path is incorrect
catch (System.ComponentModel.Win32Exception) catch (System.ComponentModel.Win32Exception)

54
Flow.Launcher/PublicAPIInstance.cs
View file

@ -209,21 +209,49 @@ namespace Flow.Launcher
explorer.Start(); explorer.Start();
} }
public void OpenUri(string url, bool? inPrivate = null, bool isAppUri = false)
{
var uri = new Uri(url);
if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
{
var browserInfo = _settingsVM.Settings.CustomBrowser;
var path = browserInfo.Path == "*" ? "" : browserInfo.Path;
if (browserInfo.OpenInTab)
{
url.OpenInBrowserTab(path, inPrivate ?? browserInfo.EnablePrivate, browserInfo.PrivateArg);
}
else
{
url.OpenInBrowserWindow(path, inPrivate ?? browserInfo.EnablePrivate, browserInfo.PrivateArg);
}
return;
}
if (isAppUri)
{
Process.Start(new ProcessStartInfo()
{
FileName = url,
UseShellExecute = true
})?.Dispose();
return;
}
throw new InvalidOperationException("URI scheme not specified or supported ");
}
public void OpenUrl(string url, bool? inPrivate = null) public void OpenUrl(string url, bool? inPrivate = null)
{ {
var browserInfo = _settingsVM.Settings.CustomBrowser; OpenUri(url, inPrivate);
}
var path = browserInfo.Path == "*" ? "" : browserInfo.Path;
if (browserInfo.OpenInTab)
{
url.OpenInBrowserTab(path, inPrivate ?? browserInfo.EnablePrivate, browserInfo.PrivateArg);
}
else
{
url.OpenInBrowserWindow(path, inPrivate ?? browserInfo.EnablePrivate, browserInfo.PrivateArg);
}
public void OpenAppUri(string appUri)
{
OpenUri(appUri, isAppUri: true);
} }
public event FlowLauncherGlobalKeyboardEventHandler GlobalKeyboardEvent; public event FlowLauncherGlobalKeyboardEventHandler GlobalKeyboardEvent;
@ -254,4 +282,4 @@ namespace Flow.Launcher
#endregion #endregion
} }
} }