From 6cc045476a95152975796c561645c4235aa8a9d0 Mon Sep 17 00:00:00 2001 From: SUPER Date: Tue, 10 Jun 2025 15:44:05 +0800 Subject: [PATCH] fix: pluginList filter --- SwiftBar/Plugin/PluginManger.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/SwiftBar/Plugin/PluginManger.swift b/SwiftBar/Plugin/PluginManger.swift index 78492d4..f786eb8 100644 --- a/SwiftBar/Plugin/PluginManger.swift +++ b/SwiftBar/Plugin/PluginManger.swift @@ -191,7 +191,13 @@ class PluginManager: ObservableObject { } if !dirs.isEmpty { - files.append(contentsOf: dirs.map { filter(url: $0) }.flatMap(\.files)) + for dir in dirs { + let (subFiles, _) = filter(url: dir) + let (filteredSubFiles, _) = ingoreFileContent.map { + filterFilesAndDirs(files: subFiles, dirs: [], ignoreContent: $0) + } ?? (subFiles, []) + files.append(contentsOf: filteredSubFiles) + } } return Array(Set(files)) }