55ba3382 by 周伟奇

fix bug

1 parent 7a3d093e
......@@ -165,7 +165,12 @@ class Command(BaseCommand, LoggerMixin):
def folder_process(self, input_dir, classify):
while not os.path.isdir(input_dir):
self.folder_log.info('{0} [input dir is not dir] [input_dir={1}]'.format(self.log_base, input_dir))
print(self.switch)
if self.switch:
time.sleep(self.sleep_time)
continue
else:
return
output_dir = os.path.join(os.path.dirname(input_dir), 'Output')
img_output_dir = os.path.join(output_dir, 'image')
wb_output_dir = os.path.join(output_dir, 'excel')
......@@ -177,11 +182,16 @@ class Command(BaseCommand, LoggerMixin):
os.makedirs(pdf_output_dir, exist_ok=True)
os.makedirs(failed_output_dir, exist_ok=True)
while self.switch:
if not os.path.isdir(input_dir):
self.folder_log.info('{0} [input dir is not dir] [input_dir={1}]'.format(self.log_base, input_dir))
time.sleep(self.sleep_time)
continue
# 1. 从input dir获取pdf or image
list_dir = os.listdir(input_dir)
if not list_dir:
self.folder_log.info('{0} [input dir empty] [input_dir={1}]'.format(self.log_base, input_dir))
time.sleep(self.sleep_time)
continue
for name in list_dir:
try:
path = os.path.join(input_dir, name)
......
......@@ -294,7 +294,7 @@ class DocView(GenericView, DocHandler):
pdf_file = args.get('pdf_file')
if isinstance(pdf_file.name, str):
if not pdf_file.name.endswith('pdf') or not pdf_file.name.endswith('PDF'):
if not pdf_file.name.endswith('pdf') and not pdf_file.name.endswith('PDF'):
self.invalid_params(msg='invalid params: not a PDF file')
business_type = random.choice(consts.BUSINESS_TYPE_LIST)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!