Refactor background directories
This commit is contained in:
parent
c5c08783d2
commit
98bc2326ee
9 changed files with 19 additions and 21 deletions
83
src/background/shared/completions/histories.js
Normal file
83
src/background/shared/completions/histories.js
Normal file
|
@ -0,0 +1,83 @@
|
|||
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;
|
||||
};
|
||||
|
||||
const getCompletions = (keyword) => {
|
||||
return browser.history.search({
|
||||
text: keyword,
|
||||
startTime: 0,
|
||||
}).then((historyItems) => {
|
||||
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];
|
||||
});
|
||||
};
|
||||
|
||||
export { getCompletions };
|
84
src/background/shared/completions/index.js
Normal file
84
src/background/shared/completions/index.js
Normal file
|
@ -0,0 +1,84 @@
|
|||
import * as tabs from './tabs';
|
||||
import * as histories from './histories';
|
||||
|
||||
const getOpenCompletions = (command, keywords, searchConfig) => {
|
||||
return histories.getCompletions(keywords).then((pages) => {
|
||||
let historyItems = pages.map((page) => {
|
||||
return {
|
||||
caption: page.title,
|
||||
content: command + ' ' + page.url,
|
||||
url: page.url
|
||||
};
|
||||
});
|
||||
let engineNames = Object.keys(searchConfig.engines);
|
||||
let engineItems = engineNames.filter(name => name.startsWith(keywords))
|
||||
.map(name => ({
|
||||
caption: name,
|
||||
content: command + ' ' + 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 getCompletions = (line, settings) => {
|
||||
let typedWords = line.trim().split(/ +/);
|
||||
let typing = '';
|
||||
if (!line.endsWith(' ')) {
|
||||
typing = typedWords.pop();
|
||||
}
|
||||
|
||||
if (typedWords.length === 0) {
|
||||
return Promise.resolve([]);
|
||||
}
|
||||
let name = typedWords.shift();
|
||||
let keywords = typedWords.concat(typing).join(' ');
|
||||
|
||||
switch (name) {
|
||||
case 'o':
|
||||
case 'open':
|
||||
case 't':
|
||||
case 'tabopen':
|
||||
case 'w':
|
||||
case 'winopen':
|
||||
return getOpenCompletions(name, keywords, settings.search);
|
||||
case 'b':
|
||||
case 'buffer':
|
||||
return tabs.getCompletions(keywords).then((gotTabs) => {
|
||||
let items = gotTabs.map((tab) => {
|
||||
return {
|
||||
caption: tab.title,
|
||||
content: name + ' ' + tab.title,
|
||||
url: tab.url,
|
||||
icon: tab.favIconUrl
|
||||
};
|
||||
});
|
||||
return [
|
||||
{
|
||||
name: 'Buffers',
|
||||
items: items
|
||||
}
|
||||
];
|
||||
});
|
||||
}
|
||||
return Promise.resolve([]);
|
||||
};
|
||||
|
||||
const complete = (line, settings) => {
|
||||
return getCompletions(line, settings);
|
||||
};
|
||||
|
||||
export { complete };
|
10
src/background/shared/completions/tabs.js
Normal file
10
src/background/shared/completions/tabs.js
Normal file
|
@ -0,0 +1,10 @@
|
|||
const getCompletions = (keyword) => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
let matched = tabs.filter((t) => {
|
||||
return t.url.includes(keyword) || t.title && t.title.includes(keyword);
|
||||
});
|
||||
return matched;
|
||||
});
|
||||
};
|
||||
|
||||
export { getCompletions };
|
136
src/background/shared/tabs.js
Normal file
136
src/background/shared/tabs.js
Normal file
|
@ -0,0 +1,136 @@
|
|||
let prevSelTab = 1;
|
||||
let currSelTab = 1;
|
||||
|
||||
browser.tabs.onActivated.addListener((activeInfo) => {
|
||||
return browser.tabs.query({ currentWindow: true }).then(() => {
|
||||
prevSelTab = currSelTab;
|
||||
currSelTab = activeInfo.tabId;
|
||||
});
|
||||
});
|
||||
|
||||
const closeTab = (id) => {
|
||||
return browser.tabs.get(id).then((tab) => {
|
||||
if (!tab.pinned) {
|
||||
return browser.tabs.remove(id);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const closeTabForce = (id) => {
|
||||
return browser.tabs.remove(id);
|
||||
};
|
||||
|
||||
const reopenTab = () => {
|
||||
return browser.sessions.getRecentlyClosed({
|
||||
maxResults: 1
|
||||
}).then((sessions) => {
|
||||
if (sessions.length === 0) {
|
||||
return;
|
||||
}
|
||||
let session = sessions[0];
|
||||
if (session.tab) {
|
||||
return browser.sessions.restore(session.tab.sessionId);
|
||||
}
|
||||
return browser.sessions.restore(session.window.sessionId);
|
||||
});
|
||||
};
|
||||
|
||||
const selectAt = (index) => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
if (tabs.length < 2) {
|
||||
return;
|
||||
}
|
||||
if (index < 0 || tabs.length <= index) {
|
||||
throw new RangeError(`tab ${index + 1} does not exist`);
|
||||
}
|
||||
let id = tabs[index].id;
|
||||
return browser.tabs.update(id, { active: true });
|
||||
});
|
||||
};
|
||||
|
||||
const selectByKeyword = (current, keyword) => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
let matched = tabs.filter((t) => {
|
||||
return t.url.includes(keyword) || t.title.includes(keyword);
|
||||
});
|
||||
|
||||
if (matched.length === 0) {
|
||||
throw new RangeError('No matching buffer for ' + keyword);
|
||||
}
|
||||
for (let tab of matched) {
|
||||
if (tab.index > current.index) {
|
||||
return browser.tabs.update(tab.id, { active: true });
|
||||
}
|
||||
}
|
||||
return browser.tabs.update(matched[0].id, { active: true });
|
||||
});
|
||||
};
|
||||
|
||||
const selectPrevTab = (current, count) => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
if (tabs.length < 2) {
|
||||
return;
|
||||
}
|
||||
let select = (current - count + tabs.length) % tabs.length;
|
||||
let id = tabs[select].id;
|
||||
return browser.tabs.update(id, { active: true });
|
||||
});
|
||||
};
|
||||
|
||||
const selectNextTab = (current, count) => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
if (tabs.length < 2) {
|
||||
return;
|
||||
}
|
||||
let select = (current + count) % tabs.length;
|
||||
let id = tabs[select].id;
|
||||
return browser.tabs.update(id, { active: true });
|
||||
});
|
||||
};
|
||||
|
||||
const selectFirstTab = () => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
let id = tabs[0].id;
|
||||
return browser.tabs.update(id, { active: true });
|
||||
});
|
||||
};
|
||||
|
||||
const selectLastTab = () => {
|
||||
return browser.tabs.query({ currentWindow: true }).then((tabs) => {
|
||||
let id = tabs[tabs.length - 1].id;
|
||||
return browser.tabs.update(id, { active: true });
|
||||
});
|
||||
};
|
||||
|
||||
const selectPrevSelTab = () => {
|
||||
return browser.tabs.update(prevSelTab, { active: true });
|
||||
};
|
||||
|
||||
const reload = (current, cache) => {
|
||||
return browser.tabs.reload(
|
||||
current.id,
|
||||
{ bypassCache: cache }
|
||||
);
|
||||
};
|
||||
|
||||
const updateTabPinned = (current, pinned) => {
|
||||
return browser.tabs.query({ currentWindow: true, active: true })
|
||||
.then(() => {
|
||||
return browser.tabs.update(current.id, { pinned: pinned });
|
||||
});
|
||||
};
|
||||
|
||||
const toggleTabPinned = (current) => {
|
||||
updateTabPinned(current, !current.pinned);
|
||||
};
|
||||
|
||||
const duplicate = (id) => {
|
||||
return browser.tabs.duplicate(id);
|
||||
};
|
||||
|
||||
export {
|
||||
closeTab, closeTabForce, reopenTab, selectAt, selectByKeyword,
|
||||
selectPrevTab, selectNextTab, selectFirstTab,
|
||||
selectLastTab, selectPrevSelTab, reload, updateTabPinned,
|
||||
toggleTabPinned, duplicate
|
||||
};
|
38
src/background/shared/zooms.js
Normal file
38
src/background/shared/zooms.js
Normal file
|
@ -0,0 +1,38 @@
|
|||
// For chromium
|
||||
// const ZOOM_SETTINGS = [
|
||||
// 0.25, 0.33, 0.50, 0.66, 0.75, 0.80, 0.90, 1.00,
|
||||
// 1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00, 4.00, 5.00
|
||||
// ];
|
||||
|
||||
const ZOOM_SETTINGS = [
|
||||
0.33, 0.50, 0.66, 0.75, 0.80, 0.90, 1.00,
|
||||
1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00
|
||||
];
|
||||
|
||||
const zoomIn = (tabId = undefined) => {
|
||||
return browser.tabs.getZoom(tabId).then((factor) => {
|
||||
for (let f of ZOOM_SETTINGS) {
|
||||
if (f > factor) {
|
||||
browser.tabs.setZoom(tabId, f);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const zoomOut = (tabId = undefined) => {
|
||||
return browser.tabs.getZoom(tabId).then((factor) => {
|
||||
for (let f of [].concat(ZOOM_SETTINGS).reverse()) {
|
||||
if (f < factor) {
|
||||
browser.tabs.setZoom(tabId, f);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const neutral = (tabId = undefined) => {
|
||||
return browser.tabs.setZoom(tabId, 1);
|
||||
};
|
||||
|
||||
export { zoomIn, zoomOut, neutral };
|
Reference in a new issue