From 39b7bc8732f2cb5374d9d695295ab33b3f8ce4fb Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:47:34 +0300 Subject: [PATCH 01/13] Changed demjson to native json lib. --- flowlauncher/FlowLauncher.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index 4891f92..64522a0 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -4,7 +4,8 @@ import inspect import sys -import demjson +import demjson3 +from json import loads, dumps class FlowLauncher: @@ -16,9 +17,8 @@ def __init__(self): # defalut jsonrpc self.rpc_request = {'method': 'query', 'parameters': ['']} - self.debugMessage = "" if len(sys.argv) > 1: # from input to get jsonrpc - self.rpc_request = demjson.decode(sys.argv[1]) + self.rpc_request = loads(sys.argv[1]) # proxy is not working now # self.proxy = self.rpc_request.get("proxy", {}) @@ -31,10 +31,7 @@ def __init__(self): results = request_method(*request_parameters) if request_method_name in ("query", "context_menu"): - print(demjson.encode({ - "result": results, - "debugMessage": self.debugMessage - })) + print(dumps({"result": results})) def query(self, param: str = '') -> list: """ @@ -52,4 +49,5 @@ def debug(self, msg: str): """ alert msg """ - self.debugMessage = msg + print(f"DEBUG:{msg}") + sys.exit() From f6a82eb105008a29cb8c44d7613b75af1923bc54 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:47:54 +0300 Subject: [PATCH 02/13] Changed demjson to native json lib. --- flowlauncher/FlowLauncherAPI.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/flowlauncher/FlowLauncherAPI.py b/flowlauncher/FlowLauncherAPI.py index 030bcbe..526b52d 100644 --- a/flowlauncher/FlowLauncherAPI.py +++ b/flowlauncher/FlowLauncherAPI.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -import demjson - +from json import dumps class FlowLauncherAPI: @@ -10,7 +9,7 @@ def change_query(cls, query, requery: bool = False): """ change flow launcher query """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.ChangeQuery", "parameters": [query, requery]})) @@ -19,7 +18,7 @@ def shell_run(cls, cmd): """ run shell commands """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.ShellRun", "parameters": [cmd]})) @@ -28,7 +27,7 @@ def close_app(cls): """ close flow launcher """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.CloseApp", "parameters": []})) @@ -37,7 +36,7 @@ def hide_app(cls): """ hide flow launcher """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.HideApp", "parameters": []})) @@ -46,7 +45,7 @@ def show_app(cls): """ show flow launcher """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.ShowApp", "parameters": []})) @@ -55,7 +54,7 @@ def show_msg(cls, title: str, sub_title: str, ico_path: str = ""): """ show messagebox """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.ShowMsg", "parameters": [title, sub_title, ico_path]})) @@ -64,7 +63,7 @@ def open_setting_dialog(cls): """ open setting dialog """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.OpenSettingDialog", "parameters": []})) @@ -73,7 +72,7 @@ def start_loadingbar(cls): """ start loading animation in flow launcher """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.StartLoadingBar", "parameters": []})) @@ -82,7 +81,7 @@ def stop_loadingbar(cls): """ stop loading animation in flow launcher """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.StopLoadingBar", "parameters": []})) @@ -91,6 +90,6 @@ def reload_plugins(cls): """ reload all flow launcher plugins """ - print(demjson.encode({ + print(dumps({ "method": "Flow.Launcher.ReloadPlugins", "parameters": []})) From 746460a06547b168305250a46fd9531592eda805 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:51:09 +0300 Subject: [PATCH 03/13] Removed redundant import. --- flowlauncher/FlowLauncher.py | 1 - 1 file changed, 1 deletion(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index 64522a0..d163952 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -4,7 +4,6 @@ import inspect import sys -import demjson3 from json import loads, dumps From 8f06483088359bd592e2e286f87fae37a25335e9 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:53:43 +0300 Subject: [PATCH 04/13] Fixed missing debug messages. The formatter took them down. --- flowlauncher/FlowLauncher.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index d163952..acfec51 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -4,6 +4,7 @@ import inspect import sys +import demjson3 from json import loads, dumps @@ -16,6 +17,7 @@ def __init__(self): # defalut jsonrpc self.rpc_request = {'method': 'query', 'parameters': ['']} + self.debugMessage = "" if len(sys.argv) > 1: # from input to get jsonrpc self.rpc_request = loads(sys.argv[1]) @@ -30,7 +32,10 @@ def __init__(self): results = request_method(*request_parameters) if request_method_name in ("query", "context_menu"): - print(dumps({"result": results})) + print(dumps({ + "result": results, + "debugMessage": self.debugMessage + })) def query(self, param: str = '') -> list: """ @@ -48,5 +53,6 @@ def debug(self, msg: str): """ alert msg """ + self.debugMessage = msg print(f"DEBUG:{msg}") sys.exit() From 595e0738db4ffe357e3886d9819e05148172d67e Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:54:46 +0300 Subject: [PATCH 05/13] Removed redundant import again. --- flowlauncher/FlowLauncher.py | 1 - 1 file changed, 1 deletion(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index acfec51..880e54b 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -4,7 +4,6 @@ import inspect import sys -import demjson3 from json import loads, dumps From 2e63fb52024b06af6492fd448120da2e99653ca7 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:57:38 +0300 Subject: [PATCH 06/13] Removed dev debug. --- flowlauncher/FlowLauncher.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index 880e54b..e28c380 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -53,5 +53,3 @@ def debug(self, msg: str): alert msg """ self.debugMessage = msg - print(f"DEBUG:{msg}") - sys.exit() From 9c2e8f67e6b52a48b6defe9db915ac7013dc1145 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:59:38 +0300 Subject: [PATCH 07/13] Removed redundant requirements. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2b2afd6..8b13789 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -demjson \ No newline at end of file + From 683d2327f9747b258dd8e8d6b8ea42382213f760 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Tue, 26 Apr 2022 17:23:00 +0300 Subject: [PATCH 08/13] Delete requirements.txt No need for empty requirements. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 8b13789..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ - From 8a8a02cda8e9075803965b28b4989bae70265ff1 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Tue, 26 Apr 2022 17:23:30 +0300 Subject: [PATCH 09/13] Update MANIFEST.in No requirements.txt. --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index f104e0c..4f9f11c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,5 @@ include MANIFEST.in include setup.py include README.md include LICENSE -include requirements.txt include assets/*.png From 77b75f832d38fc3ae2c0815f3dcc9e92b8ed3455 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Tue, 26 Apr 2022 17:24:24 +0300 Subject: [PATCH 10/13] Update setup.py Removed redundant requirements.txt use. --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 6b621fe..b7ee773 100644 --- a/setup.py +++ b/setup.py @@ -45,9 +45,6 @@ "Topic :: Software Development :: Libraries :: Application Frameworks", ] -with open("requirements.txt", "r") as f: - REQUIRES = [package.strip() for package in f.readlines()] - setup( name=NAME, From 7ee1df186ee41388cf43a7492e098322b83a8aa5 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Tue, 26 Apr 2022 17:25:10 +0300 Subject: [PATCH 11/13] Update setup.py Removed REQUIRES. --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index b7ee773..8f6ee22 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,5 @@ packages=find_packages(), include_package_data=True, download_url=DOWNLOAD_URL, - install_requires=REQUIRES, - requires=REQUIRES, classifiers=CLASSIFIERS ) From 592222666aa201910e5dbba45393e320ea92d61c Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Tue, 26 Apr 2022 17:25:36 +0300 Subject: [PATCH 12/13] Update FlowLauncher.py Removed empty line. --- flowlauncher/FlowLauncher.py | 1 - 1 file changed, 1 deletion(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index e28c380..7352919 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -3,7 +3,6 @@ import inspect import sys - from json import loads, dumps From 8ada938c7220c652e1c0b8868ce4ec765675e666 Mon Sep 17 00:00:00 2001 From: mrmetrix4 <49642009+mrmetrix4@users.noreply.github.com> Date: Tue, 26 Apr 2022 17:27:53 +0300 Subject: [PATCH 13/13] Update FlowLauncher.py Updated comments. --- flowlauncher/FlowLauncher.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index 7352919..53312e5 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -16,7 +16,10 @@ def __init__(self): # defalut jsonrpc self.rpc_request = {'method': 'query', 'parameters': ['']} self.debugMessage = "" - if len(sys.argv) > 1: # from input to get jsonrpc + + if len(sys.argv) > 1: + + # Gets JSON-RPC from Flow Launcher process. self.rpc_request = loads(sys.argv[1]) # proxy is not working now