Update Modify the entry

plugins/word_bank/_data_source.py

@@ -5,7 +5,6 @@ from typing import Union
 class WordBankBuilder:
 
     def __init__(self, user_id: int, group_id: int, problem: str):
-
         self._data = {
             "user_id": user_id,
             "group_id": group_id,
@@ -37,16 +36,13 @@ class WordBankBuilder:
         placeholder = self._data.get("placeholder")
         await WordBank.add_problem_answer(user_id, group_id, problem, answer, placeholder)
 
+    async def update(self, index):
+        user_id = self._data["user_id"]
+        group_id = self._data["group_id"]
+        problem = self._data["problem"]
+        answer = self._data["answer"]
+        placeholder = self._data.get("placeholder")
+        return await WordBank.update_problem_answer(user_id, group_id, problem, answer, index, placeholder)
+
     def __str__(self):
         return str(self._data)
-
-
-
-
-
-
-
-
-
-
-

plugins/word_bank/model.py

@@ -60,6 +60,32 @@ class WordBank(db.Model):
             user_id, group_id, problem, "delete", index=index
         )
 
+    @classmethod
+    async def update_problem_answer(
+            cls,
+            user_id: int,
+            group_id: Optional[int],
+            problem: str,
+            answer: str,
+            index: Optional[int],
+            format_: Optional[List[Tuple[int, Union[int, str]]]],
+    ) -> str:
+        """
+        修改某问题一个或全部回答
+        :param user_id: 用户id
+        :param group_id: 群号
+        :param problem: 问题
+        :param index: 回答下标
+        """
+        _str = None
+        if format_:
+            _str = ""
+            for x, y in format_:
+                _str += f"{x}<_s>{y}<format>"
+        return await cls._problem_answer_handle(
+            user_id, group_id, problem, "update", answer=answer,index=index, format_=_str
+        )
+
     @classmethod
     async def get_problem_answer(
             cls, user_id: int, group_id: Optional[int], problem: str
@@ -174,8 +200,8 @@ class WordBank(db.Model):
                     problem=problem,
                     answer=answer,
                     format=format_,
-                    create_time=datetime.now().date(),
+                    create_time=datetime.now().replace(microsecond=0),
-                    update_time=datetime.now().date(),
+                    update_time=datetime.now().replace(microsecond=0),
                 )
             return True
         elif type_ == "delete":
@@ -204,9 +230,39 @@ class WordBank(db.Model):
                         & (cls.group_id == group_id)
                     ).gino.status()
                 return answer
+        elif type_ == "update":
+            new_format =format_
+            new_answer = answer
+            q = await q.with_for_update().gino.all()
+            if q:
+                path = DATA_PATH / "word_bank" / f"{group_id}"
+                if index is not None:
+                    _q = [x.problem for x in q]
+                    _q.sort()
+                    prob = _q[index]
+                    index = [x.problem for x in q].index(prob)
+                    q = [q[index]]
+                else:
+                    q = [q[0]]
+                for x in q:
+                    format_ = x.format
+                    if format_:
+                        for sp in format_.split("<format>")[:-1]:
+                            _, image_name = sp.split("<_s>")
+                            if image_name.endswith("jpg"):
+                                _path = path / image_name
+                                if _path.exists():
+                                    _path.unlink()
+                    await cls.update.values(answer=new_answer,
+                                            format=new_format,
+                                            update_time=datetime.now().replace(microsecond=0), ).where(
+                        (cls.problem == problem)
+                        & (cls.answer == x.answer)
+                        & (cls.group_id == group_id)
+                    ).gino.status()
+                return True
         elif type_ == "get":
             q = await q.gino.all()
             if q:
                 return [(x.answer, x.format.split("<format>")[:-1]) for x in q]
         return False
-

plugins/word_bank/word_hanlde.py

@@ -52,11 +52,12 @@ __plugin_settings__ = {
 data_dir = DATA_PATH / "word_bank"
 data_dir.mkdir(parents=True, exist_ok=True)
 
-
 add_word = on_command("添加词条", priority=5, block=True)
 
 delete_word = on_command("删除词条", priority=5, block=True)
 
+update_word = on_command("修改词条", priority=5, block=True)
+
 show_word = on_command("显示词条", aliases={"查看词条"}, priority=5, block=True)
 
 
@@ -75,39 +76,11 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State, arg: Message = C
     idx = 0
     for n in bot.config.nickname:
         if n and problem.startswith(n):
-            _problem = f"[_to_me|{n}]" + problem[len(n) :]
+            _problem = f"[_to_me|{n}]" + problem[len(n):]
             break
     else:
         _problem = problem
-    (data_dir / f"{event.group_id}").mkdir(exist_ok=True, parents=True)
+    _builder = await get__builder(event, _problem, answer, idx)
-    _builder = WordBankBuilder(event.user_id, event.group_id, _problem)
-    for at_ in get_message_at(event.json()):
-        r = re.search(rf"\[CQ:at,qq={at_}]", answer)
-        if r:
-            answer = answer.replace(f"[CQ:at,qq={at_}]", f"[__placeholder_{idx}]", 1)
-            _builder.set_placeholder(idx, at_)
-            idx += 1
-    for img in get_message_img(event.json()):
-        _x = img.split("?")[0]
-        r = re.search(rf"\[CQ:image,file=(.*),url={_x}.*?]", answer)
-        if r:
-            rand = random.randint(1, 10000) + random.randint(1, 114514)
-            for _ in range(10):
-                if f"__placeholder_{rand}_{idx}.jpg" not in os.listdir(data_dir / f"{event.group_id}"):
-                    break
-                rand = random.randint(1, 10000) + random.randint(1, 114514)
-            for i in range(3):
-                answer = answer.replace(f",subType={i}", "")
-            answer = answer.replace(
-                rf"[CQ:image,file={r.group(1)},url={img}]",
-                f"[__placeholder_{idx}]",
-            )
-            await AsyncHttpx.download_file(
-                img, data_dir / f"{event.group_id}" / f"__placeholder_{rand}_{idx}.jpg"
-            )
-            _builder.set_placeholder(idx, f"__placeholder_{rand}_{idx}.jpg")
-            idx += 1
-    _builder.set_answer(answer)
     await _builder.save()
     logger.info(f"已保存词条 问：{problem} 答：{msg}")
     await add_word.send(f"已保存词条：{problem}")
@@ -148,6 +121,49 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
         await delete_word.send("指定下标错误...请通过查看词条来确定..")
 
 
+@update_word.handle()
+async def _(bot: Bot,event: GroupMessageEvent, arg: Message = CommandArg()):
+    msg = str(arg)
+    if not msg:
+        await update_word.finish("此命令之后需要跟随指定词条，通过“显示词条“查看")
+    index = None
+    new_answer = None
+    problem = None
+    _sp_msg = msg.split()
+    len_msg = len(_sp_msg)
+    if 1 < len_msg:
+        problem = "".join(_sp_msg[0])
+        if len_msg == 3:
+            if is_number(_sp_msg[1]):
+                index = int(_sp_msg[1])
+            new_answer = "".join(_sp_msg[2:])
+        else:
+            new_answer = "".join(_sp_msg[1:])
+    else:
+        await update_word.finish("此命令之后需要跟随修改内容")
+    idx = 0
+    for n in bot.config.nickname:
+        if n and problem.startswith(n):
+            _problem = f"[_to_me|{n}]" + problem[len(n):]
+            break
+    else:
+        _problem = problem
+    _builder = await get__builder(event, _problem, new_answer, idx)
+
+    try:
+        if await _builder.update(index):
+            await update_word.send(f"修改词条成功：{problem}")
+            logger.info(
+                f"(USER {event.user_id}, GROUP "
+                f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
+                f" 修改词条: {problem}"
+            )
+        else:
+            await update_word.send(f"修改词条：{problem} 失败，可能该词条不存在")
+    except IndexError:
+        await update_word.send("指定下标错误...请通过查看词条来确定..")
+
+
 @show_word.handle()
 async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
     msg = arg.extract_plain_text().strip()
@@ -172,3 +188,36 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
         else:
             _answer_list = [f"{i}. {x}" for i, x in enumerate(_answer_list)]
             await show_word.send(f"词条 {msg} 回答：\n" + "\n".join(_answer_list))
+
+
+async def get__builder(event, _problem, answer, idx):
+    (data_dir / f"{event.group_id}").mkdir(exist_ok=True, parents=True)
+    _builder = WordBankBuilder(event.user_id, event.group_id, _problem)
+    for at_ in get_message_at(event.json()):
+        r = re.search(rf"\[CQ:at,qq={at_}]", answer)
+        if r:
+            answer = answer.replace(f"[CQ:at,qq={at_}]", f"[__placeholder_{idx}]", 1)
+            _builder.set_placeholder(idx, at_)
+            idx += 1
+    for img in get_message_img(event.json()):
+        _x = img.split("?")[0]
+        r = re.search(rf"\[CQ:image,file=(.*),url={_x}.*?]", answer)
+        if r:
+            rand = random.randint(1, 10000) + random.randint(1, 114514)
+            for _ in range(10):
+                if f"__placeholder_{rand}_{idx}.jpg" not in os.listdir(data_dir / f"{event.group_id}"):
+                    break
+                rand = random.randint(1, 10000) + random.randint(1, 114514)
+            for i in range(3):
+                answer = answer.replace(f",subType={i}", "")
+            answer = answer.replace(
+                rf"[CQ:image,file={r.group(1)},url={img}]",
+                f"[__placeholder_{idx}]",
+            )
+            await AsyncHttpx.download_file(
+                img, data_dir / f"{event.group_id}" / f"__placeholder_{rand}_{idx}.jpg"
+            )
+            _builder.set_placeholder(idx, f"__placeholder_{rand}_{idx}.jpg")
+            idx += 1
+    _builder.set_answer(answer)
+    return _builder