Fierelier
/
fstream
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Fierelier:f3b949518613be9bae061bd86b36b7a036f1e470
Branches Tags
Fierelier:master
Fierelier:haloo
...
compare: Fierelier:bbe92187a1e85a6c67931af23afb0328c1970479
Branches Tags
Fierelier:master
Fierelier:haloo

3 Commits
f3b9495186 ... bbe92187a1

Author SHA1 Message Date
Fierelier bbe92187a1 Remove debug 2024-01-24 00:11:01 +01:00
Fierelier 3d5f0398a4 Define value "python" by default, so enc/dec commands can contain python command 2024-01-24 00:10:06 +01:00
Fierelier 7c23d2c550 oop 2024-01-24 00:09:23 +01:00
2 changed files with 9 additions and 8 deletions
Show Stats Expand all files Collapse all files

9
client/broadcast.py
View File

@ -48,12 +48,13 @@ def main():
config = toml.load(configFiles)
for key in config["args"]:
os.environ["fstream_arg_" + key] = str(config["args"][key])
if not "values" in config: config["values"] = {}
if not "python" in config["values"]: config["values"]["python"] = sys.executable
for encoder in config["encoder"]:
for i in range(len(encoder)):
if "values" in config:
for key in config["values"]:
encoder[i] = encoder[i].replace("$val:" +key+ "$",str(config["values"][key]))
for key in config["values"]:
encoder[i] = encoder[i].replace("$val:" +key+ "$",str(config["values"][key]))
for key in os.environ:
encoder[i] = encoder[i].replace("$env:" +key+ "$",os.environ[key])
@ -90,7 +91,7 @@ def main():
cmds = []
for encoder in config["encoder"]: cmds.append(encoder)
if aes == True: cmds.append([sys.executable,p(sp,"util","fstream-util-aes_to_pipe.py")])
if aes == True: cmds.append([sys.executable,p(sp,"util","fstream-util-pipe_to_aes.py")])
cmds.append([sys.executable,p(sp,"fstream.py"),addressStr(address),"broadcast"])
procs = []

8
client/watch.py
View File

@ -48,12 +48,13 @@ def main():
config = toml.load(configFiles)
for key in config["args"]:
os.environ["fstream_arg_" + key] = str(config["args"][key])
if not "values" in config: config["values"] = {}
if not "python" in config["values"]: config["values"]["python"] = sys.executable
for decoder in config["decoder"]:
for i in range(len(decoder)):
if "values" in config:
for key in config["values"]:
decoder[i] = decoder[i].replace("$val:" +key+ "$",str(config["values"][key]))
for key in config["values"]:
decoder[i] = decoder[i].replace("$val:" +key+ "$",str(config["values"][key]))
for key in os.environ:
decoder[i] = decoder[i].replace("$env:" +key+ "$",os.environ[key])
@ -74,7 +75,6 @@ def main():
cmds.append([sys.executable,p(sp,"fstream.py"),addressStr(address),"watch"])
if aes == True: cmds.append([sys.executable,p(sp,"util","fstream-util-aes_to_pipe.py")])
for decoder in config["decoder"]: cmds.append(decoder)
for cmd in cmds: print(cmd)
procs = []
procs.append(subprocess.Popen(cmds[0],stdout=subprocess.PIPE))