From f4f5540d08634adf267fb2c3d4e7913557bce0c1 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Thu, 24 Jul 2025 20:45:57 +0700 Subject: [PATCH] qs: use new qs import for search algorithms --- .../ii/modules/common/functions/Fuzzy.qml | 18 ++++++++++++++++++ .../ii/modules/common/functions/Levendist.qml | 18 ++++++++++++++++++ .../ii/modules/sidebarLeft/AiChat.qml | 3 +-- .../ii/modules/sidebarLeft/Anime.qml | 1 - .config/quickshell/ii/services/AppSearch.qml | 3 +-- .config/quickshell/ii/services/Cliphist.qml | 2 -- .config/quickshell/ii/services/Emojis.qml | 3 +-- 7 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 .config/quickshell/ii/modules/common/functions/Fuzzy.qml create mode 100644 .config/quickshell/ii/modules/common/functions/Levendist.qml diff --git a/.config/quickshell/ii/modules/common/functions/Fuzzy.qml b/.config/quickshell/ii/modules/common/functions/Fuzzy.qml new file mode 100644 index 000000000..7a132ada1 --- /dev/null +++ b/.config/quickshell/ii/modules/common/functions/Fuzzy.qml @@ -0,0 +1,18 @@ +pragma Singleton +import Quickshell +import "./fuzzysort.js" as FuzzySort + +/** + * Wrapper for FuzzySort to play nicely with Quickshell's imports + */ + +Singleton { + function go(...args) { + return FuzzySort.go(...args) + } + + function prepare(...args) { + return FuzzySort.prepare(...args) + } +} + diff --git a/.config/quickshell/ii/modules/common/functions/Levendist.qml b/.config/quickshell/ii/modules/common/functions/Levendist.qml new file mode 100644 index 000000000..a327c3c78 --- /dev/null +++ b/.config/quickshell/ii/modules/common/functions/Levendist.qml @@ -0,0 +1,18 @@ +pragma Singleton +import Quickshell +import "./levendist.js" as Levendist + +/** + * Wrapper for levendist.js to play nicely with Quickshell's imports + */ + +Singleton { + function computeScore(...args) { + return Levendist.computeScore(...args) + } + + function computeTextMatchScore(...args) { + return Levendist.computeTextMatchScore(...args) + } +} + diff --git a/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml b/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml index c75ee06a0..ddee1367d 100644 --- a/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml +++ b/.config/quickshell/ii/modules/sidebarLeft/AiChat.qml @@ -2,9 +2,8 @@ import qs import qs.services import qs.modules.common import qs.modules.common.widgets -import "./aiChat/" -import "root:/modules/common/functions/fuzzysort.js" as Fuzzy import qs.modules.common.functions +import "./aiChat/" import QtQuick import QtQuick.Controls import QtQuick.Layouts diff --git a/.config/quickshell/ii/modules/sidebarLeft/Anime.qml b/.config/quickshell/ii/modules/sidebarLeft/Anime.qml index 266a84320..572e775be 100644 --- a/.config/quickshell/ii/modules/sidebarLeft/Anime.qml +++ b/.config/quickshell/ii/modules/sidebarLeft/Anime.qml @@ -3,7 +3,6 @@ import qs.services import qs.modules.common import qs.modules.common.widgets import qs.modules.common.functions -import "root:/modules/common/functions/fuzzysort.js" as Fuzzy import "./anime/" import QtQuick import QtQuick.Controls diff --git a/.config/quickshell/ii/services/AppSearch.qml b/.config/quickshell/ii/services/AppSearch.qml index d6a7008db..44d09121c 100644 --- a/.config/quickshell/ii/services/AppSearch.qml +++ b/.config/quickshell/ii/services/AppSearch.qml @@ -1,8 +1,7 @@ pragma Singleton import qs.modules.common -import "root:/modules/common/functions/fuzzysort.js" as Fuzzy -import "root:/modules/common/functions/levendist.js" as Levendist +import qs.modules.common.functions import Quickshell /** diff --git a/.config/quickshell/ii/services/Cliphist.qml b/.config/quickshell/ii/services/Cliphist.qml index 0fe7ad71a..6e3f7a1f3 100644 --- a/.config/quickshell/ii/services/Cliphist.qml +++ b/.config/quickshell/ii/services/Cliphist.qml @@ -1,8 +1,6 @@ pragma Singleton pragma ComponentBehavior: Bound -import "root:/modules/common/functions/fuzzysort.js" as Fuzzy -import "root:/modules/common/functions/levendist.js" as Levendist import qs.modules.common import qs.modules.common.functions import QtQuick diff --git a/.config/quickshell/ii/services/Emojis.qml b/.config/quickshell/ii/services/Emojis.qml index 4220b0400..436401b1a 100644 --- a/.config/quickshell/ii/services/Emojis.qml +++ b/.config/quickshell/ii/services/Emojis.qml @@ -1,9 +1,8 @@ pragma Singleton pragma ComponentBehavior: Bound -import "root:/modules/common/functions/fuzzysort.js" as Fuzzy -import "root:/modules/common/functions/levendist.js" as Levendist import qs.modules.common +import qs.modules.common.functions import QtQuick import Quickshell import Quickshell.Io