From 10ad62e60698c5d53ffcf58ae6abd182f7d3fc9c Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Fri, 6 Oct 2017 23:03:28 +0900 Subject: console command actions without store --- src/actions/command.js | 147 ------------------------------------------- src/components/background.js | 12 ++-- src/components/console.js | 6 +- src/content/messages.js | 2 +- src/pages/console.js | 1 - src/shared/commands.js | 143 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 153 insertions(+), 158 deletions(-) delete mode 100644 src/actions/command.js create mode 100644 src/shared/commands.js diff --git a/src/actions/command.js b/src/actions/command.js deleted file mode 100644 index a40cc97..0000000 --- a/src/actions/command.js +++ /dev/null @@ -1,147 +0,0 @@ -import * as tabs from 'background/tabs'; -import * as histories from 'background/histories'; -import * as consoleActions from './console'; - -const normalizeUrl = (string, searchConfig) => { - try { - return new URL(string).href; - } catch (e) { - if (string.includes('.') && !string.includes(' ')) { - return 'http://' + string; - } - let query = encodeURI(string); - let template = searchConfig.engines[ - searchConfig.default - ]; - for (let key in searchConfig.engines) { - if (string.startsWith(key + ' ')) { - query = encodeURI(string.replace(key + ' ', '')); - template = searchConfig.engines[key]; - } - } - return template.replace('{}', query); - } -}; - -const openCommand = (url) => { - return browser.tabs.query({ - active: true, currentWindow: true - }).then((gotTabs) => { - if (gotTabs.length > 0) { - return browser.tabs.update(gotTabs[0].id, { url: url }); - } - }); -}; - -const tabopenCommand = (url) => { - return browser.tabs.create({ url: url }); -}; - -const bufferCommand = (keywords) => { - return browser.tabs.query({ - active: true, currentWindow: true - }).then((gotTabs) => { - if (gotTabs.length > 0) { - if (isNaN(keywords)) { - return tabs.selectByKeyword(gotTabs[0], keywords); - } - let index = parseInt(keywords, 10) - 1; - return tabs.selectAt(index); - } - }); -}; - -const getOpenCompletions = (command, keywords, searchConfig) => { - return histories.getCompletions(keywords).then((pages) => { - let historyItems = pages.map((page) => { - return { - caption: page.title, - content: command + ' ' + page.url, - url: page.url - }; - }); - let engineNames = Object.keys(searchConfig.engines); - let engineItems = engineNames.filter(name => name.startsWith(keywords)) - .map(name => ({ - caption: name, - content: command + ' ' + name - })); - - let completions = []; - if (engineItems.length > 0) { - completions.push({ - name: 'Search Engines', - items: engineItems - }); - } - if (historyItems.length > 0) { - completions.push({ - name: 'History', - items: historyItems - }); - } - return completions; - }); -}; - -const doCommand = (name, remaining, settings) => { - switch (name) { - case 'o': - case 'open': - // TODO use search engined and pass keywords to them - return openCommand(normalizeUrl(remaining, settings.search)); - case 't': - case 'tabopen': - return tabopenCommand(normalizeUrl(remaining, settings.search)); - case 'b': - case 'buffer': - return bufferCommand(remaining); - } - throw new Error(name + ' command is not defined'); -}; - -const getCompletions = (command, keywords, settings) => { - switch (command) { - case 'o': - case 'open': - case 't': - case 'tabopen': - return getOpenCompletions(command, keywords, settings.search); - case 'b': - case 'buffer': - return tabs.getCompletions(keywords).then((gotTabs) => { - let items = gotTabs.map((tab) => { - return { - caption: tab.title, - content: command + ' ' + tab.title, - url: tab.url, - icon: tab.favIconUrl - }; - }); - return [ - { - name: 'Buffers', - items: items - } - ]; - }); - } - return Promise.resolve([]); -}; - -const exec = (line, settings) => { - let name = line.split(' ')[0]; - let remaining = line.replace(name + ' ', ''); - return doCommand(name, remaining, settings).then(() => { - return consoleActions.hide(); - }); -}; - -const complete = (line, settings) => { - let command = line.split(' ', 1)[0]; - let keywords = line.replace(command + ' ', ''); - return getCompletions(command, keywords, settings) - .then(consoleActions.setCompletions); -}; - -export { exec, complete }; diff --git a/src/components/background.js b/src/components/background.js index 08d5115..195cfd9 100644 --- a/src/components/background.js +++ b/src/components/background.js @@ -1,9 +1,9 @@ import messages from 'content/messages'; -import * as commandActions from 'actions/command'; import * as consoleActions from 'actions/console'; import * as inputActions from 'actions/input'; import * as settingsActions from 'actions/setting'; import * as tabActions from 'actions/tab'; +import * as commands from 'shared/commands'; export default class BackgroundComponent { constructor(store) { @@ -12,7 +12,7 @@ export default class BackgroundComponent { browser.runtime.onMessage.addListener((message, sender) => { try { - this.onMessage(message, sender); + return this.onMessage(message, sender); } catch (e) { this.store.dispatch(consoleActions.showError(e.message), sender); } @@ -47,11 +47,9 @@ export default class BackgroundComponent { return this.store.dispatch( consoleActions.hide(), sender); case messages.CONSOLE_ENTERED: - return this.store.dispatch( - commandActions.exec(message.text, this.settings), sender); - case messages.CONSOLE_CHANGEED: - return this.store.dispatch( - commandActions.complete(message.text, this.settings), sender); + return commands.exec(message.text, this.settings); + case messages.CONSOLE_QUERY_COMPLETIONS: + return commands.complete(message.text, this.settings); case messages.SETTINGS_RELOAD: this.store.dispatch(settingsActions.load()); } diff --git a/src/components/console.js b/src/components/console.js index 25b135c..177cfe5 100644 --- a/src/components/console.js +++ b/src/components/console.js @@ -36,7 +36,7 @@ export default class ConsoleComponent { return browser.runtime.sendMessage({ type: messages.CONSOLE_ENTERED, text: e.target.value - }); + }).then(this.onBlur); case KeyboardEvent.DOM_VK_TAB: if (e.shiftKey) { this.store.dispatch(completionActions.selectPrev()); @@ -63,8 +63,10 @@ export default class ConsoleComponent { this.prevValue = e.target.value; return browser.runtime.sendMessage({ - type: messages.CONSOLE_CHANGEED, + type: messages.CONSOLE_QUERY_COMPLETIONS, text: e.target.value + }).then((completions) => { + this.store.dispatch(completionActions.setItems(completions)); }); } diff --git a/src/content/messages.js b/src/content/messages.js index df9fba2..72a566b 100644 --- a/src/content/messages.js +++ b/src/content/messages.js @@ -4,7 +4,7 @@ export default { CONSOLE_BLURRED: 'console.blured', CONSOLE_ENTERED: 'console.entered', - CONSOLE_CHANGEED: 'console.changed', + CONSOLE_QUERY_COMPLETIONS: 'console.query.completions', KEYDOWN: 'keydown', diff --git a/src/pages/console.js b/src/pages/console.js index a4536ec..4d78826 100644 --- a/src/pages/console.js +++ b/src/pages/console.js @@ -39,6 +39,5 @@ browser.runtime.onMessage.addListener((action) => { if (action.type === messages.STATE_UPDATE) { let state = action.state.console; consoleComponent.update(state); - store.dispatch(completionActions.setItems(state.completions)); } }); diff --git a/src/shared/commands.js b/src/shared/commands.js new file mode 100644 index 0000000..b1d8780 --- /dev/null +++ b/src/shared/commands.js @@ -0,0 +1,143 @@ +import * as tabs from 'background/tabs'; +import * as histories from 'background/histories'; + +const normalizeUrl = (string, searchConfig) => { + try { + return new URL(string).href; + } catch (e) { + if (string.includes('.') && !string.includes(' ')) { + return 'http://' + string; + } + let query = encodeURI(string); + let template = searchConfig.engines[ + searchConfig.default + ]; + for (let key in searchConfig.engines) { + if (string.startsWith(key + ' ')) { + query = encodeURI(string.replace(key + ' ', '')); + template = searchConfig.engines[key]; + } + } + return template.replace('{}', query); + } +}; + +const openCommand = (url) => { + return browser.tabs.query({ + active: true, currentWindow: true + }).then((gotTabs) => { + if (gotTabs.length > 0) { + return browser.tabs.update(gotTabs[0].id, { url: url }); + } + }); +}; + +const tabopenCommand = (url) => { + return browser.tabs.create({ url: url }); +}; + +const bufferCommand = (keywords) => { + return browser.tabs.query({ + active: true, currentWindow: true + }).then((gotTabs) => { + if (gotTabs.length > 0) { + if (isNaN(keywords)) { + return tabs.selectByKeyword(gotTabs[0], keywords); + } + let index = parseInt(keywords, 10) - 1; + return tabs.selectAt(index); + } + }); +}; + +const getOpenCompletions = (command, keywords, searchConfig) => { + return histories.getCompletions(keywords).then((pages) => { + let historyItems = pages.map((page) => { + return { + caption: page.title, + content: command + ' ' + page.url, + url: page.url + }; + }); + let engineNames = Object.keys(searchConfig.engines); + let engineItems = engineNames.filter(name => name.startsWith(keywords)) + .map(name => ({ + caption: name, + content: command + ' ' + name + })); + + let completions = []; + if (engineItems.length > 0) { + completions.push({ + name: 'Search Engines', + items: engineItems + }); + } + if (historyItems.length > 0) { + completions.push({ + name: 'History', + items: historyItems + }); + } + return completions; + }); +}; + +const doCommand = (name, remaining, settings) => { + switch (name) { + case 'o': + case 'open': + // TODO use search engined and pass keywords to them + return openCommand(normalizeUrl(remaining, settings.search)); + case 't': + case 'tabopen': + return tabopenCommand(normalizeUrl(remaining, settings.search)); + case 'b': + case 'buffer': + return bufferCommand(remaining); + } + throw new Error(name + ' command is not defined'); +}; + +const getCompletions = (command, keywords, settings) => { + switch (command) { + case 'o': + case 'open': + case 't': + case 'tabopen': + return getOpenCompletions(command, keywords, settings.search); + case 'b': + case 'buffer': + return tabs.getCompletions(keywords).then((gotTabs) => { + let items = gotTabs.map((tab) => { + return { + caption: tab.title, + content: command + ' ' + tab.title, + url: tab.url, + icon: tab.favIconUrl + }; + }); + return [ + { + name: 'Buffers', + items: items + } + ]; + }); + } + return Promise.resolve([]); +}; + +const exec = (line, settings) => { + let name = line.split(' ')[0]; + let remaining = line.replace(name + ' ', ''); + return doCommand(name, remaining, settings); +}; + +const complete = (line, settings) => { + let command = line.split(' ', 1)[0]; + let keywords = line.replace(command + ' ', ''); + return getCompletions(command, keywords, settings); +}; + +export { exec, complete }; -- cgit v1.2.3