fix bug
Showing
1 changed file
with
10 additions
and
4 deletions
| ... | @@ -3,6 +3,7 @@ import time | ... | @@ -3,6 +3,7 @@ import time |
| 3 | import random | 3 | import random |
| 4 | import datetime | 4 | import datetime |
| 5 | import fitz | 5 | import fitz |
| 6 | import shutil | ||
| 6 | from django.utils import timezone | 7 | from django.utils import timezone |
| 7 | from django.db.utils import IntegrityError | 8 | from django.db.utils import IntegrityError |
| 8 | from django.db.models import Q | 9 | from django.db.models import Q |
| ... | @@ -277,13 +278,17 @@ class DocView(GenericView, DocHandler): | ... | @@ -277,13 +278,17 @@ class DocView(GenericView, DocHandler): |
| 277 | random_int = random.randint(0, consts.TIME_NUM) | 278 | random_int = random.randint(0, consts.TIME_NUM) |
| 278 | metadata_version_id = str(int(time.time()) - random_int) | 279 | metadata_version_id = str(int(time.time()) - random_int) |
| 279 | 280 | ||
| 280 | # tmp_save_path = os.path.join(conf.DATA_DIR, '{0}.pdf'.format(metadata_version_id)) | 281 | tmp_save_path = os.path.join(conf.DATA_DIR, '{0}.pdf'.format(metadata_version_id)) |
| 281 | pdf_file = args.get('pdf_file') | 282 | pdf_file = args.get('pdf_file') |
| 282 | # file_write(pdf_file, tmp_save_path) | 283 | file_write(pdf_file, tmp_save_path) |
| 283 | 284 | ||
| 284 | if not fitz.open("pdf", pdf_file).isPDF: | 285 | # if not fitz.open("pdf", pdf_file).isPDF: |
| 286 | file = fitz.Document(tmp_save_path) | ||
| 287 | if not file.isPDF: | ||
| 288 | file.close() | ||
| 285 | raise self.invalid_params(msg='invalid params: not a PDF file') | 289 | raise self.invalid_params(msg='invalid params: not a PDF file') |
| 286 | 290 | ||
| 291 | file.close() | ||
| 287 | # 1. 上传信息记录 | 292 | # 1. 上传信息记录 |
| 288 | application_id = '{0}{1}'.format(consts.FIXED_APPLICATION_ID_PREFIX, metadata_version_id) | 293 | application_id = '{0}{1}'.format(consts.FIXED_APPLICATION_ID_PREFIX, metadata_version_id) |
| 289 | upload_finish_time = timezone.now() | 294 | upload_finish_time = timezone.now() |
| ... | @@ -323,7 +328,8 @@ class DocView(GenericView, DocHandler): | ... | @@ -323,7 +328,8 @@ class DocView(GenericView, DocHandler): |
| 323 | save_dir_path = os.path.join(conf.DATA_DIR, business_type, str(doc.id)) | 328 | save_dir_path = os.path.join(conf.DATA_DIR, business_type, str(doc.id)) |
| 324 | save_file_path = os.path.join(save_dir_path, '{0}.pdf'.format(doc.id)) | 329 | save_file_path = os.path.join(save_dir_path, '{0}.pdf'.format(doc.id)) |
| 325 | os.makedirs(save_dir_path, exist_ok=True) | 330 | os.makedirs(save_dir_path, exist_ok=True) |
| 326 | file_write(pdf_file, save_file_path) | 331 | # file_write(pdf_file, save_file_path) |
| 332 | shutil.move(tmp_save_path, save_file_path) | ||
| 327 | 333 | ||
| 328 | # 4. 选择队列进入 | 334 | # 4. 选择队列进入 |
| 329 | is_priority = False | 335 | is_priority = False | ... | ... |
-
Please register or sign in to post a comment