Merge branch 'feature/main2' into feature/main

@@ -641,8 +641,12 @@ class Command(BaseCommand, LoggerMixin):
                                           '[license_summary={4}]'.format(self.log_base, task_str, bs_summary,
                                           '[license_summary={4}]'.format(self.log_base, task_str, bs_summary,
                                                                          unknown_summary, license_summary))
                                                                          unknown_summary, license_summary))
 
 
+                    self.license_log.info('[license_summary={0}]'.format(license_summary))
+
                     merged_bs_summary = self.rebuild_bs_summary(bs_summary, unknown_summary)
                     merged_bs_summary = self.rebuild_bs_summary(bs_summary, unknown_summary)
 
 
+                    self.bs_log.info('[bs_summary={0}]'.format(merged_bs_summary))
+
                     self.cronjob_log.info('{0} [task={1}] [merged_bs_summary={2}] [unknown_summary={3}] '
                     self.cronjob_log.info('{0} [task={1}] [merged_bs_summary={2}] [unknown_summary={3}] '
                                           '[res_list={4}]'.format(self.log_base, task_str, merged_bs_summary,
                                           '[res_list={4}]'.format(self.log_base, task_str, merged_bs_summary,
                                                                   unknown_summary, res_list))
                                                                   unknown_summary, res_list))

@@ -40,6 +40,8 @@ class LoggerMixin:
     exception_log = logging.getLogger('exception')
     exception_log = logging.getLogger('exception')
     cronjob_log = logging.getLogger('cronjob')
     cronjob_log = logging.getLogger('cronjob')
     folder_log = logging.getLogger('folder')
     folder_log = logging.getLogger('folder')
+    bs_log = logging.getLogger('bs')
+    license_log = logging.getLogger('license')
 
 
 
 
 class GenericView(LoggerMixin, GenericExceptionMixin, GenericAPIView):
 class GenericView(LoggerMixin, GenericExceptionMixin, GenericAPIView):

@@ -84,6 +84,12 @@ class PDFHandler:
     def extract_single_image(self, pdf, xref, smask, colorspace, pno, img_index=0):
     def extract_single_image(self, pdf, xref, smask, colorspace, pno, img_index=0):
         pix = self.recover_pix(pdf, xref, smask, colorspace)
         pix = self.recover_pix(pdf, xref, smask, colorspace)
         ext, img_data = self.get_img_data(pix)
         ext, img_data = self.get_img_data(pix)
+        if ext == 'jpx':
+            img_save_path = self.get_img_save_path(pno, img_index=img_index, ext='jpeg')
+            jpx_pix = fitz.Pixmap(img_data)
+            jpx_pix.writeImage(img_save_path)
+            jpx_pix = None
+        else:
             img_save_path = self.get_img_save_path(pno, img_index=img_index, ext=ext)
             img_save_path = self.get_img_save_path(pno, img_index=img_index, ext=ext)
             with open(img_save_path, "wb") as f:
             with open(img_save_path, "wb") as f:
                 f.write(img_data)
                 f.write(img_data)

 [loggers]
 [loggers]
-keys=root, running, exception, cronjob, folder, django.db.backends
+keys=root, running, exception, cronjob, folder, bs, license, django.db.backends
 
 
 [handlers]
 [handlers]
-keys=consoleHandler, django_rotateFileHandler, exceptionFileHandler, cronjobFileHandler, folderFileHandler, djangodbFileHandler
+keys=consoleHandler, django_rotateFileHandler, exceptionFileHandler, cronjobFileHandler, folderFileHandler, bsFileHandler, licenseFileHandler, djangodbFileHandler
 
 
 [formatters]
 [formatters]
-keys=SituFormatter, dataLogFormatter
+keys=SituFormatter, dataLogFormatter, SimpleFormatter
 
 
 [formatter_SituFormatter]
 [formatter_SituFormatter]
 format=[%(asctime)s] [%(process)d] [%(thread)d] [%(threadName)s] [%(filename)s:%(lineno)d] %(levelname)s %(message)s
 format=[%(asctime)s] [%(process)d] [%(thread)d] [%(threadName)s] [%(filename)s:%(lineno)d] %(levelname)s %(message)s
@@ -15,6 +15,10 @@ datefmt=
 class=situlogger.JsonFormatter
 class=situlogger.JsonFormatter
 format=%(asctime)s %(levelname)s %(funcName)s
 format=%(asctime)s %(levelname)s %(funcName)s
 
 
+[formatter_SimpleFormatter]
+format=[%(asctime)s] %(message)s
+datefmt=
+
 [handler_consoleHandler]
 [handler_consoleHandler]
 class=StreamHandler
 class=StreamHandler
 level=ERROR
 level=ERROR
@@ -45,6 +49,18 @@ level=DEBUG
 formatter=SituFormatter
 formatter=SituFormatter
 args=('../logs/folder_ocr.log',)
 args=('../logs/folder_ocr.log',)
 
 
+[handler_bsFileHandler]
+class=situlogger.SituRotatingFileHandler
+level=DEBUG
+formatter=SimpleFormatter
+args=('../logs/bs_statistics.log',)
+
+[handler_licenseFileHandler]
+class=situlogger.SituRotatingFileHandler
+level=DEBUG
+formatter=SimpleFormatter
+args=('../logs/license_statistics.log',)
+
 [handler_djangodbFileHandler]
 [handler_djangodbFileHandler]
 class=situlogger.SituRotatingFileHandler
 class=situlogger.SituRotatingFileHandler
 level=DEBUG
 level=DEBUG
@@ -79,6 +95,18 @@ handlers=folderFileHandler
 qualname=folder
 qualname=folder
 propagate=0
 propagate=0
 
 
+[logger_bs]
+level=INFO
+handlers=bsFileHandler
+qualname=bs
+propagate=0
+
+[logger_license]
+level=INFO
+handlers=licenseFileHandler
+qualname=license
+propagate=0
+
 [logger_django.db.backends]
 [logger_django.db.backends]
 level=DEBUG
 level=DEBUG
 handlers=djangodbFileHandler
 handlers=djangodbFileHandler