From 2e5f666777f9328c7d15b22262a412f9a23153a9 Mon Sep 17 00:00:00 2001
From: Kiryl <you@example.com>
Date: Tue, 30 Nov 2021 16:00:28 +0300
Subject: [PATCH] Rewrite logger

---
 consumer.py         |  2 +-
 doc/style_config    |  2 +-
 src/book_solver.py  |  3 ++-
 src/util/helpers.py | 10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/consumer.py b/consumer.py
index bab00ac..95770d0 100644
--- a/consumer.py
+++ b/consumer.py
@@ -13,7 +13,7 @@ from src.util.helpers import ColoredFormatter
 from src.docx_converter.docx_solver import DocxBook
 from src.epub_converter.epub_solver import EpubBook
 
-def configure_file_logger(name, filename='logs/converter_log.log', filemode='w+',
+def configure_file_logger(name, filename='logs/converter.log', filemode='w+',
                           logging_level=logging.INFO):
     logger = logging.getLogger(name)
 
diff --git a/doc/style_config b/doc/style_config
index 1ed88cf..30d976a 100644
--- a/doc/style_config
+++ b/doc/style_config
@@ -36,7 +36,7 @@ config.allowedContent = {
             styles: ['*']
         },
         p : {
-            styles: ['text-align', 'text-indent'],
+            styles: ['text-align', 'text-indent', 'border-top', 'border-bottom'],
             classes: ['*']
         },
         strong : {},
diff --git a/src/book_solver.py b/src/book_solver.py
index da67342..bdcaf5c 100644
--- a/src/book_solver.py
+++ b/src/book_solver.py
@@ -144,10 +144,11 @@ class BookSolver:
         without downloading book from server (local)
         with sending to server'''
         try:
-            self.logger_object.log(f'Data has been downloaded from tmp.json file: {self.output_path}')
+            self.logger_object.log(f'Data has been downloaded from tmp.json file: {self.file_path}')
             with codecs.open('json/tmp.json', 'r', encoding='utf-8') as f_json:
                 content_dict = json.load(f_json)
             self.send_json_content_to_server(content_dict)
+            self.logger_object.log(f'End of the conversion to LiveCarta format. Check {self.output_path}.')
         except Exception as exc:
             self.logger_object.log('Error has occurred while reading json file.' + str(exc), logging.ERROR)
 
diff --git a/src/util/helpers.py b/src/util/helpers.py
index b4e03d5..c0c74d4 100644
--- a/src/util/helpers.py
+++ b/src/util/helpers.py
@@ -14,8 +14,8 @@ class ColoredFormatter(logging.Formatter):
     PREFIX = '\033['
     SUFFIX = '\033[0m'
 
-    def __init__(self, patern):
-        logging.Formatter.__init__(self, patern)
+    def __init__(self, pattern):
+        logging.Formatter.__init__(self, pattern)
 
     def format(self, record):
         seq = self.MAPPING.get(record.levelname, 37)  # default white
@@ -40,10 +40,10 @@ class BookLogger:
         self.logger = logging.getLogger(name)
         folder_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         folder_path = os.path.dirname(folder_path)
-        filename = f'logs/{book_id}_log.log'
+        filename = f'logs/{book_id}.log'
         file_path = os.path.join(folder_path, filename)
         file_handler = logging.FileHandler(file_path, mode=filemode)
-        file_format = ColoredFormatter('%(asctime)s - %(levelname)s - %(message)s (%(filename)s:%(lineno)d)')
+        file_format = ColoredFormatter('%(asctime)s - %(levelname)s - %(message)s [%(filename)s:%(lineno)d in %(funcName)s]')
         file_handler.setFormatter(file_format)
         self.logger.addHandler(file_handler)
         self.logger.setLevel(logging_level)
@@ -55,7 +55,7 @@ class BookLogger:
         :param message: body of the message
         :param logging_level: level of logging
         """
-        self.logger.log(msg=message, level=logging_level)
+        self.logger.log(msg=message, level=logging_level, stacklevel=2)
 
     def log_error_to_main_log(self, message=''):
         """