hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-06 10:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1355 from glacambre/better_nativeopen

Browse source 
nativeopen: detect profile, enable space in URLs
This commit is contained in:
Oliver Blanthorn 2019-02-13 11:44:17 +00:00 • committed by GitHub
commit c341ea47db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/background/native_background.ts
View file

@ -479,6 +479,10 @@ export async function getProfileDir() {
}
}
export function getProfile() {
return getProfileDir().then(p => p.split("/").slice(-1))
}
export async function parsePrefs(prefFileContent: string) {
// This RegExp currently only deals with " but for correctness it should
// also deal with ' and `

23
src/excmds.ts
View file

@ -473,9 +473,18 @@ export async function fixamo() {
* **Be *seriously* careful with this: you can use it to open any URL you can open in the Firefox address bar.**
*
* You've been warned.
*
* This uses the [[browser]] setting to know which binary to call. If you need to pass additional arguments to firefox (e.g. '--new-window'), make sure they appear before the url.
*/
//#background
export async function nativeopen(url: string, ...firefoxArgs: string[]) {
export async function nativeopen(...args: string[]) {
const index = args.findIndex(arg => !arg.startsWith("-"))
let firefoxArgs = []
if (index >= 0) {
firefoxArgs = args.slice(0, index)
}
const url = args.slice(firefoxArgs.length).join(" ")
if (await Native.nativegate()) {
// First compute where the tab should be
let pos = await config.getAsync("tabopenpos")
@ -505,8 +514,16 @@ export async function nativeopen(url: string, ...firefoxArgs: string[]) {
let osascriptArgs = ["-e 'on run argv'", "-e 'tell application \"Firefox\" to open location item 1 of argv'", "-e 'end run'"]
await Native.run("osascript " + osascriptArgs.join(" ") + " " + url)
} else {
if (firefoxArgs.length === 0) firefoxArgs = ["--new-tab"]
await Native.run(config.get("browser") + " " + firefoxArgs.join(" ") + " " + url)
if (firefoxArgs.length === 0) {
try {
firefoxArgs = [`-p ${await Native.getProfile()}`]
} catch (e) {
logger.debug(e)
firefoxArgs = []
}
firefoxArgs.push("--new-tab")
}
await Native.run(`${config.get("browser")} ${firefoxArgs.join(" ")} '${url.replace(/'/g, "'\\''")}'`)
}
setTimeout(() => browser.tabs.onCreated.removeListener(selecttab), 100)
} catch (e) {