DominikDoom/a1111-sd-webui-tagcomplete
1
0
Fork 0
mirror of https://github.com/DominikDoom/a1111-sd-webui-tagcomplete.git synced 2026-01-26 11:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use μFuzzy instead as it is faster and more configurable

Browse Source
This commit is contained in:
DominikDoom
2024-04-21 17:58:14 +02:00
parent a8f175925f
commit fa4a3bc036
4 changed files with 150 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/_fuzzysort.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
javascript/_result.js
View File

@@ -30,6 +30,7 @@ class AutocompleteResult {
meta = null;
hash = null;
sortKey = null;
highlightedText = null;
// Constructor
constructor(text, type) {

134
javascript/_uFuzzy.js Normal file
View File

File diff suppressed because one or more lines are too long

28
javascript/tagAutocomplete.js
View File

@@ -713,7 +713,9 @@ function addResultsToList(textArea, results, tagword, resetList) {
displayText += `[${translations.get(result.text)}]`;
// Print search term bolded in result
itemText.innerHTML = displayText.replace(tagword, `<b>${tagword}</b>`);
//itemText.innerHTML = displayText.replace(tagword, `<b>${tagword}</b>`);
itemText.innerHTML = result.highlightedText || displayText.replace(new RegExp(escapeRegExp(tagword), "ig"), "<mark>$&</mark>");
//itemText.innerHTML = displayText.replace(/&lt;mark&gt;(.*)&lt;\/mark&gt;/g, "<mark>$1</mark>")
const splitTypes = [ResultType.wildcardFile, ResultType.yamlWildcard]
if (splitTypes.includes(result.type) && itemText.innerHTML.includes("/")) {
@@ -1152,19 +1154,19 @@ async function autocomplete(textArea, prompt, fixedTag = null) {
results = results.concat(extraResults);
}
}*/
let mappedAllTags = allTags.map(t => {
return {text: t[0], cat: t[1], count: t[2], aliases: t[3]};
});
const fuzResult = fuzzysort.go(tagword, mappedAllTags, {
key: 'text'
})
fuzResult.forEach(r => {
let result = new AutocompleteResult(r.target.trim(), ResultType.tag)
result.category = r.obj["cat"];
result.count = r.obj["count"];
result.aliases = r.obj["aliases"];
const fuzResult = TacFuzzy.search(allTags.map(t => t[0]), tagword)
for (let i = 0; i < fuzResult.haystackIndices.length; i++) {
const idx = fuzResult.haystackIndices[i];
const orderIdx = fuzResult.orderIndices[i];
const tag = allTags[idx];
let result = new AutocompleteResult(tag[0], ResultType.tag)
result.highlightedText = TacFuzzy.toStr(orderIdx)
result.category = tag[1];
result.count = tag[2];
result.aliases = tag[3];
results.push(result);
});
}
}
// Guard for empty results