[arch_wiki] Interface v2.0

Author: ManuelSchneid3r

arch_wiki/__init__.py

@@ -1,49 +1,44 @@
 # -*- coding: utf-8 -*-
-#  Copyright (c) 2022-2023 Manuel Schneider
 
-from albert import *
+import json
+from pathlib import Path
 from time import sleep
 from urllib import request, parse
-import json
-import os
 
-md_iid = '1.0'
-md_version = "1.3"
+from albert import *
+
+md_iid = '2.0'
+md_version = "1.4"
 md_name = "ArchLinux Wiki"
 md_description = "Search ArchLinux Wiki articles"
 md_license = "BSD-3"
 md_url = "https://github.com/albertlauncher/python/tree/master/awiki"
-md_maintainers = "@manuelschneid3r"
 
 
-class Plugin(TriggerQueryHandler):
+class Plugin(PluginInstance, TriggerQueryHandler):
 
-    icon = [os.path.dirname(__file__) + "/ArchWiki.svg"]
     baseurl = 'https://wiki.archlinux.org/api.php'
     search_url = "https://wiki.archlinux.org/index.php?search=%s"
     user_agent = "org.albert.extension.python.archwiki"
 
-    def id(self):
-        return md_id
-
-    def name(self):
-        return md_name
-
-    def description(self):
-        return md_description
-
-    def defaultTrigger(self):
-        return "awiki "
+    def __init__(self):
+        TriggerQueryHandler.__init__(self,
+                                     id=md_id,
+                                     name=md_name,
+                                     description=md_description,
+                                     defaultTrigger='awiki ')
+        PluginInstance.__init__(self, extensions=[self])
+        self.iconUrls = [f"file:{Path(__file__).parent}/arch.svg"]
 
     def handleTriggerQuery(self, query):
         stripped = query.string.strip()
         if stripped:
 
             # avoid rate limiting
-            for number in range(50):
+            for _ in range(50):
                 sleep(0.01)
                 if not query.isValid:
-                    return;
+                    return
 
             results = []
 
@@ -65,25 +60,25 @@ def handleTriggerQuery(self, query):
                     summary = data[2][i]
                     url = data[3][i]
 
-                    results.append(Item(id=md_id,
-                                        text=title,
-                                        subtext=summary if summary else url,
-                                        icon=self.icon,
-                                        actions=[
-                                            Action("open", "Open article", lambda u=url: openUrl(u)),
-                                            Action("copy", "Copy URL", lambda u=url: setClipboardText(u))
-                                        ]))
+                    results.append(StandardItem(id=md_id,
+                                                text=title,
+                                                subtext=summary if summary else url,
+                                                iconUrls=self.iconUrls,
+                                                actions=[
+                                                    Action("open", "Open article", lambda u=url: openUrl(u)),
+                                                    Action("copy", "Copy URL", lambda u=url: setClipboardText(u))
+                                                ]))
             if results:
                 query.add(results)
             else:
-                query.add(Item(id=md_id,
-                               text="Search '%s'" % query.string,
-                               subtext="No results. Start online search on Arch Wiki",
-                               icon=self.icon,
-                               actions=[Action("search", "Open search", lambda s=query.string: self.search_url % s)]))
+                query.add(StandardItem(id=md_id,
+                                       text="Search '%s'" % query.string,
+                                       subtext="No results. Start online search on Arch Wiki",
+                                       iconUrls=self.iconUrls,
+                                       actions=[Action("search", "Open search", lambda s=query.string: self.search_url % s)]))
 
         else:
-            query.add(Item(id=md_id,
-                           text=md_name,
-                           icon=self.icon,
-                           subtext="Enter a query to search on the Arch Wiki"))
+            query.add(StandardItem(id=md_id,
+                                   text=md_name,
+                                   iconUrls=self.iconUrls,
+                                   subtext="Enter a query to search on the Arch Wiki"))