From 0e924a27d1fee402312e40f3cba978e1adb20661 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Mon, 18 Sep 2017 21:48:34 +0900
Subject: [PATCH 1/3] search with engines

---
 src/actions/command.js | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/actions/command.js b/src/actions/command.js
index 3e879a6..022e4f6 100644
--- a/src/actions/command.js
+++ b/src/actions/command.js
@@ -2,11 +2,36 @@ import * as tabs from '../background/tabs';
 import * as histories from '../background/histories';
 import * as consoleActions from './console';
 
-const normalizeUrl = (string) => {
+const DEFAULT_SEARCH_ENGINES = {
+  default: 'google',
+  engines: {
+    'google': 'https://google.com/search?q={}',
+    'yahoo': 'https://search.yahoo.com/search?p={}',
+    'bing': 'https://www.bing.com/search?q={}',
+    'duckduckgo': 'https://duckduckgo.com/?q={}',
+    'twitter': 'https://twitter.com/search?q={}',
+    'wikipedia': 'https://en.wikipedia.org/w/index.php?search={}'
+  }
+};
+
+const normalizeUrl = (string, searchConfig) => {
   try {
     return new URL(string).href;
   } catch (e) {
-    return 'http://' + string;
+    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);
   }
 };
 
@@ -43,10 +68,10 @@ const doCommand = (name, remaining) => {
   case 'o':
   case 'open':
     // TODO use search engined and pass keywords to them
-    return openCommand(normalizeUrl(remaining));
+    return openCommand(normalizeUrl(remaining, DEFAULT_SEARCH_ENGINES));
   case 't':
   case 'tabopen':
-    return tabopenCommand(normalizeUrl(remaining));
+    return tabopenCommand(normalizeUrl(remaining, DEFAULT_SEARCH_ENGINES));
   case 'b':
   case 'buffer':
     return bufferCommand(remaining);

From c4e79243ca18275e223e1ae405b9ad4b466c918d Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Mon, 18 Sep 2017 21:59:39 +0900
Subject: [PATCH 2/3] completion for search engines

---
 src/actions/command.js | 49 +++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/actions/command.js b/src/actions/command.js
index 022e4f6..93c06b8 100644
--- a/src/actions/command.js
+++ b/src/actions/command.js
@@ -63,6 +63,39 @@ const bufferCommand = (keywords) => {
   });
 };
 
+const getOpenCompletions = (keywords) => {
+  return histories.getCompletions(keywords).then((pages) => {
+    let historyItems = pages.map((page) => {
+      return {
+        caption: page.title,
+        content: page.url,
+        url: page.url
+      };
+    });
+    let engineNames = Object.keys(DEFAULT_SEARCH_ENGINES.engines);
+    let engineItems = engineNames.filter(name => name.startsWith(keywords))
+      .map(name => ({
+        caption: name,
+        content: 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) => {
   switch (name) {
   case 'o':
@@ -85,21 +118,7 @@ const getCompletions = (command, keywords) => {
   case 'open':
   case 't':
   case 'tabopen':
-    return histories.getCompletions(keywords).then((pages) => {
-      let items = pages.map((page) => {
-        return {
-          caption: page.title,
-          content: page.url,
-          url: page.url
-        };
-      });
-      return [
-        {
-          name: 'History',
-          items
-        }
-      ];
-    });
+    return getOpenCompletions(keywords);
   case 'b':
   case 'buffer':
     return tabs.getCompletions(keywords).then((gotTabs) => {

From 14a60c67b9f35d5f104403ed03da429588f452ca Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Mon, 18 Sep 2017 22:00:49 +0900
Subject: [PATCH 3/3] update README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2fa4cdf..259f9e6 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Firefox by WebExtensions API.
 
 - [ ] open command
   - [x] open a link
-  - [ ] search by keywords with engined
+  - [x] search by keywords with engined
   - [x] complete URLs from history
   - [ ] complete keywords for search
 - [x] tabs navigation
@@ -47,6 +47,7 @@ Firefox by WebExtensions API.
   - [x] activate input form
 - [ ] misc
   - [ ] configurable keymaps
+  - [ ] search engine settings
   - [ ] .rc file
   - [ ] other commands in Ex mode
 - [ ] supporting Google Chrome/Chromium