Skip to content

Commit cfec51e

Browse files
committed
[ search ] fixing bug on first launch and race condition.
1 parent 50f65e4 commit cfec51e

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

lib/server-process.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,11 @@ module.exports = function (ssbConfig) {
154154
fs.writeFileSync(minisearchIndexPath, encodedIndex);
155155
fs.writeFileSync(minisearchControlPath, encodedControl);
156156

157+
enableSearch(miniSearch)
157158
return;
158159
} else {
159-
console.log(miniSearch.documentCount);
160160
miniSearch.add(m);
161+
console.log(miniSearch.documentCount);
161162
lastIndexedTimestamp = m.timestamp;
162163
}
163164
}),
@@ -176,10 +177,8 @@ module.exports = function (ssbConfig) {
176177

177178
electron.ipcRenderer.send("search-unavailable");
178179

179-
loadOrCreateMiniSearch().then(({ miniSearch }) => {
180-
loadMessagesIntoSearchIndex(miniSearch);
181-
182-
// handle searches
180+
const enableSearch = (miniSearch) => {
181+
// handle searches
183182
electron.ipcRenderer.removeAllListeners("search");
184183
electron.ipcRenderer.removeAllListeners("is-search-available");
185184
electron.ipcRenderer.on("is-search-available", (ev, terms) => {
@@ -193,5 +192,9 @@ module.exports = function (ssbConfig) {
193192
console.log(`result count: ${result.length}`);
194193
electron.ipcRenderer.send("search-results", result);
195194
});
195+
}
196+
197+
loadOrCreateMiniSearch().then(({ miniSearch, controlData, indexData }) => {
198+
loadMessagesIntoSearchIndex({miniSearch, controlData, indexData});
196199
});
197200
};

0 commit comments

Comments
 (0)