Accept Merge Request #33: (api -> master)

Merge Request: Let client know project open count

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/33

api/__init__.py

@@ -1,5 +1,5 @@
 from .project import have_project, create_project, delete_project
-from .project import is_project_open, open_project, close_project
+from .project import is_project_open, get_project_open_count, open_project, close_project
 from .project import copy_project
 
 from .change_set import ChangeSet

api/project.py

@@ -34,6 +34,11 @@ def open_project(name: str) -> None:
 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

test_tjnetwork.py

@@ -16,6 +16,50 @@ class TestApi:
         close_project(p)
         delete_project(p)
 
+    def test_project(self):
+        p = "test_title"
+
+        assert not have_project(p)
+        assert not is_project_open(p)
+        assert get_project_open_count(p) == 0
+
+        create_project(p)
+
+        assert have_project(p)
+        assert not is_project_open(p)
+        assert get_project_open_count(p) == 0
+
+        open_project(p)
+
+        assert have_project(p)
+        assert is_project_open(p)
+        assert get_project_open_count(p) == 1
+
+        open_project(p)
+
+        assert have_project(p)
+        assert is_project_open(p)
+        assert get_project_open_count(p) == 2
+
+        close_project(p)
+
+        assert have_project(p)
+        assert is_project_open(p)
+        assert get_project_open_count(p) == 1
+
+        close_project(p)
+        
+        assert have_project(p)
+        assert not is_project_open(p)
+        assert get_project_open_count(p) == 0
+
+        delete_project(p)
+
+        assert not have_project(p)
+        assert not is_project_open(p)
+        assert get_project_open_count(p) == 0
+
+
     def test_title(self):
         p = "test_title"
         self.enter(p)

tjnetwork.py

@@ -50,6 +50,9 @@ def delete_project(name: str) -> None:
 def is_project_open(name: str) -> bool:
     return api.is_project_open(name)
 
+def get_project_open_count(name: str) -> int:
+    return api.get_project_open_count(name)
+
 def open_project(name: str) -> None:
     return api.open_project(name)