🎨 🐛 ⬆️

- 🎨 add typing, add fstring to replace format
- 🐛 ⬆️ use `demjson` replace `json` to solve `json.decoder.JSONDecodeError: Expecting property name enclosed in double quotes: line 1 column 2 (char 1)` problem. `json` can't recognize `'`

Author: Zeroto521

flowlauncher/FlowLauncher.py

@@ -2,23 +2,25 @@
 
 
 import inspect
-import json
 import sys
 
+import demjson
+
 
 class FlowLauncher:
     """
     Flow.Launcher python plugin base
     """
 
     def __init__(self):
-        # TODO: try other way to get argv not using index
-        # with this, to test a plugin, it has to likes `python test.py {}`. Add `{}`.
-        # It is better with like this `python test.py`, when the input is empty.
-        rpc_request = json.loads(sys.argv[1])
+
+        rpc_request = {'method': 'query', 'parameters': ['']}
+        if len(sys.argv) > 1:
+            rpc_request = demjson.decode(sys.argv[1])
 
         # proxy is not working now
-        self.proxy = rpc_request.get("proxy", {})
+        # self.proxy = rpc_request.get("proxy", {})
+
         request_method_name = rpc_request.get("method", "query")
         request_parameters = rpc_request.get("parameters", [])
         methods = inspect.getmembers(self, predicate=inspect.ismethod)
@@ -27,23 +29,23 @@ def __init__(self):
         results = request_method(*request_parameters)
 
         if request_method_name in ["query", "context_menu"]:
-            print(json.dumps({"result": results}))
+            print(demjson.encode({"result": results}))
 
-    def query(self, param: str = ''):
+    def query(self, param: str = '') -> list:
         """
         sub class need to override this method
         """
         return []
 
-    def context_menu(self, data):
+    def context_menu(self, data) -> list:
         """
         optional context menu entries for a result
         """
         return []
 
-    def debug(self, msg):
+    def debug(self, msg: str):
         """
         alert msg
         """
-        print("DEBUG:{}".format(msg))
+        print(f"DEBUG:{msg}")
         sys.exit()

flowlauncher/FlowLauncherAPI.py

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 
-import json
+import demjson
 
 
-class FlowLauncherAPI(object):
+class FlowLauncherAPI:
 
     @classmethod
-    def change_query(cls, query, requery=False):
+    def change_query(cls, query, requery: bool = False):
         """
         change flow launcher query
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Wox.ChangeQuery",
             "parameters": [query, requery]}))
 
@@ -19,7 +19,7 @@ def shell_run(cls, cmd):
         """
         run shell commands
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.ShellRun",
             "parameters": [cmd]}))
 
@@ -28,7 +28,7 @@ def close_app(cls):
         """
         close flow launcher
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.CloseApp",
             "parameters": []}))
 
@@ -37,7 +37,7 @@ def hide_app(cls):
         """
         hide flow launcher
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.HideApp",
             "parameters": []}))
 
@@ -46,7 +46,7 @@ def show_app(cls):
         """
         show flow launcher
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.ShowApp",
             "parameters": []}))
 
@@ -55,7 +55,7 @@ def show_msg(cls, title: str, sub_title: str, ico_path: str = ""):
         """
         show messagebox
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.ShowMsg",
             "parameters": [title, sub_title, ico_path]}))
 
@@ -64,7 +64,7 @@ def open_setting_dialog(cls):
         """
         open setting dialog
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.OpenSettingDialog",
             "parameters": []}))
 
@@ -73,7 +73,7 @@ def start_loadingbar(cls):
         """
         start loading animation in flow launcher
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.StartLoadingBar",
             "parameters": []}))
 
@@ -82,7 +82,7 @@ def stop_loadingbar(cls):
         """
         stop loading animation in flow launcher
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.StopLoadingBar",
             "parameters": []}))
 
@@ -91,6 +91,6 @@ def reload_plugins(cls):
         """
         reload all flow launcher plugins
         """
-        print(json.dumps({
+        print(demjson.encode({
             "method": "Flow.Launcher.ReloadPlugins",
             "parameters": []}))

requirements.txt

@@ -0,0 +1 @@
+demjson

setup.py

@@ -46,12 +46,9 @@
     "Topic :: Software Development :: Libraries :: Application Frameworks",
 ]
 
-try:
-    f = open("requirements.txt", "r")
-    REQUIRES = [i.strip() for i in f.readlines()]
-except:
-    print("'requirements.txt' not found!")
-    REQUIRES = []
+with open("requirements.txt", "r") as f:
+    REQUIRES = [package.strip() for package in f.readlines()]
+
 
 setup(
     name=NAME,