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

Merge branch 'master' into region

Browse Source
This commit is contained in:
WQY\qiong
2023-04-29 09:28:04 +08:00
parent 87d3f3688a 23cc2b2df5
commit 089a12e137
11 changed files with 222206 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/__init__.py
View File

@@ -1,5 +1,5 @@
from .project import list_project, have_project, create_project, delete_project, clean_project
from .project import is_project_open, get_project_open_count, open_project, close_project
from .project import is_project_open, open_project, close_project
from .project import copy_project
from .inp_in import read_inp, import_inp

33
api/project.py
View File

@@ -4,10 +4,9 @@ from .connection import g_conn_dict as conn
# no undo/redo
_project_open_count: dict[str, int] = {}
_server_databases = ['template0', 'template1', 'postgres', 'project']
def list_project() -> list[str]:
ps = []
with pg.connect(conninfo="dbname=postgres host=127.0.0.1", autocommit=True) as conn:
@@ -16,24 +15,30 @@ def list_project() -> list[str]:
ps.append(p['datname'])
return ps
def have_project(name: str) -> bool:
with pg.connect(conninfo="dbname=postgres host=127.0.0.1", autocommit=True) as conn:
with conn.cursor() as cur:
cur.execute(f"select * from pg_database where datname = '{name}'")
return cur.rowcount > 0
def copy_project(source: str, new: str) -> None:
with pg.connect(conninfo="dbname=postgres host=127.0.0.1", autocommit=True) as conn:
with conn.cursor() as cur:
cur.execute(f"create database {new} with template = {source}")
cur.execute(f'create database "{new}" with template = {source}')
def create_project(name: str) -> None:
return copy_project('project', name)
def delete_project(name: str) -> None:
with pg.connect(conninfo="dbname=postgres host=127.0.0.1", autocommit=True) as conn:
with conn.cursor() as cur:
cur.execute(f"drop database {name}")
cur.execute(f"select pg_terminate_backend(pid) from pg_stat_activity where datname = '{name}'")
cur.execute(f'drop database "{name}"')
def clean_project(excluded: list[str] = []) -> None:
projects = list_project()
@@ -48,27 +53,19 @@ def clean_project(excluded: list[str] = []) -> None:
if project in _server_databases or project in excluded:
continue
cur.execute(f"select pg_terminate_backend(pid) from pg_stat_activity where datname = '{project}'")
cur.execute(f"drop database {project}")
cur.execute(f'drop database "{project}"')
def open_project(name: str) -> None:
if name not in _project_open_count:
if name not in conn:
conn[name] = pg.connect(conninfo=f"dbname={name} host=127.0.0.1", autocommit=True)
_project_open_count[name] = 0
_project_open_count[name] += 1
def is_project_open(name: str) -> bool:
return name in conn
def get_project_open_count(name: str) -> int:
if is_project_open(name):
return _project_open_count[name]
return 0
def close_project(name: str) -> None:
if name in _project_open_count:
_project_open_count[name] -= 1
if _project_open_count[name] == 0:
conn[name].close()
del conn[name]
del _project_open_count[name]
if name in conn:
conn[name].close()
del conn[name]

2
api/s7_valves.py
View File

@@ -157,7 +157,7 @@ def inp_in_valve(line: str) -> str:
diameter = float(tokens[3])
v_type = str(tokens[4].upper())
setting = str(tokens[5])
minor_loss = float(tokens[6])
minor_loss = float(tokens[6]) if len(tokens) >= 7 else 0.0
desc = str(tokens[-1]) if has_desc else None
return f"insert into _link (id, type) values ('{id}', 'valve');insert into valves (id, node1, node2, diameter, type, setting, minor_loss) values ('{id}', '{node1}', '{node2}', {diameter}, '{v_type}', '{setting}', {minor_loss});"