PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-20 04:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed local autocompleter returning aliases even when tag is matched by prefix

Browse source 
Patch from @liamwhite
This commit is contained in:
KoloMl 2025-02-12 21:03:34 +04:00
parent 988ba6b019
commit 235d7ab362
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
assets/js/utils/local-autocompleter.ts
View file

@ -100,6 +100,13 @@ export class LocalAutocompleter {
return tagPointer;
}
/**
* Return whether the tag pointed to by the reference index is an alias.
*/
private tagReferenceIsAlias(i: TagReferenceIndex): boolean {
return this.view.getInt32(this.referenceStart + i * 8 + 4, true) < 0;
}
/**
* Get the images count for the given reference index.
*/
@ -173,6 +180,7 @@ export class LocalAutocompleter {
getResult: (i: number) => TagReferenceIndex,
compare: (result: TagReferenceIndex) => number,
hasFilteredAssociation: (result: TagReferenceIndex) => boolean,
isAlias: (result: TagReferenceIndex) => boolean,
results: UniqueHeap<TagReferenceIndex>,
) {
const filter = !store.get('unfilter_tag_suggestions');
@ -207,7 +215,7 @@ export class LocalAutocompleter {
}
// Nothing was filtered, so add
results.append(referenceIndex);
results.append(referenceIndex, !isAlias(referenceIndex));
}
}
@ -230,18 +238,19 @@ export class LocalAutocompleter {
// Set up filter context
const hiddenTags = new Set(window.booru.hiddenTagList);
const hasFilteredAssociation = this.isFilteredByReference.bind(this, hiddenTags);
const isAlias = this.tagReferenceIsAlias.bind(this);
// Find tags ordered by full name
const prefixMatch = (i: TagReferenceIndex) =>
strcmp(this.referenceToName(i, false).slice(0, prefix.length), prefix);
const referenceToNameIndex = (i: number) => i;
this.scanResults(referenceToNameIndex, prefixMatch, hasFilteredAssociation, results);
this.scanResults(referenceToNameIndex, prefixMatch, hasFilteredAssociation, isAlias, results);
// Find tags ordered by name in namespace
const namespaceMatch = (i: TagReferenceIndex) =>
strcmp(nameInNamespace(this.referenceToName(i, false)).slice(0, prefix.length), prefix);
const referenceToAliasIndex = this.getSecondaryResultAt.bind(this);
this.scanResults(referenceToAliasIndex, namespaceMatch, hasFilteredAssociation, results);
this.scanResults(referenceToAliasIndex, namespaceMatch, hasFilteredAssociation, isAlias, results);
// Convert top K from heap into result array
return results.topK(k).map((i: TagReferenceIndex) => ({

18
assets/js/utils/unique-heap.ts
View file

@ -1,28 +1,34 @@
export type Compare<T> = (a: T, b: T) => number;
export type Unique<T> = (a: T) => unknown;
export type Collection<T> = { [index: number]: T; length: number };
export type Collection<T> = {
[index: number]: T;
length: number;
};
export class UniqueHeap<T> {
private keys: Set<unknown>;
private keys: Map<unknown, number>;
private values: Collection<T>;
private length: number;
private compare: Compare<T>;
private unique: Unique<T>;
constructor(compare: Compare<T>, unique: Unique<T>, values: Collection<T>) {
this.keys = new Set();
this.keys = new Map();
this.values = values;
this.length = 0;
this.compare = compare;
this.unique = unique;
}
append(value: T) {
append(value: T, forceReplace: boolean = false) {
const key = this.unique(value);
const prevIndex = this.keys.get(key);
if (!this.keys.has(key)) {
this.keys.add(key);
if (prevIndex === undefined) {
this.keys.set(key, this.length);
this.values[this.length++] = value;
} else if (forceReplace) {
this.values[prevIndex] = value;
}
}