mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2025-12-30 18:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update browsers.nim, fix openDefaultBrowser()'s bug for v1 (#22067)

Browse Source 
For details see [the PR for v2](https://github.com/nim-lang/Nim/pull/22052), but this one is specific to v1
This commit is contained in:
litlighilit
2023-06-11 12:56:12 +08:00
committed by GitHub
parent eaf8977723
commit 2b6797dc42
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pure/browsers.nim
View File

@@ -35,15 +35,17 @@ proc prepare(s: string): string =
else:
result = "file://" & absolutePath(s)
proc openDefaultBrowserImpl(url: string) =
proc openDefaultBrowserImplPrep(url: string) =
## note the url argument should be alreadly prepared, i.e. the url is passed "AS IS"
when defined(windows):
var o = newWideCString(osOpenCmd)
var u = newWideCString(prepare url)
var u = newWideCString(url)
discard shellExecuteW(0'i32, o, u, nil, nil, SW_SHOWNORMAL)
elif defined(macosx):
discard execShellCmd(osOpenCmd & " " & quoteShell(prepare url))
discard execShellCmd(osOpenCmd & " " & quoteShell(url))
else:
var u = quoteShell(prepare url)
var u = quoteShell(url)
if execShellCmd(osOpenCmd & " " & u) == 0: return
for b in getEnv("BROWSER").split(PathSep):
try:
@@ -53,6 +55,9 @@ proc openDefaultBrowserImpl(url: string) =
except OSError:
discard
proc openDefaultBrowserImpl(url: string) =
openDefaultBrowserImplPrep(prepare url)
proc openDefaultBrowser*(url: string) =
## Opens `url` with the user's default browser. This does not block.
## The URL must not be empty string, to open on a blank page see `openDefaultBrowser()`.
@@ -86,4 +91,4 @@ proc openDefaultBrowser*() {.since: (1, 1).} =
##
## .. code-block:: nim
## block: openDefaultBrowser()
openDefaultBrowserImpl("http:about:blank") # See IETF RFC-6694 Section 3.
openDefaultBrowserImplPrep("about:blank") # See IETF RFC-6694 Section 3.