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 diff --git a/flowlauncher/FlowLauncher.py b/flowlauncher/FlowLauncher.py index 4891f92..53312e5 100644 --- a/flowlauncher/FlowLauncher.py +++ b/flowlauncher/FlowLauncher.py @@ -3,8 +3,7 @@ import inspect import sys - -import demjson +from json import loads, dumps class FlowLauncher: @@ -17,8 +16,11 @@ 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]) + + 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", {}) @@ -31,7 +33,7 @@ def __init__(self): results = request_method(*request_parameters) if request_method_name in ("query", "context_menu"): - print(demjson.encode({ + print(dumps({ "result": results, "debugMessage": self.debugMessage })) 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": []})) diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 2b2afd6..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -demjson \ No newline at end of file diff --git a/setup.py b/setup.py index 6b621fe..8f6ee22 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, @@ -65,7 +62,5 @@ packages=find_packages(), include_package_data=True, download_url=DOWNLOAD_URL, - install_requires=REQUIRES, - requires=REQUIRES, classifiers=CLASSIFIERS )