Skip to content
Merged
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ include MANIFEST.in
include setup.py
include README.md
include LICENSE
include requirements.txt

include assets/*.png
12 changes: 7 additions & 5 deletions flowlauncher/FlowLauncher.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

import inspect
import sys

import demjson
from json import loads, dumps


class FlowLauncher:
Expand All @@ -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", {})
Expand All @@ -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
}))
Expand Down
23 changes: 11 additions & 12 deletions flowlauncher/FlowLauncherAPI.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-

import demjson

from json import dumps

class FlowLauncherAPI:

Expand All @@ -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]}))

Expand All @@ -19,7 +18,7 @@ def shell_run(cls, cmd):
"""
run shell commands
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.ShellRun",
"parameters": [cmd]}))

Expand All @@ -28,7 +27,7 @@ def close_app(cls):
"""
close flow launcher
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.CloseApp",
"parameters": []}))

Expand All @@ -37,7 +36,7 @@ def hide_app(cls):
"""
hide flow launcher
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.HideApp",
"parameters": []}))

Expand All @@ -46,7 +45,7 @@ def show_app(cls):
"""
show flow launcher
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.ShowApp",
"parameters": []}))

Expand All @@ -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]}))

Expand All @@ -64,7 +63,7 @@ def open_setting_dialog(cls):
"""
open setting dialog
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.OpenSettingDialog",
"parameters": []}))

Expand All @@ -73,7 +72,7 @@ def start_loadingbar(cls):
"""
start loading animation in flow launcher
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.StartLoadingBar",
"parameters": []}))

Expand All @@ -82,7 +81,7 @@ def stop_loadingbar(cls):
"""
stop loading animation in flow launcher
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.StopLoadingBar",
"parameters": []}))

Expand All @@ -91,6 +90,6 @@ def reload_plugins(cls):
"""
reload all flow launcher plugins
"""
print(demjson.encode({
print(dumps({
"method": "Flow.Launcher.ReloadPlugins",
"parameters": []}))
1 change: 0 additions & 1 deletion requirements.txt

This file was deleted.

5 changes: 0 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -65,7 +62,5 @@
packages=find_packages(),
include_package_data=True,
download_url=DOWNLOAD_URL,
install_requires=REQUIRES,
requires=REQUIRES,
classifiers=CLASSIFIERS
)