[py] Mute "not a plugin warnings"

albertlauncher · Aug 14, 2023 · bf8e7d4 · bf8e7d4
1 parent 5a2a2fb
commit bf8e7d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/python/src/plugin.cpp b/python/src/plugin.cpp
@@ -51,10 +51,12 @@ Plugin::Plugin()
     for (const QString &plugin_dir : plugin_dirs) {
         if (QDir dir{plugin_dir}; dir.cd(PLUGIN_DIR)) {
             DEBG << "Searching Python plugins in" << dir.absolutePath();
-            for (const QFileInfo &file_info : dir.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoDotAndDotDot)) {
+            for (const QFileInfo &file_info : dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot)) {
                 try {
                     auto &loader = plugins_.emplace_back(make_unique<PyPluginLoader>(*this, file_info));
                     DEBG << "Found valid Python plugin" << loader->path;
+                } catch (const NoPluginException &) {
+                    continue;
                 } catch (const exception &e) {
                     WARN << e.what() << file_info.filePath();
                 }

diff --git a/python/src/pypluginloader.cpp b/python/src/pypluginloader.cpp
@@ -142,7 +142,7 @@ PyPluginLoader::PyPluginLoader(Plugin &provider, const QFileInfo &file_info)
     // Validate metadata
 
     if (metadata_.iid.isEmpty())
-        throw runtime_error("Not an albert plugin");
+        throw NoPluginException();
 
 
     QStringList errors;

diff --git a/python/src/pypluginloader.h b/python/src/pypluginloader.h
@@ -13,6 +13,8 @@ class PluginInstance;
 class QFileInfo;
 class Plugin;
 
+class NoPluginException: public std::exception {};
+
 class PyPluginLoader : public albert::PluginLoader
 {
 public: