[wikipedia] v3.0

Author: ManuelSchneid3r

wikipedia/__init__.py

@@ -10,15 +10,14 @@
 import json
 from pathlib import Path
 
-md_iid = '2.3'
-md_version = "2.0"
+md_iid = "3.0"
+md_version = "3.0"
 md_name = "Wikipedia"
 md_description = "Search Wikipedia articles"
 md_license = "MIT"
 md_url = "https://github.com/albertlauncher/python/tree/main/wikipedia"
 md_authors = "@manuelschneid3r"
 
-
 class Plugin(PluginInstance, TriggerQueryHandler):
 
     baseurl = 'https://en.wikipedia.org/w/api.php'
@@ -29,10 +28,9 @@ class Plugin(PluginInstance, TriggerQueryHandler):
 
     def __init__(self):
         PluginInstance.__init__(self)
-        TriggerQueryHandler.__init__(
-            self, self.id, self.name, self.description,
-            defaultTrigger='wiki ', supportsFuzzyMatching=True
-        )
+        TriggerQueryHandler.__init__(self)
+
+        self.fbh = FBH(self)
         self.fuzzy = False
 
         self.local_lang_code = getdefaultlocale()[0]
@@ -42,9 +40,6 @@ def __init__(self):
             self.local_lang_code = 'en'
             warning("Failed getting language code. Using 'en'.")
 
-        self.fbh = FBH(self)
-        self.registerExtension(self.fbh)
-
         params = {
             'action': 'query',
             'meta': 'siteinfo',
@@ -66,8 +61,14 @@ def __init__(self):
         except Exception as error:
             warning('Error getting languages (%s). Defaulting to EN.' % error)
 
-    def __del__(self):
-        self.deregisterExtension(self.fbh)
+    def extensions(self):
+        return [self, self.fbh]
+
+    def defaultTrigger(self):
+        return "wiki "
+
+    def supportsFuzzyMatching(self):
+        return True
 
     def setFuzzyMatching(self, enabled: bool):
         self.fuzzy = enabled
@@ -103,7 +104,7 @@ def handleTriggerQuery(self, query):
                     url = data[3][i]
                     results.append(
                         StandardItem(
-                            id=self.id,
+                            id=self.id(),
                             text=title,
                             subtext=summary if summary else url,
                             iconUrls=self.iconUrls,
@@ -121,17 +122,17 @@ def handleTriggerQuery(self, query):
         else:
             query.add(
                 StandardItem(
-                    id=self.id,
-                    text=self.name,
+                    id=self.id(),
+                    text=self.name(),
                     subtext="Enter a query to search on Wikipedia",
                     iconUrls=self.iconUrls
                 )
             )
 
     def createFallbackItem(self, q: str) -> Item:
         return StandardItem(
-            id=self.id,
-            text=self.name,
+            id=self.id(),
+            text=self.name(),
             subtext="Search '%s' on Wikipedia" % q,
             iconUrls=self.iconUrls,
             actions=[
@@ -144,8 +145,17 @@ def createFallbackItem(self, q: str) -> Item:
 class FBH(FallbackHandler):
 
     def __init__(self, p: Plugin):
-        FallbackHandler.__init__(self, p.id + 'fb', p.name, p.description)
+        FallbackHandler.__init__(self)
         self.plugin = p
 
+    def id(self):
+        return "wikipedia.fallbacks"
+
+    def name(self):
+        return md_name
+
+    def description(self):
+        return md_description
+
     def fallbacks(self, q :str):
         return [self.plugin.createFallbackItem(q)]