Skip to content

Commit

Permalink
os: implement support for VOPEN_URI_CMD env override for os.open_uri
Browse files Browse the repository at this point in the history
  • Loading branch information
spytheman committed Oct 6, 2021
1 parent 2526aca commit 5bc8b4d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 23 deletions.
44 changes: 21 additions & 23 deletions vlib/os/open_uri_default.c.v
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
module os

pub fn open_uri(uri string) ? {
$if macos {
result := execute('open "$uri"')
if result.exit_code != 0 {
return error('unable to open url: $result.output')
}
} $else $if freebsd || openbsd {
result := execute('xdg-open "$uri"')
if result.exit_code != 0 {
return error('unable to open url: $result.output')
}
} $else $if linux {
providers := ['xdg-open', 'x-www-browser', 'www-browser', 'wslview']

// 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.
// 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')
mut vopen_uri_cmd := getenv('VOPEN_URI_CMD')
if vopen_uri_cmd == '' {
$if macos {
vopen_uri_cmd = 'open'
} $else $if freebsd || openbsd {
vopen_uri_cmd = 'xdg-open'
} $else $if linux {
providers := ['xdg-open', 'x-www-browser', 'www-browser', 'wslview']
// 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.
// Look for one that exists and run it
for provider in providers {
if exists_in_system_path(provider) {
vopen_uri_cmd = provider
break
}
break
}
}
} $else {
}
if vopen_uri_cmd == '' {
return error('unsupported platform')
}
result := execute('$vopen_uri_cmd "$uri"')
if result.exit_code != 0 {
return error('unable to open url: $result.output')
}
}
8 changes: 8 additions & 0 deletions vlib/os/open_uri_windows.c.v
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ import dl
type ShellExecuteWin = fn (voidptr, &u16, &u16, &u16, &u16, int)

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) ?
// https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shellexecutew
func := ShellExecuteWin(dl.sym_opt(handle, 'ShellExecuteW') ?)
Expand Down

0 comments on commit 5bc8b4d

Please sign in to comment.