vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

os: implement support for VOPEN_URI_CMD env override for os.open_uri

pull/12077/head
Delyan Angelov 2021-10-06 06:29:32 +03:00
parent 2526aca75f
commit 5bc8b4dadb
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vlib/os/open_uri_default.c.v
View File

@ -1,32 +1,30 @@
module os module os
pub fn open_uri(uri string) ? { pub fn open_uri(uri string) ? {
$if macos { mut vopen_uri_cmd := getenv('VOPEN_URI_CMD')
result := execute('open "$uri"') if vopen_uri_cmd == '' {
if result.exit_code != 0 { $if macos {
return error('unable to open url: $result.output') vopen_uri_cmd = 'open'
} } $else $if freebsd || openbsd {
} $else $if freebsd || openbsd { vopen_uri_cmd = 'xdg-open'
result := execute('xdg-open "$uri"') } $else $if linux {
if result.exit_code != 0 { providers := ['xdg-open', 'x-www-browser', 'www-browser', 'wslview']
return error('unable to open url: $result.output') // There are multiple possible providers to open a browser on linux
} // One of them is xdg-open, another is x-www-browser, then there's www-browser, etc.
} $else $if linux { // Look for one that exists and run it
providers := ['xdg-open', 'x-www-browser', 'www-browser', 'wslview'] for provider in providers {
if exists_in_system_path(provider) {
// There are multiple possible providers to open a browser on linux vopen_uri_cmd = provider
// One of them is xdg-open, another is x-www-browser, then there's www-browser, etc. break
// Look for one that exists and run it
for provider in providers {
if exists_in_system_path(provider) {
result := execute('$provider "$uri"')
if result.exit_code != 0 {
return error('unable to open url: $result.output')
} }
break
} }
} }
} $else { }
if vopen_uri_cmd == '' {
return error('unsupported platform') return error('unsupported platform')
} }
result := execute('$vopen_uri_cmd "$uri"')
if result.exit_code != 0 {
return error('unable to open url: $result.output')
}
} }

8
vlib/os/open_uri_windows.c.v
View File

@ -5,6 +5,14 @@ import dl
type ShellExecuteWin = fn (voidptr, &u16, &u16, &u16, &u16, int) type ShellExecuteWin = fn (voidptr, &u16, &u16, &u16, &u16, int)
pub fn open_uri(uri string) ? { pub fn open_uri(uri string) ? {
mut vopen_uri_cmd := getenv('VOPEN_URI_CMD')
if vopen_uri_cmd != '' {
result := execute('$vopen_uri_cmd "$uri"')
if result.exit_code != 0 {
return error('unable to open url: $result.output')
}
return
}
handle := dl.open_opt('shell32', dl.rtld_now) ? handle := dl.open_opt('shell32', dl.rtld_now) ?
// https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shellexecutew // https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shellexecutew
func := ShellExecuteWin(dl.sym_opt(handle, 'ShellExecuteW') ?) func := ShellExecuteWin(dl.sym_opt(handle, 'ShellExecuteW') ?)