mirror of
https://github.com/alrayyes/wiki.git
synced 2024-11-22 19:46:23 +00:00
more search improvements
This commit is contained in:
parent
6005a2e0a0
commit
df23b99951
1 changed files with 48 additions and 17 deletions
|
@ -67,16 +67,35 @@
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
const contentIndex = new FlexSearch.Worker({
|
const contentIndex = new FlexSearch.Document({
|
||||||
tokenize: "reverse",
|
cache: true,
|
||||||
charset: "latin:extra",
|
charset: "latin:extra",
|
||||||
|
optimize: true,
|
||||||
|
worker: true,
|
||||||
|
document: {
|
||||||
|
index: [{
|
||||||
|
field: "content",
|
||||||
|
tokenize: "strict",
|
||||||
|
context: {
|
||||||
|
resolution: 5,
|
||||||
|
depth: 3,
|
||||||
|
bidirectional: true
|
||||||
|
},
|
||||||
suggest: true,
|
suggest: true,
|
||||||
cache: 10,
|
}, {
|
||||||
|
field: "title",
|
||||||
|
tokenize: "forward",
|
||||||
|
}]
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const scrapedContent = {{$.Site.Data.contentIndex}}
|
const scrapedContent = {{$.Site.Data.contentIndex}}
|
||||||
for (const [key, value] of Object.entries(scrapedContent)) {
|
for (const [key, value] of Object.entries(scrapedContent)) {
|
||||||
contentIndex.add(key, value.content)
|
contentIndex.add({
|
||||||
|
id: key,
|
||||||
|
title: value.title,
|
||||||
|
content: removeMarkdown(value.content),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const highlight = (content, term) => {
|
const highlight = (content, term) => {
|
||||||
|
@ -129,6 +148,13 @@
|
||||||
window.location.href = "{{.Site.BaseURL}}" + `${id}#:~:text=${encodeURIComponent(term)}`
|
window.location.href = "{{.Site.BaseURL}}" + `${id}#:~:text=${encodeURIComponent(term)}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fetch = id => ({
|
||||||
|
id,
|
||||||
|
url: id,
|
||||||
|
title: scrapedContent[id].title,
|
||||||
|
content: scrapedContent[id].content
|
||||||
|
})
|
||||||
|
|
||||||
const source = document.getElementById('search-bar')
|
const source = document.getElementById('search-bar')
|
||||||
const results = document.getElementById("results-container")
|
const results = document.getElementById("results-container")
|
||||||
let term
|
let term
|
||||||
|
@ -140,16 +166,21 @@
|
||||||
})
|
})
|
||||||
source.addEventListener('input', (e) => {
|
source.addEventListener('input', (e) => {
|
||||||
term = e.target.value
|
term = e.target.value
|
||||||
contentIndex.search(term, {
|
contentIndex.search(term, [
|
||||||
limit: 15,
|
{
|
||||||
|
field: "content",
|
||||||
|
limit: 10,
|
||||||
suggest: true,
|
suggest: true,
|
||||||
}).then(searchResults => {
|
},
|
||||||
const resultIds = [...new Set(searchResults)]
|
{
|
||||||
const finalResults = resultIds.map(id => ({
|
field: "title",
|
||||||
url: id,
|
limit: 5,
|
||||||
title: scrapedContent[id].title,
|
}
|
||||||
content: scrapedContent[id].content
|
]).then(searchResults => {
|
||||||
}))
|
const titleIds = [...searchResults.filter(x => x.field === 'title')?.[0].result] ?? []
|
||||||
|
const contentIds = [...searchResults.filter(x => x.field === 'content')?.[0].result] ?? []
|
||||||
|
const allIds = [...titleIds, ...contentIds]
|
||||||
|
const finalResults = allIds.map(fetch)
|
||||||
|
|
||||||
// display
|
// display
|
||||||
if (finalResults.length === 0) {
|
if (finalResults.length === 0) {
|
||||||
|
|
Loading…
Reference in a new issue