From dda4e7475cdd092d00441c7cd0ceb194ee5dee3d Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 11 Jan 2018 20:07:25 +0900
Subject: move commands to background action

---
 src/background/actions/command.js | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/background/actions/command.js

(limited to 'src/background/actions/command.js')

diff --git a/src/background/actions/command.js b/src/background/actions/command.js
new file mode 100644
index 0000000..f11c61b
--- /dev/null
+++ b/src/background/actions/command.js
@@ -0,0 +1,62 @@
+import * as tabs from 'background/tabs';
+import * as parsers from 'shared/commands/parsers';
+
+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 winopenCommand = (url) => {
+  return browser.windows.create({ url });
+};
+
+const bufferCommand = (keywords) => {
+  if (keywords.length === 0) {
+    return Promise.resolve([]);
+  }
+  let keywordsStr = keywords.join(' ');
+  return browser.tabs.query({
+    active: true, currentWindow: true
+  }).then((gotTabs) => {
+    if (gotTabs.length > 0) {
+      if (isNaN(keywordsStr)) {
+        return tabs.selectByKeyword(gotTabs[0], keywordsStr);
+      }
+      let index = parseInt(keywordsStr, 10) - 1;
+      return tabs.selectAt(index);
+    }
+  });
+};
+
+const exec = (line, settings) => {
+  let [name, args] = parsers.parseCommandLine(line);
+
+  switch (name) {
+  case 'o':
+  case 'open':
+    return openCommand(parsers.normalizeUrl(args, settings.search));
+  case 't':
+  case 'tabopen':
+    return tabopenCommand(parsers.normalizeUrl(args, settings.search));
+  case 'w':
+  case 'winopen':
+    return winopenCommand(parsers.normalizeUrl(args, settings.search));
+  case 'b':
+  case 'buffer':
+    return bufferCommand(args);
+  case '':
+    return Promise.resolve();
+  }
+  throw new Error(name + ' command is not defined');
+};
+
+export { exec };
-- 
cgit v1.2.3


From fad8f96a663d83792138cc986474ec4228b6c6c9 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 11 Jan 2018 20:22:49 +0900
Subject: implement set option

---
 src/background/actions/command.js       | 17 +++++++++++++++++
 src/background/components/background.js | 11 +++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'src/background/actions/command.js')

diff --git a/src/background/actions/command.js b/src/background/actions/command.js
index f11c61b..4c52bca 100644
--- a/src/background/actions/command.js
+++ b/src/background/actions/command.js
@@ -1,5 +1,7 @@
+import actions from '../actions';
 import * as tabs from 'background/tabs';
 import * as parsers from 'shared/commands/parsers';
+import * as properties from 'shared/settings/properties';
 
 const openCommand = (url) => {
   return browser.tabs.query({
@@ -37,6 +39,19 @@ const bufferCommand = (keywords) => {
   });
 };
 
+const setCommand = (args) => {
+  if (!args[0]) {
+    return Promise.resolve();
+  }
+
+  let [name, value] = parsers.parseSetOption(args[0], properties.types);
+  return {
+    type: actions.SETTING_SET_PROPERTY,
+    name,
+    value
+  };
+};
+
 const exec = (line, settings) => {
   let [name, args] = parsers.parseCommandLine(line);
 
@@ -53,6 +68,8 @@ const exec = (line, settings) => {
   case 'b':
   case 'buffer':
     return bufferCommand(args);
+  case 'set':
+    return setCommand(args);
   case '':
     return Promise.resolve();
   }
diff --git a/src/background/components/background.js b/src/background/components/background.js
index 19bf27f..9578e78 100644
--- a/src/background/components/background.js
+++ b/src/background/components/background.js
@@ -36,12 +36,11 @@ export default class BackgroundComponent {
       return this.store.dispatch(
         tabActions.openToTab(message.url, sender.tab), sender);
     case messages.CONSOLE_ENTER_COMMAND:
-      return commandActions.exec(message.text, settings.value).catch((e) => {
-        return browser.tabs.sendMessage(sender.tab.id, {
-          type: messages.CONSOLE_SHOW_ERROR,
-          text: e.message,
-        });
-      });
+      this.store.dispatch(
+        commandActions.exec(message.text, settings.value),
+        sender
+      );
+      return this.broadcastSettingsChanged();
     case messages.SETTINGS_QUERY:
       return Promise.resolve(this.store.getState().setting.value);
     case messages.CONSOLE_QUERY_COMPLETIONS:
-- 
cgit v1.2.3