refactor: remove cmd / cmda handlers

MenxLi · Aug 18, 2023 · d7a32da · d7a32da
1 parent 372d78c
commit d7a32da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 70 deletions.
diff --git a/resbibman/core/serverConn.py b/resbibman/core/serverConn.py
@@ -163,24 +163,23 @@ def deleteData(self, uid: str) -> bool:
         return self._checkRes(res)
 
     def deleteTag(self, tag_to_be_deleted: str) -> bool:
+        post_url = self.SERVER_URL + "/dataman/tag-delete"
         post_args = {
             "key": self.hash_key,
-            "cmd": "deleteTagAll",
-            "uuid": "_",
-            "args": json.dumps([tag_to_be_deleted]),
-            "kwargs": json.dumps({})
+            "tag": tag_to_be_deleted
         }
-        return self._remoteCMD(post_args)
+        res = requests.post(post_url, data = post_args)
+        return self._checkRes(res)
 
     def renameTag(self, src_tag: str, dst_tag: str) -> bool:
+        post_url = self.SERVER_URL + "/dataman/tag-rename"
         post_args = {
             "key": self.hash_key,
-            "cmd": "renameTagAll",
-            "uuid": "_",
-            "args": json.dumps([src_tag, dst_tag]),
-            "kwargs": json.dumps({})
+            "oldTag": src_tag,
+            "newTag": dst_tag
         }
-        return self._remoteCMD(post_args)
+        res = requests.post(post_url, data = post_args)
+        return self._checkRes(res)
 
     def postDiscussion(self, uid: str, name: str, content: str) -> bool:
         post_url = self.SERVER_URL + "/discussion_mod"
@@ -194,14 +193,6 @@ def postDiscussion(self, uid: str, name: str, content: str) -> bool:
         res = requests.post(url = post_url, data = post_args)
         return self._checkRes(res)
 
-    def _remoteCMD(self, post_args) -> bool:
-        """
-        post command to remote/cmdA
-        """
-        post_addr = "{}/cmdA".format(self.SERVER_URL) 
-        res = requests.post(post_addr, params = post_args)
-        return self._checkRes(res)
-
     def getDocURL(self, uid: str, dtype: Literal["pdf, hpack"]) -> str:
         if dtype == "pdf":
             return self.SERVER_URL + "/doc/{}".format(uid)

diff --git a/resbibman/server/handlers/__init__.py b/resbibman/server/handlers/__init__.py
@@ -1,6 +1,5 @@
 from .dataInfo import DataInfoHandler, DataListHandler
 from .documents import DocHandler, HDocHandler
-from .commands import CMDArgHandler, CMDHandler
 from .comment import CommentHandler
 from .file import FileHandler
 from .auth import AuthHandler

diff --git a/resbibman/server/handlers/commands.py b/resbibman/server/handlers/commands.py
diff --git a/resbibman/server/handlers/dataMan.py b/resbibman/server/handlers/dataMan.py
@@ -155,7 +155,7 @@ def post(self):
             # only admin can rename tags
             raise tornado.web.HTTPError(403)
         self.db.renameTag(old_tag, new_tag)
-        self.logger.info(f"Tag {old_tag} renamed to {new_tag}")
+        self.logger.info(f"Tag [{old_tag}] renamed to [{new_tag}] by [{permission['identifier']}]")
         self.write("OK")
 
 class TagDeleteHandler(RequestHandlerMixin, tornado.web.RequestHandler):
@@ -170,5 +170,5 @@ def post(self):
             # only admin can delete tags
             raise tornado.web.HTTPError(403)
         self.db.deleteTag(tag)
-        self.logger.info(f"Tag {tag} deleted")
+        self.logger.info(f"Tag [{tag}] deleted by [{permission['identifier']}]")
         self.write("OK")
diff --git a/resbibman/server/main.py b/resbibman/server/main.py
@@ -35,8 +35,6 @@ def __init__(self) -> None:
             (r"/comment/(.*)", CommentHandler, {"path": "/"}),
 
             ## For both clients
-            # (r"/cmd/(.*)", CMDHandler),                 # will replace (reload-db)
-            (r"/cmdA", CMDArgHandler),                  # will replace
             (r"/discussions/(.*)", DiscussionHandler),
             (r"/discussion_mod", DiscussionModHandler),
             (r"/summary", SummaryHandler),              # may deprecate