Execute configured command for URL, on button-hit
Now we don’t run a hardcoded command when the address-bar button is pressed, but the command configured for that URL. Also, we only enable the address-bar button for tabs whose URL is matched by some command.
This commit is contained in:
parent
eb1b330ffc
commit
a41b7a70cf
|
@ -1,12 +1,73 @@
|
||||||
let port = browser.runtime.connectNative("shellfox");
|
let port = browser.runtime.connectNative("shellfox");
|
||||||
|
|
||||||
|
|
||||||
|
// Return the command-string associated with a URL, if any.
|
||||||
|
function getUrlCommand(url) {
|
||||||
|
let matchCommand = undefined;
|
||||||
|
let matchRegex = "";
|
||||||
|
|
||||||
|
try {
|
||||||
|
let savedCommands = JSON.parse(localStorage.getItem("commands"));
|
||||||
|
for (regexCommandPair of savedCommands) {
|
||||||
|
let regex = regexCommandPair[0];
|
||||||
|
let match = url.match(regex);
|
||||||
|
let compared = compareRegexComplexity(matchRegex, regex);
|
||||||
|
console.log(matchRegex, "v", regex, "=", compared);
|
||||||
|
if (match && (compared == 0 || compared == 1)) {
|
||||||
|
matchCommand = regexCommandPair[1];
|
||||||
|
matchRegex = regex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {};
|
||||||
|
return matchCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Execute the shell command associated with the given URL, if any.
|
||||||
|
function runUrlCommand(url) {
|
||||||
|
console.log("Executing…");
|
||||||
|
let command = getUrlCommand(url);
|
||||||
|
if (command && port) {
|
||||||
|
port.postMessage(command);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Compare two regular expressions, returning which one is more specific.
|
||||||
|
// Returns -1 if a is more specific, 1 if b is, and 0 if they are equal.
|
||||||
|
// It’s a simple (and unreliable) algorithm, for now — purely based on length.
|
||||||
|
function compareRegexComplexity(a, b) {
|
||||||
|
if (a && ((a && !b) || (a.length > b.length)))
|
||||||
|
return -1;
|
||||||
|
else if (b && ((b && !a) || (a.length < b.length)))
|
||||||
|
return 1
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
port.onDisconnect.addListener((port) => {
|
port.onDisconnect.addListener((port) => {
|
||||||
console.log(port.error);
|
console.log(port.error);
|
||||||
port = undefined;
|
port = undefined;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
browser.pageAction.onClicked.addListener(() => {
|
browser.pageAction.onClicked.addListener((tab) => {
|
||||||
port.postMessage("emacs /tmp/f");
|
console.log("onClicked");
|
||||||
|
runUrlCommand(tab.url);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
|
||||||
|
console.log("onUpdated");
|
||||||
|
if (getUrlCommand(tab.url))
|
||||||
|
browser.pageAction.show(tabId);
|
||||||
|
else
|
||||||
|
browser.pageAction.hide(tabId);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
browser.tabs.onActivated.addListener((activeInfo) => {
|
||||||
|
console.log("activated");
|
||||||
|
let url = browser.tabs.get(activeInfo.tabId).url;
|
||||||
|
});
|
||||||
|
|
||||||
|
|
|
@ -15,12 +15,13 @@
|
||||||
"19": "res/shellfox-19.png",
|
"19": "res/shellfox-19.png",
|
||||||
"38": "res/shellfox-38.png"
|
"38": "res/shellfox-38.png"
|
||||||
},
|
},
|
||||||
"default_title": "Shellfox",
|
"default_title": "Shellfox"
|
||||||
"show_matches": ["<all_urls>"]
|
|
||||||
},
|
},
|
||||||
|
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"nativeMessaging"
|
"nativeMessaging",
|
||||||
|
"activeTab",
|
||||||
|
"tabs"
|
||||||
],
|
],
|
||||||
|
|
||||||
"browser_specific_settings": {
|
"browser_specific_settings": {
|
||||||
|
|
11
options.js
11
options.js
|
@ -16,10 +16,13 @@ function saveCommands() {
|
||||||
// command-table with them.
|
// command-table with them.
|
||||||
function populateCommandTable() {
|
function populateCommandTable() {
|
||||||
let commandTable = document.getElementById("commandTable");
|
let commandTable = document.getElementById("commandTable");
|
||||||
for (cmdRegex of JSON.parse(localStorage.getItem("commands"))) {
|
try {
|
||||||
let commandTr = createCommandTr(cmdRegex[0], cmdRegex[1]);
|
let savedCommands = JSON.parse(localStorage.getItem("commands"));
|
||||||
commandTable.appendChild(commandTr);
|
for (cmdRegex of savedCommands) {
|
||||||
}
|
let commandTr = createCommandTr(cmdRegex[0], cmdRegex[1]);
|
||||||
|
commandTable.appendChild(commandTr);
|
||||||
|
}
|
||||||
|
} catch { };
|
||||||
// Always add a spare entry.
|
// Always add a spare entry.
|
||||||
commandTable.appendChild(createCommandTr("", ""));
|
commandTable.appendChild(createCommandTr("", ""));
|
||||||
}
|
}
|
||||||
|
|
Ŝarĝante…
Reference in New Issue