Skip to content

Commit

Permalink
feat(search-plugin): add namespace option (#706)
Browse files Browse the repository at this point in the history
* feat(search-plugin): add namespace option

* docs(search-plugin): update doc for option namespace
  • Loading branch information
cheng-kang authored and QingWei-Li committed Dec 5, 2018
1 parent 049726e commit 28beff8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
4 changes: 4 additions & 0 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ By default, the hyperlink on the current page is recognized and the content is s
depth: 2,
hideOtherSidebarContent: false, // whether or not to hide other sidebar content
// To avoid search index collision
// between multiple websites under the same domain
namespace: 'website-1',
}
}
</script>
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/search/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ const CONFIG = {
paths: 'auto',
depth: 2,
maxAge: 86400000, // 1 day
hideOtherSidebarContent: false
hideOtherSidebarContent: false,
namespace: undefined
}

const install = function (hook, vm) {
Expand All @@ -23,6 +24,7 @@ const install = function (hook, vm) {
CONFIG.noData = opts.noData || CONFIG.noData
CONFIG.depth = opts.depth || CONFIG.depth
CONFIG.hideOtherSidebarContent = opts.hideOtherSidebarContent || CONFIG.hideOtherSidebarContent
CONFIG.namespace = opts.namespace || CONFIG.namespace
}

const isAuto = CONFIG.paths === 'auto'
Expand Down
28 changes: 22 additions & 6 deletions src/plugins/search/search.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
let INDEXS = {}

const LOCAL_STORAGE = {
EXPIRE_KEY: 'docsify.search.expires',
INDEX_KEY: 'docsify.search.index'
}

function resolveExpireKey(namespace) {
return namespace ? `${LOCAL_STORAGE.EXPIRE_KEY}/${namespace}` : LOCAL_STORAGE.EXPIRE_KEY
}
function resolveIndexKey(namespace) {
return namespace ? `${LOCAL_STORAGE.INDEX_KEY}/${namespace}` : LOCAL_STORAGE.INDEX_KEY
}

function escapeHtml(string) {
const entityMap = {
'&': '&amp;',
Expand Down Expand Up @@ -33,9 +45,9 @@ function getAllPaths(router) {
return paths
}

function saveData(maxAge) {
localStorage.setItem('docsify.search.expires', Date.now() + maxAge)
localStorage.setItem('docsify.search.index', JSON.stringify(INDEXS))
function saveData(maxAge, expireKey, indexKey) {
localStorage.setItem(expireKey, Date.now() + maxAge)
localStorage.setItem(indexKey, JSON.stringify(INDEXS))
}

export function genIndex(path, content = '', router, depth) {
Expand Down Expand Up @@ -149,9 +161,13 @@ export function search(query) {

export function init(config, vm) {
const isAuto = config.paths === 'auto'
const isExpired = localStorage.getItem('docsify.search.expires') < Date.now()

INDEXS = JSON.parse(localStorage.getItem('docsify.search.index'))
const expireKey = resolveExpireKey(config.namespace)
const indexKey = resolveIndexKey(config.namespace)

const isExpired = localStorage.getItem(expireKey) < Date.now()

INDEXS = JSON.parse(localStorage.getItem(indexKey))

if (isExpired) {
INDEXS = {}
Expand All @@ -172,7 +188,7 @@ export function init(config, vm) {
.get(vm.router.getFile(path), false, vm.config.requestHeaders)
.then(result => {
INDEXS[path] = genIndex(path, result, vm.router, config.depth)
len === ++count && saveData(config.maxAge)
len === ++count && saveData(config.maxAge, expireKey, indexKey)
})
})
}

0 comments on commit 28beff8

Please sign in to comment.