From 8430b0278536ebe7afd3bb67c77938664395def0 Mon Sep 17 00:00:00 2001 From: wqy Date: Sat, 3 Sep 2022 09:52:36 +0800 Subject: [PATCH] Expose transaction api --- api/__init__.py | 2 +- api/operation.py | 2 +- tjnetwork_new.py | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 9ea241c..ef57338 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -5,7 +5,7 @@ from .project import copy_project from .operation import execute_undo as undo from .operation import execute_redo as redo from .operation import have_snapshot, take_snapshot, pick_snapshot -from .operation import have_transaction, start_transaction, commit_transaction, rollback_transaction +from .operation import have_transaction, start_transaction, commit_transaction, abort_transaction from .s0_base import is_node, is_junction, is_reservoir, is_tank from .s0_base import is_link, is_pipe, is_pump, is_valve diff --git a/api/operation.py b/api/operation.py index 33c0446..57c2fd9 100644 --- a/api/operation.py +++ b/api/operation.py @@ -202,7 +202,7 @@ def commit_transaction(name: str) -> None: _remove_transaction(name) -def rollback_transaction(name: str) -> None: +def abort_transaction(name: str) -> None: tran = _get_current_transaction_id(name) if tran >= 0: print("No active transaction!") diff --git a/tjnetwork_new.py b/tjnetwork_new.py index 005292a..0d123a3 100644 --- a/tjnetwork_new.py +++ b/tjnetwork_new.py @@ -49,7 +49,7 @@ def undo(name: str) -> None: def redo(name: str) -> None: return api.redo(name) -def have_snapshot(name: str, tag: str) -> None: +def have_snapshot(name: str, tag: str) -> bool: return api.have_snapshot(name, tag) def take_snapshot(name: str, tag: str) -> None: @@ -58,6 +58,17 @@ def take_snapshot(name: str, tag: str) -> None: def pick_snapshot(name: str, tag: str) -> None: return api.pick_snapshot(name, tag) +def have_transaction(name: str) -> bool: + return api.have_transaction(name) + +def start_transaction(name: str, strict: bool = False) -> None: + return api.start_transaction(name, strict) + +def commit_transaction(name: str) -> None: + return api.commit_transaction(name) + +def abort_transaction(name: str) -> None: + return api.abort_transaction(name) ############################################################ # type