feat(recently colsed tab): add recently closed tab search

crown3 · Jun 3, 2018 · f8e256d · f8e256d
1 parent e3f72ac
commit f8e256d
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 21 deletions.
diff --git a/src/api/chrome-api.js b/src/api/chrome-api.js
@@ -153,6 +153,43 @@ function listenMsg(callback) {
   chrome.runtime.onMessage.addListener(callback)
 }
 
+function queryRecentLyClosed(arr) {
+  return new Promise(resolve => {
+    if (arr.length === 0) arr.push('')
+    chrome.sessions.getRecentlyClosed({
+      maxResults: 5
+    }, (rep) => {
+      const tmp = []
+      for (let index = 0; index < rep.length; index += 1) {
+        const item = rep[index].tab
+        if (item) {
+          /**
+           * length === 0: 默认出现所有所有 最近关闭的标签页
+           * length === 1 : 不需要进行后面的多个单词匹配
+           */
+          const isRight = arr.length < 2 || arr.every(item1 => new RegExp(`${item1}`, 'gi').test(`${item.url} ${item.title}`))
+          if (isRight) {
+            tmp.push({
+              type: 'recentlyClosed',
+              title: item.title,
+              subtitle: item.url,
+
+              id: item.sessionId,
+            })
+          }
+        }
+      }
+      resolve(tmp)
+    })
+
+  })
+
+}
+
+function restoreRecentTab(sessionId) {
+  chrome.sessions.restore(sessionId)
+}
+
 export default {
   findActiveTab,
   getConfig,
@@ -165,4 +202,6 @@ export default {
   setConfig,
   updateTabStatus,
   openNewTab,
+  queryRecentLyClosed,
+  restoreRecentTab
 }
diff --git a/src/assets/close.svg b/src/assets/close.svg
diff --git a/src/background/default-setting.js b/src/background/default-setting.js
@@ -6,20 +6,20 @@ export default {
     /**
      * @param
      * isDefault: 在不指定 keyword 的情况下是否进入搜索队列
-     * isSearch: 是否搜索该栏目下的内容
      * keyword: 搜索的关键字
      */
     {
       type: 'bookmark',
-      isSearch: true,
       isDefault: true,
       keyword: 'bm'
     }, {
       type: 'tab',
-      isSearch: true,
       isDefault: true,
       keyword: 't'
-    }
+    }, {
+      type: 'recentlyClosed',
+      keyword: 'rc'
+    },
   ]
 
 }
diff --git a/src/background/filter-search-data.js b/src/background/filter-search-data.js
@@ -42,21 +42,20 @@ function filterKeyword(strArr) {
   let tmp = []
   for (let idx = 0; idx < setting.itemSetting.length; idx += 1) {
     const item = setting.itemSetting[idx]
-    if (item.isSearch) {
-      if (item.keyword === strArr[0]) {
-        // 搜索单个子列
-        tmp = [{
-          type: item.type,
-          strArr: strArr.slice(1)
-        }]
-        break
-      } else if (item.isDefault)
-        tmp.push({
-          type: item.type,
-          strArr
-        })
-    }
+    if (item.keyword === strArr[0]) {
+      // 搜索单个子列
+      tmp = [{
+        type: item.type,
+        strArr: strArr.slice(1)
+      }]
+      break
+    } else if (item.isDefault)
+      tmp.push({
+        type: item.type,
+        strArr
+      })
   }
+  console.log(tmp)
   // 不管是默认搜索还是单项的搜索, 都要出现 keyowrd 类别的提示(如果有对应的话)
   return [{
     type: 'keyword',
@@ -76,6 +75,9 @@ function searchFromType(item, callback) {
     case 'tab':
       chromeAPI.queryTab(item.strArr).then(tmp => callback(null, tmp))
       break
+    case 'recentlyClosed':
+      chromeAPI.queryRecentLyClosed(item.strArr).then(tmp => callback(null, tmp))
+      break
 
     default:
       break

diff --git a/src/background/handle-selected-item.js b/src/background/handle-selected-item.js
@@ -8,6 +8,9 @@ function handleSelectedItem(item) {
     case 'tab':
       chromeAPI.updateTabStatus(item.id)
       break
+    case 'recentlyClosed':
+      chromeAPI.restoreRecentTab(item.id)
+      break
 
     default:
       break

diff --git a/src/background/index.js b/src/background/index.js
@@ -9,8 +9,6 @@ import handleSelectedItem from './handle-selected-item'
 
 import util from '../util'
 
-chromeAPI.getConfig()
-
 // init extension setting if
 chromeAPI
   .getConfig()

diff --git a/src/components/SearchList/search-list.styl b/src/components/SearchList/search-list.styl
@@ -38,6 +38,9 @@
       &.keyword
         background: url('../../assets/keyword.svg') center / 34px no-repeat
 
+      &.recentlyClosed
+        background: url('../../assets/close.svg') center / 34px no-repeat
+
     .key-enter
       display: none
       flex-shrink: 0

diff --git a/static/manifest.json b/static/manifest.json
@@ -46,7 +46,7 @@
   "omnibox": {
     "keyword": "c"
   },
-  "permissions": ["bookmarks", "chrome://favicon/", "tabs", "storage", "<all_urls>"],
+  "permissions": ["bookmarks", "sessions", "tabs", "storage", "<all_urls>"],
   "version": "2.0.0",
   "web_accessible_resources": [
     "img/*"