[python_eval] Interface v2.0

ManuelSchneid3r · ManuelSchneid3r · commit b13835e4cd8f · 2023-08-05T10:11:02.000+02:00
diff --git a/python_eval/__init__.py b/python_eval/__init__.py
@@ -1,39 +1,30 @@
 # -*- coding: utf-8 -*-
-#  Copyright (c) 2022-2023 Manuel Schneider
 
-from albert import *
 from builtins import pow
 from math import *
-import os
+from pathlib import Path
+
+from albert import *
 
-md_iid = '1.0'
-md_version = "1.4"
+md_iid = '2.0'
+md_version = "1.5"
 md_name = "Python Eval"
 md_description = "Evaluate Python code"
 md_license = "BSD-3"
 md_url = "https://github.com/albertlauncher/python/tree/master/python_eval"
-md_maintainers = "@manuelschneid3r"
-
-
-class Plugin(TriggerQueryHandler):
-
-    def id(self):
-        return md_id
-
-    def name(self):
-        return md_name
-
-    def description(self):
-        return md_description
 
-    def defaultTrigger(self):
-        return "py "
 
-    def synopsis(self):
-        return "<Python expression>"
+class Plugin(PluginInstance, TriggerQueryHandler):
 
-    def initialize(self):
-        self.iconPath = os.path.dirname(__file__)+"/python.svg"
+    def __init__(self):
+        TriggerQueryHandler.__init__(self,
+                                     id=md_id,
+                                     name=md_name,
+                                     description=md_description,
+                                     synopsis='<Python expression>',
+                                     defaultTrigger='py ')
+        PluginInstance.__init__(self, extensions=[self])
+        self.iconUrls = [f"file:{Path(__file__).parent}/python.svg"]
 
     def handleTriggerQuery(self, query):
         stripped = query.string.strip()
@@ -45,12 +36,12 @@ def handleTriggerQuery(self, query):
 
             result_str = str(result)
 
-            query.add(Item(
+            query.add(StandardItem(
                 id=md_id,
                 text=result_str,
                 subtext=type(result).__name__,
-                completion=query.trigger + result_str,
-                icon=[self.iconPath],
+                inputActionText=query.trigger + result_str,
+                iconUrls=self.iconUrls,
                 actions = [
                     Action("copy", "Copy result to clipboard", lambda r=result_str: setClipboardText(r)),
                     Action("exec", "Execute python code", lambda r=result_str: exec(stripped)),
