From a20c2d2e43f29a9b334579a761be008f0f02d212 Mon Sep 17 00:00:00 2001 From: roger_home_pc Date: Tue, 15 Aug 2023 09:38:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4if=E7=9A=84=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/main.py b/main.py index 0adc197..2077595 100644 --- a/main.py +++ b/main.py @@ -26,17 +26,16 @@ def start_unzip_task(): # 从数据库中获取数据 data = db_obj.get_data_by_id(folder) - if data: + if data and all_file['handle_zip']: # 解压, 增加适用历史密码重试的功能 - if all_file['handle_zip']: - if unzip_obj.unzip(all_file['handle_zip'][0], data['unzip_pwd']): - file_obj.del_all_files(all_file['zip']) - else: - for pwd in db_obj.get_available_pwd(): - result = unzip_obj.unzip(all_file['handle_zip'][0], pwd) - if result: - file_obj.del_all_files(all_file['zip']) - break + if unzip_obj.unzip(all_file['handle_zip'][0], data['unzip_pwd']): + file_obj.del_all_files(all_file['zip']) + else: + for pwd in db_obj.get_available_pwd(): + result = unzip_obj.unzip(all_file['handle_zip'][0], pwd) + if result: + file_obj.del_all_files(all_file['zip']) + break # 重新获取文件检查解压结果 all_file = file_obj.get_cate_files(os.path.join(root_path, folder)) # 整理文件返回整理后的结果