[python] Interface 2.5

python/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 find_package(Albert REQUIRED)
 
-project(python VERSION 4.11)
+project(python VERSION 4.12)
 
 set(PYBIND11_FINDPYTHON ON)
 #find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)

python/albert.pyi

@@ -1,5 +1,5 @@
 """
-# Albert Python interface v2.4
+# Albert Python interface v2.5
 
 
 The Python interface is a subset of the internal C++ interface exposed to Python with some minor adjustments. A Python
@@ -78,6 +78,12 @@ Changes in 2.4:
 - Deprecate parameter `workdir` of runTerminal. Prepend `cd <workdir>;` to your script.
 - Deprecate parameter `close_on_exit` of runTerminal. Append `exec $SHELL;` to your script.
 
+Changes in 2.5:
+- Matcher now not considered experimental anymore.
+- Add `Matcher.match(strings: List[str])`.
+- Add `Matcher.match(*args: str)`.
+
+
 ## List of things 3.0 will break
 
 - Drop PluginInstance.initialize. Use PluginInstance.__init__(…).
@@ -376,6 +382,12 @@ class FallbackHandler(Extension):
 class Query():
     """https://albertlauncher.github.io/reference/classalbert_1_1Query.html"""
 
+    def __str__(self) -> str:
+        """
+        Returns the query string.
+        Since 2.5
+        """
+
     @property
     def trigger(self) -> str:
         ...
@@ -550,12 +562,16 @@ class Matcher:
         ...
 
     @overload
-    def match(self, item: Item) -> Match:
+    def match(self, string: str) -> Match:
         """Since 2.3"""
 
     @overload
-    def match(self, string: str) -> Match:
-        """Since 2.3"""
+    def match(self, strings: List[str]) -> Match:
+        """Since 2.5"""
+
+    @overload
+    def match(self, *args: str) -> Match:
+        """Since 2.5"""
 
 
 def debug(arg: Any):

python/src/embeddedmodule.hpp

@@ -146,8 +146,9 @@ PYBIND11_EMBEDDED_MODULE(albert, m)
 
     py::class_<Matcher>(m, "Matcher")
         .def(py::init<const QString&>())
-        .def("match", static_cast<Match(Matcher::*)(const Item&) const>(&Matcher::match))
         .def("match", static_cast<Match(Matcher::*)(const QString&) const>(&Matcher::match))
+        .def("match", static_cast<Match(Matcher::*)(const QStringList&) const>(&Matcher::match))
+        .def("match", [](Matcher *self, py::args args){ return self->match(py::cast<QStringList>(args)); });
         ;
 
     // ------------------------------------------------------------------------

python/src/pypluginloader.h

@@ -27,7 +27,7 @@ class PyPluginLoader : public albert::PluginLoader
 public:
 
     static const int MAJOR_INTERFACE_VERSION = 2;
-    static const int MINOR_INTERFACE_VERSION = 4;
+    static const int MINOR_INTERFACE_VERSION = 5;
 
     PyPluginLoader(Plugin &plugin, const QString &module_path);
     ~PyPluginLoader();