From 2c8293d86495f7873252d49770825315f3ed87ac Mon Sep 17 00:00:00 2001
From: "weiye.wang" <kj_wangweiye@126.com>
Date: Sun, 4 Feb 2024 11:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0GenerateProblemListFromString?=
 =?UTF-8?q?2024=E5=8A=9F=E8=83=BD,=20=E5=92=8C=E6=96=B0=E7=9A=84"=E6=96=B0?=
 =?UTF-8?q?=E9=A2=98=E6=AF=94=E5=AF=B9"=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 工具v2/database_tools.py | 45 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py
index 85c1e82d..f5ecab2c 100644
--- a/工具v2/database_tools.py
+++ b/工具v2/database_tools.py
@@ -268,6 +268,7 @@ def GenerateProblemListFromString2024(data): #从来自.tex文件的字符串生
     except:
         pass
     data = re.sub(r"\n{2,}","\n",data)
+    data = re.sub(r"\\definecolor[^\n]*\n","\n",data)
     data = re.sub(r"\\begin\{tcolorbox\}[\s\S]*?\\end\{tcolorbox\}","\n",data)
     data = re.sub(r"\\item",r"\\enditem\\item",data)
     data = re.sub(r"\\end\{enumerate\}",r"\\enditem",data) #切除无关信息, 保留关键信息
@@ -280,31 +281,29 @@ def GenerateProblemListFromString2024(data): #从来自.tex文件的字符串生
         content_raw = re.sub(r"\n\%[\s\S]*$","",content_raw) #题目内容
         content_raw = re.sub(r"\\\\$","",content_raw) # 删去题目最后一行处可能存在的\\
         content_raw = content_raw.strip() # 删去前后多余的空格
+        meta = {}
         if not content_raw[0] == "[": # 根据方括号内的内容生成交互信息, 这是无方括号的内容, 无meta
-            content = content_raw
-            meta = {}
-        elif re.findall(r"^\[rep(\d+)\]",content_raw) != []: # 方括号以rep开始, 用已有的题号代替, 字典中显示唯一的题号
+            content = content_raw   
+        else:
+            same_id_list = []
+            related_id_list = []
+            unrelated_id_list = []
             content = re.sub(r"^\[rep(\d+)\]","",content_raw).strip()
-            meta = {"rep":re.findall(r"\[rep(\d+)\]",content_raw)[0].zfill(6)}
-        else: # 方括号不以rep开始, 用s,r,u分别表示相同, 相关, 无关, 返回有这三个字段的字典
-            content = re.sub(r"^\[.*?\]","",content_raw).strip()
-            metaraw = re.findall(r"^\[(.*?)\]",content_raw)[0]
-            sameidraw = re.findall(r"s([\d,:]*)",metaraw)
-            if not sameidraw == []:
-                same_id_list = generate_number_set(sameidraw[0])
-            else:
-                same_id_list = []
-            relatedidraw = re.findall(r"r([\d,:]*)",metaraw)
-            if not relatedidraw == []:
-                related_id_list = generate_number_set(relatedidraw[0])
-            else:
-                related_id_list = []
-            unrelatedidraw = re.findall(r"u([\d,:]*)",metaraw)
-            if not unrelatedidraw == []:
-                unrelated_id_list = generate_number_set(unrelatedidraw[0])
-            else:
-                unrelated_id_list = []
-            meta = {"same":same_id_list,"related":related_id_list,"unrelated":unrelated_id_list}
+            metaraw = re.findall(r"\[.*\]",content_raw)[0]
+            metaraw = re.sub(r"[\[\]]","",metaraw)
+            metalist = metaraw.split(",")
+            for metaitem in metalist:
+                metaitem = metaitem.upper()
+                if metaitem.startswith("REP"):
+                    meta = {"rep":metaitem[3:].zfill(6)}
+                elif metaitem.startswith("S"):
+                    same_id_list.append(metaitem[1:].zfill(6))
+                elif metaitem.startswith("R"):
+                    related_id_list.append(metaitem[1:].zfill(6))
+                elif metaitem.startswith("U"):
+                    unrelated_id_list.append(metaitem[1:].zfill(6))
+            if not "rep" in meta:
+                meta = {"same":same_id_list,"related":related_id_list,"unrelated":unrelated_id_list}
         subdata = data[:pos[0]] #开始寻找出处中缀
         suflist = re.findall(r"\n(\%\s{0,}[\S]+)\n",subdata)
         if len(suflist) == 0: