✨zip解压模块捕获异常

Author: owlmk

client/tool/util/tca_ql.py

@@ -71,7 +71,7 @@ def __download_database(self, params, path):
             file_server = RetryFileServer(retry_times=2).get_server()
             if file_server.download_big_file(file_name, zip_file):
                 logger.info("下载成功")
-                Zip.decompress(zip_file, db_path)
+                Zip.decompress_by_7z(zip_file, db_path)
                 return True
         except Exception as e:
             logger.warning(f"下载失败 {e}")

client/util/zipmgr.py

@@ -17,7 +17,6 @@
 from settings.base import WORK_DIR
 from util.subprocc import SubProcController
 from util.exceptions import ZIPError, TransferModuleError, NodeConfigError
-from task.basic.common import subprocc_log
 from util.pathlib import PathMgr
 from util.envset import EnvSet
 
@@ -71,8 +70,8 @@ def compress(self, path, zip_file):
                 shell=False,
                 stdout_filepath=None,
                 stderr_filepath=None,
-                stdout_line_callback=subprocc_log,
-                stderr_line_callback=subprocc_log,
+                stdout_line_callback=self.compress_subprocc_log,
+                stderr_line_callback=self.compress_subprocc_log,
                 env=EnvSet().get_origin_env(),
             )
             process.wait(ZIP_TIME_LIMIT)
@@ -97,7 +96,7 @@ def decompress_by_7z(self, zip_file, path, print_enable=False):
 
         args = PathMgr().format_cmd_arg_list(args)
         if print_enable:
-            output = subprocc_log
+            output = self.subprocc_log
         else:
             output = None
         process = SubProcController(
@@ -107,7 +106,7 @@ def decompress_by_7z(self, zip_file, path, print_enable=False):
             stdout_filepath=None,
             stderr_filepath=None,
             stdout_line_callback=output,
-            stderr_line_callback=subprocc_log,
+            stderr_line_callback=self.subprocc_log,
             env=EnvSet().get_origin_env(),
         )
         process.wait(ZIP_TIME_LIMIT)
@@ -120,7 +119,7 @@ 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("../task")
+        os.chdir("..")
         if os.path.exists(path):
             PathMgr().rmpath(path)
 
@@ -130,6 +129,14 @@ def decompress(self, zip_file, path):
             os.chdir(WORK_DIR)
         return True
 
+    def subprocc_log(self, line):
+        logger.info(line)
+        if line.find("Can not open the file as archive"):
+            raise TransferModuleError("解压失败，压缩文件损坏或格式不对")
+    
+    def compress_subprocc_log(self, line):
+        logger.info(line)
+
     @staticmethod
     def zipfile_compress(path, zip_file):
         """
@@ -142,7 +149,7 @@ def zipfile_compress(path, zip_file):
         zp = zipfile.ZipFile(zip_file, "w", zipfile.ZIP_DEFLATED)
         for dirpath, dirnames, filenames in os.walk(path):
             fpath = dirpath.replace(path, "")  # 这一句很重要，不replace的话，就从根目录开始复制
-            fpath = fpath and fpath + os.sep or ""
+            fpath = fpath and fpath + os.sep or ""  # 这句话理解我也点郁闷，实现当前文件夹以及包含的所有文件的压缩
             for filename in filenames:
                 zp.write(os.path.join(dirpath, filename), fpath + filename)
         zp.close()