gaschz/passff-host
1
0
Fork 0
mirror of https://codeberg.org/gaschz/passff-host.git synced 2025-06-06 18:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pref vars to uppercase (Pythonic constants)

Browse Source
This commit is contained in:
5bentz 2018-03-25 18:01:46 +02:00
parent ac4b33830a
commit b3ce9e77dd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/passff.py
View File

@ -13,15 +13,15 @@ VERSION = "_VERSIONHOLDER_"
######################## Begin preferences section ############################# ######################## Begin preferences section #############################
################################################################################ ################################################################################
# Default command for MacOS: # Default command for MacOS:
#command = "/usr/local/bin/pass" #COMMAND = "/usr/local/bin/pass"
command = "/usr/bin/pass" COMMAND = "/usr/bin/pass"
commandArgs = [] COMMAND_ARGS = []
commandEnv = { COMMAND_ENV = {
"TREE_CHARSET": "ISO-8859-1", "TREE_CHARSET": "ISO-8859-1",
# Default PATH for MacOS: # Default PATH for MacOS:
#"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin", #"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
} }
charset = "UTF-8" CHARSET = "UTF-8"
################################################################################ ################################################################################
######################### End preferences section ############################## ######################### End preferences section ##############################
################################################################################ ################################################################################
@ -69,19 +69,19 @@ if __name__ == "__main__":
key = receivedMessage[0] key = receivedMessage[0]
key = "/" + (key[1:] if key[0] == "/" else key) key = "/" + (key[1:] if key[0] == "/" else key)
pos_args = [key] pos_args = [key]
opt_args += commandArgs opt_args += COMMAND_ARGS
# Set up (modified) command environment # Set up (modified) command environment
env = dict(os.environ) env = dict(os.environ)
if "HOME" not in env: if "HOME" not in env:
env["HOME"] = os.path.expanduser('~') env["HOME"] = os.path.expanduser('~')
for key, val in commandEnv.items(): for key, val in COMMAND_ENV.items():
env[key] = val env[key] = val
# Set up subprocess params # Set up subprocess params
cmd = [command] + opt_args + ['--'] + pos_args cmd = [COMMAND] + opt_args + ['--'] + pos_args
proc_params = { proc_params = {
'input': bytes(std_input, charset) if std_input else None, 'input': bytes(std_input, CHARSET) if std_input else None,
'stdout': subprocess.PIPE, 'stdout': subprocess.PIPE,
'stderr': subprocess.PIPE, 'stderr': subprocess.PIPE,
'env': env 'env': env
@ -93,7 +93,7 @@ if __name__ == "__main__":
# Send response # Send response
sendMessage(encodeMessage({ sendMessage(encodeMessage({
"exitCode": proc.returncode, "exitCode": proc.returncode,
"stdout": proc.stdout.decode(charset), "stdout": proc.stdout.decode(CHARSET),
"stderr": proc.stderr.decode(charset), "stderr": proc.stderr.decode(CHARSET),
"version": VERSION "version": VERSION
})) }))