Complete open histories and bookmarks

jh-changes
Shin'ya Ueoka 7 years ago
parent 890d93fe77
commit fc5e6b2b41
  1. 2
      src/background/controllers/completions.js
  2. 97
      src/background/repositories/completions.js
  3. 24
      src/background/usecases/completions.js

@ -21,7 +21,7 @@ export default class ContentMessageController {
case 'tabopen':
case 'w':
case 'winopen':
return this.completionsInteractor.queryOpen(name);
return this.completionsInteractor.queryOpen(name, keywords);
case 'b':
case 'buffer':
return this.completionsInteractor.queryBuffer(name, keywords);

@ -1,4 +1,101 @@
export default class CompletionsRepository {
async queryBookmarks(keywords) {
let items = await browser.bookmarks.search({ query: keywords });
return items.filter((item) => {
let url = undefined;
try {
url = new URL(item.url);
} catch (e) {
return false;
}
return item.type === 'bookmark' && url.protocol !== 'place:';
});
}
// 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({
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) {
let tabs = await browser.tabs.query({ currentWindow: true });
return tabs.filter((t) => {

@ -27,8 +27,28 @@ export default class CompletionsInteractor {
);
}
queryOpen() {
return Promise.resolve(Completions.empty());
async queryOpen(name, keywords) {
let groups = [];
let histories = await this.completionRepository.queryHistories(keywords);
if (histories.length > 0) {
let items = histories.map(page => new CompletionItem({
caption: page.title,
content: name + ' ' + page.url,
url: page.url
}));
groups.push(new CompletionGroup('History', items));
}
let bookmarks = await this.completionRepository.queryBookmarks(keywords);
if (bookmarks.length > 0) {
let items = bookmarks.map(page => new CompletionItem({
caption: page.title,
content: name + ' ' + page.url,
url: page.url
}));
groups.push(new CompletionGroup('Bookmarks', items));
}
return new Completions(groups);
}
queryBuffer(name, keywords) {