[copyq] v3

Author: ManuelSchneid3r

copyq/__init__.py

@@ -7,8 +7,8 @@
 
 from albert import *
 
-md_iid = '2.3'
-md_version = "1.6"
+md_iid = "3.0"
+md_version = "2.0"
 md_name = "CopyQ"
 md_description = "Access CopyQ clipboard"
 md_license = "BSD-2-Clause"
@@ -51,16 +51,14 @@ class Plugin(PluginInstance, TriggerQueryHandler):
 
     def __init__(self):
         PluginInstance.__init__(self)
-        TriggerQueryHandler.__init__(
-            self, self.id, self.name, self.description,
-            defaultTrigger='cp '
-        )
+        TriggerQueryHandler.__init__(self)
+
+    def defaultTrigger(self):
+        return "cp "
 
     def handleTriggerQuery(self, query):
         items = []
-        q_string = query.string
-
-        script = copyq_script_getMatches % q_string if q_string else copyq_script_getAll
+        script = copyq_script_getMatches % query.string if query.string else copyq_script_getAll
         proc = subprocess.run(["copyq", "-"], input=script.encode(), stdout=subprocess.PIPE)
         json_arr = json.loads(proc.stdout.decode())
 
@@ -72,12 +70,12 @@ def handleTriggerQuery(self, query):
             else:
                 text = " ".join(filter(None, text.replace("\n", " ").split(" ")))
 
-            act = lambda script, row=row: (
-                lambda: runDetachedProcess(["copyq", script % row])
+            act = lambda s=script, r=row: (
+                lambda: runDetachedProcess(["copyq", s % r])
             )
             items.append(
                 StandardItem(
-                    id=self.id,
+                    id=self.id(),
                     iconUrls=["xdg:copyq"],
                     text=text,
                     subtext="%s: %s" % (row, ", ".join(json_obj["mimetypes"])),