OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dump output as binary

Browse Source
This commit is contained in:
wqy
2023-10-21 10:13:33 +08:00
parent 788c6cd1bc
commit d996a364e5
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
epanet/epanet.py
View File

@@ -8,12 +8,16 @@ sys.path.append("..")
from api import project from api import project
from api import inp_out from api import inp_out
'''
def _verify_platform(): def _verify_platform():
_platform = platform.system() _platform = platform.system()
if _platform != "Windows": if _platform != "Windows":
raise Exception(f'Platform {_platform} unsupported (not yet)') raise Exception(f'Platform {_platform} unsupported (not yet)')
if __name__ == '__main__':
_verify_platform()
class Output: class Output:
def __init__(self, path: str) -> None: def __init__(self, path: str) -> None:
@@ -210,10 +214,6 @@ class Output:
return data return data
def dump_report(path: str) -> str:
return open(path, mode='r').read()
def _dump_output(path: str) -> dict[str, Any]: def _dump_output(path: str) -> dict[str, Any]:
opt = Output(path) opt = Output(path)
data = opt.dump() data = opt.dump()
@@ -225,6 +225,14 @@ def _dump_output(path: str) -> dict[str, Any]:
def dump_output(path: str) -> str: def dump_output(path: str) -> str:
data = _dump_output(path) data = _dump_output(path)
return json.dumps(data) return json.dumps(data)
'''
def dump_report(path: str) -> str:
return open(path, 'r').read()
def dump_output_binary(path: str) -> str:
return open(path, 'rb').read()
def run_project(name: str) -> str: def run_project(name: str) -> str:
@@ -250,7 +258,8 @@ def run_project(name: str) -> str:
data['simulation_result'] = 'failed' data['simulation_result'] = 'failed'
else: else:
data['simulation_result'] = 'successful' data['simulation_result'] = 'successful'
data |= _dump_output(opt) # data |= _dump_output(opt)
data['output'] = dump_output_binary(opt)
data['report'] = dump_report(rpt) data['report'] = dump_report(rpt)
@@ -273,12 +282,9 @@ def run_inp(name: str) -> str:
data['simulation_result'] = 'failed' data['simulation_result'] = 'failed'
else: else:
data['simulation_result'] = 'successful' data['simulation_result'] = 'successful'
data |= _dump_output(opt) # data |= _dump_output(opt)
data['output'] = dump_output_binary(opt)
data['report'] = dump_report(rpt) data['report'] = dump_report(rpt)
return json.dumps(data) return json.dumps(data)
if __name__ == '__main__':
_verify_platform()