r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better search for emoji helper

Browse Source
This commit is contained in:
Eduard Kuzmenko 2021-06-19 03:46:41 +03:00
parent 58163aa2ad
commit ccc6d2c6ef
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/appManagers/appEmojiManager.ts
View File

@ -164,7 +164,7 @@ export class AppEmojiManager {
public indexEmojis() { public indexEmojis() {
if(!this.index) { if(!this.index) {
this.index = new SearchIndex(false, false); this.index = new SearchIndex(false, false, 2);
} }
for(const langCode in this.keywordLangPacks) { for(const langCode in this.keywordLangPacks) {

15
src/lib/searchIndex.ts
View File

@ -14,7 +14,7 @@ import cleanSearchText from '../helpers/cleanSearchText';
export default class SearchIndex<SearchWhat> { export default class SearchIndex<SearchWhat> {
private fullTexts: Map<SearchWhat, string> = new Map(); private fullTexts: Map<SearchWhat, string> = new Map();
constructor(private cleanText = true, private latinize = true) { constructor(private cleanText = true, private latinize = true, private minChars: number = 1) {
} }
@ -57,11 +57,12 @@ export default class SearchIndex<SearchWhat> {
query = cleanSearchText(query, this.latinize); query = cleanSearchText(query, this.latinize);
} }
const newFoundObjs: Array<{fullText: string, what: SearchWhat}> = []; const newFoundObjs: Array<{fullText: string, fullTextLength: number, what: SearchWhat, foundChars: number}> = [];
const queryWords = query.split(' '); const queryWords = query.split(' ');
const queryWordsLength = queryWords.length; const queryWordsLength = queryWords.length;
fullTexts.forEach((fullText, what) => { fullTexts.forEach((fullText, what) => {
let found = true; let found = true;
let foundChars = 0;
for(let i = 0; i < queryWordsLength; ++i) { // * verify that all words are found for(let i = 0; i < queryWordsLength; ++i) { // * verify that all words are found
const word = queryWords[i]; const word = queryWords[i];
const idx = fullText.indexOf(word); const idx = fullText.indexOf(word);
@ -69,13 +70,21 @@ export default class SearchIndex<SearchWhat> {
found = false; found = false;
break; break;
} }
foundChars += word.length;
} }
if(found) { if(found) {
newFoundObjs.push({fullText, what}); foundChars += queryWordsLength - 1;
const fullTextLength = fullText.length;
if(this.minChars <= foundChars || fullTextLength <= foundChars) {
newFoundObjs.push({fullText, fullTextLength, what, foundChars});
}
} }
}); });
newFoundObjs.sort((a, b) => a.fullTextLength - b.fullTextLength || b.foundChars - a.foundChars);
//newFoundObjs.sort((a, b) => a.fullText.localeCompare(b.fullText)); //newFoundObjs.sort((a, b) => a.fullText.localeCompare(b.fullText));
const newFoundObjs2: Set<SearchWhat> = new Set(newFoundObjs.map(o => o.what)); const newFoundObjs2: Set<SearchWhat> = new Set(newFoundObjs.map(o => o.what));