Use RPC to simplify codes

Author: Zeroto521

flowlauncher/FlowLauncher.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
 
-import inspect
 import sys
-from json import loads, dumps
+from inspect import getmembers, ismethod
+
+from RPC import RPC
 
 
 class FlowLauncher:
@@ -12,33 +13,22 @@ class FlowLauncher:
     """
 
     def __init__(self):
-
-        # defalut jsonrpc
-        self.rpc_request = {'method': 'query', 'parameters': ['']}
-        self.debugMessage = ""
-        
         if len(sys.argv) > 1:
-            
             # Gets JSON-RPC from Flow Launcher process.
-            self.rpc_request = loads(sys.argv[1])
-
-        # proxy is not working now
-        # self.proxy = self.rpc_request.get("proxy", {})
-
-        request_method_name = self.rpc_request.get("method", "query")
-        request_parameters = self.rpc_request.get("parameters", [])
+            self.rpc_request = RPC.from_string(sys.argv[1])
+        else:
+            # defalut JSON-RPC
+            self.rpc_request = RPC()
 
-        methods = inspect.getmembers(self, predicate=inspect.ismethod)
-        request_method = dict(methods)[request_method_name]
-        results = request_method(*request_parameters)
+        # Run 'method'
+        method_name = getmembers(self, predicate=ismethod)
+        request_method = dict(method_name)[self.rpc_request.method]
+        self.rpc_request.result = request_method(*self.rpc_request.parameters)
 
-        if request_method_name in ("query", "context_menu"):
-            print(dumps({
-                "result": results,
-                "debugMessage": self.debugMessage
-            }))
+        if self.rpc_request.method in {"query", "context_menu"}:
+            self.rpc_request.to_string()
 
-    def query(self, param: str = '') -> list:
+    def query(self, param: str = "") -> list:
         """
         sub class need to override this method
         """

flowlauncher/FlowLauncherAPI.py

@@ -1,95 +1,86 @@
-# -*- coding: utf-8 -*-
+from RPC import RPC
 
-from json import dumps
 
 class FlowLauncherAPI:
-
     @classmethod
     def change_query(cls, query, requery: bool = False):
         """
         change flow launcher query
         """
-        print(dumps({
-            "method": "Flow.Launcher.ChangeQuery",
-            "parameters": [query, requery]}))
+        RPC(
+            method="Flow.Launcher.ChangeQuery",
+            parameters=[query, requery],
+        ).to_string()
 
     @classmethod
     def shell_run(cls, cmd):
         """
         run shell commands
         """
-        print(dumps({
-            "method": "Flow.Launcher.ShellRun",
-            "parameters": [cmd]}))
+        RPC(
+            method="Flow.Launcher.ShellRun",
+            parameters=[cmd],
+        ).to_string()
 
     @classmethod
     def close_app(cls):
         """
         close flow launcher
         """
-        print(dumps({
-            "method": "Flow.Launcher.CloseApp",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.CloseApp").to_string()
 
     @classmethod
     def hide_app(cls):
         """
         hide flow launcher
         """
-        print(dumps({
-            "method": "Flow.Launcher.HideApp",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.HideApp").to_string()
 
     @classmethod
     def show_app(cls):
         """
         show flow launcher
         """
-        print(dumps({
-            "method": "Flow.Launcher.ShowApp",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.ShowApp").to_string()
 
     @classmethod
     def show_msg(cls, title: str, sub_title: str, ico_path: str = ""):
         """
         show messagebox
         """
-        print(dumps({
-            "method": "Flow.Launcher.ShowMsg",
-            "parameters": [title, sub_title, ico_path]}))
+        RPC(
+            method="Flow.Launcher.ShowMsg",
+            parameters=[
+                title,
+                sub_title,
+                ico_path,
+            ],
+        ).to_string()
 
     @classmethod
     def open_setting_dialog(cls):
         """
         open setting dialog
         """
-        print(dumps({
-            "method": "Flow.Launcher.OpenSettingDialog",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.OpenSettingDialog").to_string()
 
     @classmethod
     def start_loadingbar(cls):
         """
         start loading animation in flow launcher
         """
-        print(dumps({
-            "method": "Flow.Launcher.StartLoadingBar",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.StartLoadingBar").to_string()
 
     @classmethod
     def stop_loadingbar(cls):
         """
         stop loading animation in flow launcher
         """
-        print(dumps({
-            "method": "Flow.Launcher.StopLoadingBar",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.StartLoadingBar").to_string()
 
     @classmethod
     def reload_plugins(cls):
         """
         reload all flow launcher plugins
         """
-        print(dumps({
-            "method": "Flow.Launcher.ReloadPlugins",
-            "parameters": []}))
+        RPC(method="Flow.Launcher.ReloadPlugins").to_string()