mirror of
https://github.com/BetterSEQTA/BetterSEQTA-Plus.git
synced 2026-06-06 03:34:40 +00:00
feat: upgrade to flexsearch for better keyword search performance
This commit is contained in:
@@ -81,7 +81,6 @@
|
|||||||
"embla-carousel-autoplay": "^8.5.2",
|
"embla-carousel-autoplay": "^8.5.2",
|
||||||
"embla-carousel-svelte": "^8.5.2",
|
"embla-carousel-svelte": "^8.5.2",
|
||||||
"flexsearch": "^0.8.147",
|
"flexsearch": "^0.8.147",
|
||||||
"fuse.js": "^7.1.0",
|
|
||||||
"idb": "^8.0.2",
|
"idb": "^8.0.2",
|
||||||
"localforage": "^1.10.0",
|
"localforage": "^1.10.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { hasEnoughStorageSpace, isIndexedDBSupported, writeData, openDatabase, readAllData, deleteData } from '@/interface/hooks/BackgroundDataLoader';
|
import { hasEnoughStorageSpace, isIndexedDBSupported, writeData, openDatabase, readAllData, deleteData } from '@/interface/hooks/BackgroundDataLoader';
|
||||||
import Spinner from '../Spinner.svelte';
|
import Spinner from '../Spinner.svelte';
|
||||||
import { settingsState } from '@/seqta/utils/listeners/SettingsState'
|
import { settingsState } from '@/seqta/utils/listeners/SettingsState'
|
||||||
import Fuse from 'fuse.js';
|
import { Index } from 'flexsearch';
|
||||||
import { backgroundUpdates } from '@/interface/hooks/BackgroundUpdates'
|
import { backgroundUpdates } from '@/interface/hooks/BackgroundUpdates'
|
||||||
import { ThemeManager } from '@/plugins/built-in/themes/theme-manager'
|
import { ThemeManager } from '@/plugins/built-in/themes/theme-manager'
|
||||||
|
|
||||||
@@ -20,19 +20,12 @@
|
|||||||
let savedBackgrounds = $state<string[]>([]);
|
let savedBackgrounds = $state<string[]>([]);
|
||||||
let installingBackgrounds = $state<Set<string>>(new Set());
|
let installingBackgrounds = $state<Set<string>>(new Set());
|
||||||
let debugInfo = $state<string>('');
|
let debugInfo = $state<string>('');
|
||||||
|
let searchIndex = $state<Index | null>(null);
|
||||||
|
|
||||||
// New state variables
|
// New state variables
|
||||||
let activeTab = $state<'all' | 'installed' | 'photos' | 'videos'>('all');
|
let activeTab = $state<'all' | 'installed' | 'photos' | 'videos'>('all');
|
||||||
let sortBy = $state<'newest' | 'popular' | 'name'>('newest');
|
let sortBy = $state<'newest' | 'popular' | 'name'>('newest');
|
||||||
|
|
||||||
// Add Fuse.js options
|
|
||||||
const fuseOptions = {
|
|
||||||
keys: ['name', 'description'],
|
|
||||||
threshold: 0.4,
|
|
||||||
ignoreLocation: true
|
|
||||||
};
|
|
||||||
let fuse: Fuse<Background>;
|
|
||||||
|
|
||||||
// Existing functions
|
// Existing functions
|
||||||
const loadStore = async () => {
|
const loadStore = async () => {
|
||||||
try {
|
try {
|
||||||
@@ -43,7 +36,19 @@
|
|||||||
}
|
}
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
backgrounds = data.backgrounds;
|
backgrounds = data.backgrounds;
|
||||||
fuse = new Fuse(backgrounds, fuseOptions);
|
|
||||||
|
// Initialize FlexSearch index
|
||||||
|
const index = new Index({
|
||||||
|
tokenize: "forward",
|
||||||
|
preset: "score"
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add backgrounds to the index
|
||||||
|
backgrounds.forEach((bg, i) => {
|
||||||
|
index.add(i, bg.name + " " + bg.description);
|
||||||
|
});
|
||||||
|
|
||||||
|
searchIndex = index;
|
||||||
debugInfo = `Loaded ${backgrounds.length} backgrounds`;
|
debugInfo = `Loaded ${backgrounds.length} backgrounds`;
|
||||||
await loadSavedBackgrounds();
|
await loadSavedBackgrounds();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -74,14 +79,10 @@
|
|||||||
let filteredBackgrounds = $derived((() => {
|
let filteredBackgrounds = $derived((() => {
|
||||||
let filtered = backgrounds;
|
let filtered = backgrounds;
|
||||||
|
|
||||||
// Use Fuse.js search if there's a search term
|
// Use FlexSearch if there's a search term
|
||||||
if (searchTerm.trim()) {
|
if (searchTerm.trim() && searchIndex) {
|
||||||
// @ts-ignore
|
const results = searchIndex.search(searchTerm) as number[];
|
||||||
if (fuse) {
|
filtered = results.map(i => backgrounds[i]);
|
||||||
filtered = fuse.search(searchTerm).map((result: any) => result.item) ?? [];
|
|
||||||
} else {
|
|
||||||
filtered = backgrounds.filter(bg => bg.name.toLowerCase().includes(searchTerm.toLowerCase()));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply category filtering
|
// Apply category filtering
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount, tick } from 'svelte';
|
import { onMount, tick } from 'svelte';
|
||||||
import Fuse from 'fuse.js';
|
import { Index } from 'flexsearch';
|
||||||
import { settingsState } from '@/seqta/utils/listeners/SettingsState'
|
import { settingsState } from '@/seqta/utils/listeners/SettingsState'
|
||||||
import { fade, scale } from 'svelte/transition';
|
import { fade, scale } from 'svelte/transition';
|
||||||
import { quintOut } from 'svelte/easing';
|
import { quintOut } from 'svelte/easing';
|
||||||
@@ -62,15 +62,22 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
const fuse = new Fuse(commandItems, {
|
// Create a FlexSearch index
|
||||||
includeScore: true,
|
const searchIndex = new Index({
|
||||||
keys: ['text', 'keybind']
|
tokenize: "forward",
|
||||||
|
preset: "score"
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add command items to the index
|
||||||
|
commandItems.forEach((item, i) => {
|
||||||
|
searchIndex.add(i, item.text + " " + item.keybind.join(" "));
|
||||||
});
|
});
|
||||||
|
|
||||||
// Replace reactive block with $effect
|
// Replace reactive block with $effect
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (searchTerm.trim()) {
|
if (searchTerm.trim()) {
|
||||||
filteredItems = fuse.search(searchTerm).map(r => r.item);
|
const results = searchIndex.search(searchTerm) as number[];
|
||||||
|
filteredItems = results.map(i => commandItems[i]);
|
||||||
} else {
|
} else {
|
||||||
filteredItems = commandItems;
|
filteredItems = commandItems;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user