Skip to content

de-duplicate the search index #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

de-duplicate the search index #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/renderer/html_handlebars/search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
}

if search_config.copy_js {
utils::fs::write_file(destination, "searchindex.json", index.as_bytes())?;
utils::fs::write_file(
destination,
"searchindex.js",
Expand Down
14 changes: 11 additions & 3 deletions src/theme/searcher/searcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,9 +468,17 @@ window.search = window.search || {};
showResults(true);
}

fetch(path_to_root + 'searchindex.json')
.then(response => response.json())
.then(json => init(json))
fetch(path_to_root + 'searchindex.js')
Copy link
Member

@GuillaumeGomez GuillaumeGomez Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why keeping this part of the code instead of just using the content from the .catch() call? There is no point in parsing JS.

.then(response => response.text())
.then(text => {
const jsonMatch = text.match(/Object\.assign\(window\.search,\s*(\{[\s\S]*\})\s*\)/);
if (jsonMatch && jsonMatch[1]) {
return JSON.parse(jsonMatch[1]);
} else {
throw new Error('Unable to extract JSON from the script');
}
})
.then(json => init(json))
.catch(error => { // Try to load searchindex.js if fetch failed
var script = document.createElement('script');
script.src = path_to_root + 'searchindex.js';
Expand Down