From 8a0e2e4241a74e14d3a992ecbc9f5050fc3f04d5 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Wed, 2 Sep 2026 19:39:04 +0800 Subject: fix: qmlfmt --- .github/workflows/ci.yml | 4 +- popups/launcher/components/Finder.qml | 0 popups/launcher/components/Flight.qml | 0 popups/launcher/components/Time.qml | 0 popups/launcher/components/Translate.qml | 0 popups/launcher/components/Weather.qml | 0 popups/launcher/components/Web.qml | 0 utils/Directories.qml | 66 ++++++++++++++++---------------- 8 files changed, 36 insertions(+), 34 deletions(-) delete mode 100644 popups/launcher/components/Finder.qml delete mode 100644 popups/launcher/components/Flight.qml delete mode 100644 popups/launcher/components/Time.qml delete mode 100644 popups/launcher/components/Translate.qml delete mode 100644 popups/launcher/components/Weather.qml delete mode 100644 popups/launcher/components/Web.qml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fe2990..682574a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -170,7 +170,9 @@ jobs: prettier --check "utils/**/*.js" - name: Check QML/JS Format - run: find . \( -name "*.qml" -o -name "*.js" \) -exec /usr/lib/qt6/bin/qmlformat {} + + env: + QT_LOGGING_RULES: qt.qmldom*=false + run: find . \( -name "*.qml" \) -exec /usr/lib/qt6/bin/qmlformat {} + - name: Lint Shell run: shellcheck utils/*.sh diff --git a/popups/launcher/components/Finder.qml b/popups/launcher/components/Finder.qml deleted file mode 100644 index e69de29..0000000 diff --git a/popups/launcher/components/Flight.qml b/popups/launcher/components/Flight.qml deleted file mode 100644 index e69de29..0000000 diff --git a/popups/launcher/components/Time.qml b/popups/launcher/components/Time.qml deleted file mode 100644 index e69de29..0000000 diff --git a/popups/launcher/components/Translate.qml b/popups/launcher/components/Translate.qml deleted file mode 100644 index e69de29..0000000 diff --git a/popups/launcher/components/Weather.qml b/popups/launcher/components/Weather.qml deleted file mode 100644 index e69de29..0000000 diff --git a/popups/launcher/components/Web.qml b/popups/launcher/components/Web.qml deleted file mode 100644 index e69de29..0000000 diff --git a/utils/Directories.qml b/utils/Directories.qml index f643a78..b71277c 100644 --- a/utils/Directories.qml +++ b/utils/Directories.qml @@ -7,54 +7,54 @@ import Quickshell import Quickshell.Hyprland Singleton { - /** + /** * Trims the File protocol off the input string * @param {string} str * @returns {string} */ - function trimFileProtocol(str) { - return str.startsWith("file://") ? str.slice(7) : str; - } + function trimFileProtocol(str) { + return str.startsWith("file://") ? str.slice(7) : str; + } - /** + /** * Extracts the file name from a file path * @param {string} str * @returns {string} */ - function fileNameForPath(str) { - if (typeof str !== "string") - return ""; - const trimmed = trimFileProtocol(str); - return trimmed.split(/[\\/]/).pop(); - } + function fileNameForPath(str) { + if (typeof str !== "string") + return ""; + const trimmed = trimFileProtocol(str); + return trimmed.split(/[\\/]/).pop(); + } - /** + /** * Removes the file extension from a file path or name * @param {string} str * @returns {string} */ - function trimFileExt(str) { - if (typeof str !== "string") - return ""; - const trimmed = trimFileProtocol(str); - const lastDot = trimmed.lastIndexOf("."); - if (lastDot > -1 && lastDot > trimmed.lastIndexOf("/")) { - return trimmed.slice(0, lastDot); - } - return trimmed; - } + function trimFileExt(str) { + if (typeof str !== "string") + return ""; + const trimmed = trimFileProtocol(str); + const lastDot = trimmed.lastIndexOf("."); + if (lastDot > -1 && lastDot > trimmed.lastIndexOf("/")) { + return trimmed.slice(0, lastDot); + } + return trimmed; + } - // XDG Dirs, with "file://" - readonly property string config: StandardPaths.standardLocations(StandardPaths.ConfigLocation)[0] - readonly property string state: StandardPaths.standardLocations(StandardPaths.StateLocation)[0] - readonly property string cache: StandardPaths.standardLocations(StandardPaths.CacheLocation)[0] - readonly property string pictures: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] - readonly property string downloads: StandardPaths.standardLocations(StandardPaths.DownloadLocation)[0] + // XDG Dirs, with "file://" + readonly property string config: StandardPaths.standardLocations(StandardPaths.ConfigLocation)[0] + readonly property string state: StandardPaths.standardLocations(StandardPaths.StateLocation)[0] + readonly property string cache: StandardPaths.standardLocations(StandardPaths.CacheLocation)[0] + readonly property string pictures: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0] + readonly property string downloads: StandardPaths.standardLocations(StandardPaths.DownloadLocation)[0] - property string clipHistMetaDataPath: `${state}/cliphist.json` + property string clipHistMetaDataPath: `${state}/cliphist.json` - // Cleanup on init - Component.onCompleted: { - Quickshell.execDetached(["touch", trimFileProtocol(clipHistMetaDataPath)]); - } + // Cleanup on init + Component.onCompleted: { + Quickshell.execDetached(["touch", trimFileProtocol(clipHistMetaDataPath)]); + } } -- cgit v1.2.3