From 0652131de885df3ebb7c9c0e762fd1604486a892 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 21 Jul 2018 15:59:30 +0900 Subject: Clean and tests for filters on open command --- src/background/repositories/completions.js | 81 +----------------------------- 1 file changed, 2 insertions(+), 79 deletions(-) (limited to 'src/background/repositories') diff --git a/src/background/repositories/completions.js b/src/background/repositories/completions.js index c4e956e..1318d36 100644 --- a/src/background/repositories/completions.js +++ b/src/background/repositories/completions.js @@ -12,88 +12,11 @@ export default class CompletionsRepository { }); } - // eslint-disable-next-line complexity, max-lines-per-function - async queryHistories(keywords) { - const filterHttp = (items) => { - const httpsHosts = items - .filter(item => item[1].protocol === 'https:') - .map(item => item[1].host); - const httpsHostSet = new Set(httpsHosts); - return items.filter( - item => !(item[1].protocol === 'http:' && - httpsHostSet.has(item[1].host)) - ); - }; - - const filterEmptyTitle = (items) => { - return items.filter(item => item[0].title && item[0].title !== ''); - }; - - const filterClosedPath = (items) => { - const allSimplePaths = items - .filter(item => item[1].hash === '' && item[1].search === '') - .map(item => item[1].origin + item[1].pathname); - const allSimplePathSet = new Set(allSimplePaths); - return items.filter( - item => !(item[1].hash === '' && item[1].search === '' && - (/\/$/).test(item[1].pathname) && - allSimplePathSet.has( - (item[1].origin + item[1].pathname).replace(/\/$/, '') - ) - ) - ); - }; - - const reduceByPathname = (items, min) => { - let hash = {}; - for (let item of items) { - let pathname = item[1].origin + item[1].pathname; - if (!hash[pathname]) { - hash[pathname] = item; - } else if (hash[pathname][1].href.length > item[1].href.length) { - hash[pathname] = item; - } - } - let filtered = Object.values(hash); - if (filtered.length < min) { - return items; - } - return filtered; - }; - - const reduceByOrigin = (items, min) => { - let hash = {}; - for (let item of items) { - let origin = item[1].origin; - if (!hash[origin]) { - hash[origin] = item; - } else if (hash[origin][1].href.length > item[1].href.length) { - hash[origin] = item; - } - } - let filtered = Object.values(hash); - if (filtered.length < min) { - return items; - } - return filtered; - }; - - - let historyItems = await browser.history.search({ + queryHistories(keywords) { + return browser.history.search({ text: keywords, startTime: 0, }); - return [historyItems.map(item => [item, new URL(item.url)])] - .map(filterEmptyTitle) - .map(filterHttp) - .map(filterClosedPath) - .map(items => reduceByPathname(items, 10)) - .map(items => reduceByOrigin(items, 10)) - .map(items => items - .sort((x, y) => x[0].visitCount < y[0].visitCount) - .slice(0, 10) - .map(item => item[0]) - )[0]; } async queryTabs(keywords, excludePinned) { -- cgit v1.2.3