webcam compress update 05

opencv_webcam.py

@@ -15,7 +15,7 @@ from utils.hotkey import hotkey_judge
 from utils.frame_opt import frame_opt
 from utils.log import is_logSuffix, log_management
 from utils.args_yaml import argsYaml
-from utils.compress import webcam_zip, webcam_tar, webcam_compress, is_compressFile
+from utils.compress import webcam_compress, is_compressFile
 
 ROOT_PATH = sys.path[0]  # 项目根目录
 
@@ -197,9 +197,6 @@ def webcam_opencv(device_index="0",
 
     # ------------------压缩文件------------------
     if (is_compress and (is_autoSaveFrame or is_handSaveFrame)):
-        # 自定义压缩文件名称
-        # webcam_zip(is_autoZipName, f'{ROOT_PATH}/{zipName}', frame_savePath, zipMode)
-        # webcam_tar(is_autoZipName, f'{ROOT_PATH}/{zipName}', frame_savePath)
         webcam_compress(compressStyle, is_autoCompressName,
                         f'{ROOT_PATH}/{compressName}.{compressStyle}', frame_savePath, compressMode)
 

utils/compress.py

@@ -27,18 +27,28 @@ def webcam_compress(compressStyle, is_autoCompressName, compressName, preCompres
 
     file_list = os.listdir(preCompressFilePath)  # 获取目录下的文件名称
 
+    # if (compressStyle == "zip"):
+    #     compress_file = zipfile.ZipFile(compressName, compressMode)
+    # if (compressStyle == "tar"):
+    #     compress_file = tarfile.open(compressName, compressMode)
+
     if (compressStyle == "zip"):
         compress_file = zipfile.ZipFile(compressName, compressMode)
-    if (compressStyle == "tar"):
-        compress_file = tarfile.open(compressName, compressMode)
-
-    # ----------压缩开始----------
         for i in range(len(file_list)):
-        if (compressStyle == "zip"):
             compress_file.write(
                 f'{preCompressFilePath}/{file_list[i]}', compress_type=zipfile.ZIP_DEFLATED)
     if (compressStyle == "tar"):
+        compress_file = tarfile.open(compressName, compressMode)
+        for i in range(len(file_list)):
             compress_file.add(f'{preCompressFilePath}/{file_list[i]}')
+
+    # ----------压缩开始----------
+    # for i in range(len(file_list)):
+    #     if (compressStyle == "zip"):
+    #         compress_file.write(
+    #             f'{preCompressFilePath}/{file_list[i]}', compress_type=zipfile.ZIP_DEFLATED)
+    #     if (compressStyle == "tar"):
+    #         compress_file.add(f'{preCompressFilePath}/{file_list[i]}')
     # ----------压缩结束----------
     compress_file.close()
     print(f'文件压缩成功！已保存在：{compressName}')

v04.md

@@ -8,7 +8,7 @@
 
 ### 功能更新
 - 加入docker vim编辑器
-- 加入视频帧压缩功能
+- 加入视频帧压缩功能，可压缩为.zip和.tar
 - 加入自定义压缩文件名称
 - 加入自动命名压缩文件名称
 - 加入自定义压缩模式