Merge branch 'main' into feature/djangorestframework_update

Author: yyyangw

.github/workflows/docs.yml

@@ -24,6 +24,13 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
+      # 下载二进制文件
+      - name: Download Binary Files
+        run: |
+          set -ex
+          pwd
+          bash ./scripts/base/install_bin.sh
+
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:

ScriptsAPI.py

@@ -37,6 +37,8 @@ def __init__(self):
         self._params = CmdArgParser.parse_args()
         # 日志输出设置
         self.__setup_logger()
+        # 打印版本信息
+        self.__print_client_version()
 
         if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
             LogPrinter.info('running in a PyInstaller bundle')
@@ -49,6 +51,12 @@ def __init__(self):
         # 默认git配置
         GitConfig.set_default_config()
 
+    def __print_client_version(self):
+        """打印TCA客户端版本信息"""
+        LogPrinter.info("=" * 39)
+        LogPrinter.info(f"*** TCA Client v{settings.VERSION}({settings.EDITION.name} Beta) ***")
+        LogPrinter.info("=" * 39)
+
     def __setup_logger(self):
         """日志打印配置
 

client/codepuppy.py

@@ -28,4 +28,4 @@ class Edition(Enum):
 # 版本号
 # ========================
 # puppy版本号,格式：浮点数，整数部分为8位日期，小数部分为编号(从1开始)
-VERSION = 20220907.1
+VERSION = 20240716.1

client/settings/edition.py

@@ -131,21 +131,22 @@ def run_luacheck(self, scan_cmd, error_output, pos, rules):
         issues = []
         for file in raw_warning.iter(tag="testcase"):
             # tag, attrib
-            path = file.attrib.get("classname")[pos:]
+            path = file.attrib.get("classname")
             for error in file.findall("failure"):
                 rule = error.attrib.get("type")
                 if rules and rule not in rules:
                     continue
                 # 2024/4/18 移除msg中的行列号信息
                 message = error.attrib.get("message")
-                if message is None:
+                if message is None or not message.startswith(path):
                     continue
-                infos = message.split(":", 3)
+                message = message[len(path)+1:]
+                infos = message.split(":", 2)
                 # msg中 on line 后面也会跟着行号
-                msg = infos[3].split("on line ")[0].strip()
-                line = int(infos[1])
-                column = int(infos[2])
-                issues.append({"path": path, "rule": rule, "msg": msg, "line": line, "column": column})
+                msg = infos[2].split("on line ")[0].strip()
+                line = int(infos[0])
+                column = int(infos[1])
+                issues.append({"path": path[pos:], "rule": rule, "msg": msg, "line": line, "column": column})
         return issues
 
 

client/tool/luacheck.py

@@ -119,14 +119,24 @@ def decompress_by_7z(self, zip_file, path, print_enable=False):
     def decompress(self, zip_file, path):
         logger.info("zip模块执行解压操作...")
         # 20190927 bug-fixed, 防止在当前目录下删除当前目录，出现权限异常情况
-        os.chdir("..")
-        if os.path.exists(path):
-            PathMgr().rmpath(path)
+        cur_dir = os.getcwd()
+        cur_dir_is_changed = False
+        if PathMgr().format_path(cur_dir) == PathMgr().format_path(path):
+            logger.info("Decompress dir is current dir, can not delete it directory, change to parent directory first.")
+            # 如果要删除的是当前工作目录，先切换到上层目录，再删除
+            os.chdir("..")
+            cur_dir_is_changed = True
 
-        self.decompress_by_7z(zip_file, path, print_enable=True)
-
-        if os.path.exists(WORK_DIR):
-            os.chdir(WORK_DIR)
+        try:
+            if os.path.exists(path):
+                PathMgr().rmpath(path)
+
+            self.decompress_by_7z(zip_file, path, print_enable=True)
+        finally:
+            # 恢复进入到当前工作目录
+            logger.info("Go back to the current working directory.")
+            if cur_dir_is_changed and os.path.exists(cur_dir):
+                os.chdir(cur_dir)
         return True
 
     def subprocc_log(self, line):

client/util/zipmgr.py

@@ -30,7 +30,6 @@ export const en: SidebarConfig = {
             '/en/guide/代码检查/工具/TCA-Armory-R.md',
             '/en/guide/代码检查/工具/TCA-Armory-C1.md',
             '/en/guide/代码检查/工具/TCA-Armory-Q1.md',
-            '/en/guide/代码检查/工具/cppcheck.md',
             '/en/guide/代码检查/工具/Error-Prone.md',
           ],
         },

doc/.vuepress/configs/sidebar/en.ts

@@ -30,7 +30,6 @@ export const zh: SidebarConfig = {
             '/zh/guide/代码检查/工具/TCA-Armory-R.md',
             '/zh/guide/代码检查/工具/TCA-Armory-C1.md',
             '/zh/guide/代码检查/工具/TCA-Armory-Q1.md',
-            '/zh/guide/代码检查/工具/cppcheck.md',
             '/zh/guide/代码检查/工具/Error-Prone.md',
           ],
         },

doc/.vuepress/configs/sidebar/zh.ts

@@ -706,11 +706,11 @@ bl@^5.0.0:
     readable-stream "^3.4.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.21.5:
   version "4.21.9"
@@ -915,10 +915,10 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"