外层也调用moveFailedFolder()函数来处理

This commit is contained in:
lededev
2021-09-27 03:56:59 +08:00
parent 3ef0db1890
commit 9304aab940

View File

@@ -13,7 +13,7 @@ import time
from pathlib import Path from pathlib import Path
from ADC_function import file_modification_days, get_html, is_link from ADC_function import file_modification_days, get_html, is_link
from number_parser import get_number from number_parser import get_number
from core import core_main from core import core_main, moveFailedFolder
def check_update(local_version): def check_update(local_version):
@@ -242,21 +242,10 @@ def create_data_and_move(file_path: str, c: config.Config, debug):
print(f"[-] [{file_path}] ERROR:") print(f"[-] [{file_path}] ERROR:")
print('[-]', err) print('[-]', err)
# 3.7.2 New: Move or not move to failed folder. try:
if c.failed_move() == False: moveFailedFolder(file_path, conf)
if c.soft_link(): except Exception as err:
print("[-]Link {} to failed folder".format(file_path)) print('[!]', err)
os.symlink(file_path, os.path.join(conf.failed_folder(), file_name))
elif c.failed_move() == True:
if c.soft_link():
print("[-]Link {} to failed folder".format(file_path))
os.symlink(file_path, os.path.join(conf.failed_folder(), file_name))
else:
try:
print("[-]Move [{}] to failed folder".format(file_path))
shutil.move(file_path, os.path.join(conf.failed_folder(), file_name))
except Exception as err:
print('[!]', err)
def create_data_and_move_with_custom_number(file_path: str, c: config.Config, custom_number): def create_data_and_move_with_custom_number(file_path: str, c: config.Config, custom_number):