lxbfYeaa/BookConverter
Archived
Template
1
0
Fork 0
forked from LiveCarta/BookConverter
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite func. set statuses

Browse Source
This commit is contained in:
Kiryl
2021-12-01 14:19:57 +03:00
parent 2e5f666777
commit a5f2a47edf
4 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consumer.py
View File

@@ -22,7 +22,7 @@ def configure_file_logger(name, filename='logs/converter.log', filemode='w+',
file_handler = logging.FileHandler(file_path, mode=filemode)
logger.addHandler(file_handler)
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)
logger.setLevel(logging_level)
return logger

1
src/book_solver.py
View File

@@ -151,4 +151,3 @@ class BookSolver:
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)

9
src/epub_converter/epub_converter.py
View File

@@ -435,12 +435,12 @@ class EpubConverter:
nav_point.href, nav_point.id)]
else:
content: BeautifulSoup = self.html_href2html_body_soup[nav_point.href]
self.old_image_path2aws_path = update_src_links_in_images(content,
self.img_href2img_bytes,
path_to_html=nav_point.href,
access=self.access,
path2aws_path=self.old_image_path2aws_path)
path2aws_path=self.old_image_path2aws_path,
book_id=self.file.stem)
is_chapter = lvl <= LiveCartaConfig.SUPPORTED_LEVELS
title_preprocessed = prepare_title(title)
@@ -466,7 +466,6 @@ class EpubConverter:
for nav_point in top_level_nav_points:
chapter = self.node_to_livecarta_chapter_item(nav_point)
top_level_chapters.append(chapter)
top_level_dict_chapters = [x.to_dict() for x in top_level_chapters]
self.logger.log(f'Anchors found: {len(self.internal_anchors)}.')
self.logger.log('End conversion.')
@@ -481,12 +480,12 @@ if __name__ == "__main__":
logger = logging.getLogger('epub')
stream_handler = logging.StreamHandler()
logger.addHandler(stream_handler)
file_handler = logging.FileHandler('../../epub.log', mode='w+')
file_handler = logging.FileHandler('../../logs/epub.log', mode='w+')
logger.addHandler(file_handler)
logger_object = BookLogger(name=f'epub', main_logger=logger, book_id=0)
json_converter = EpubConverter('../../epub/9781634259804.epub',
json_converter = EpubConverter('../../epub/9781641051217.epub',
logger=logger_object)
tmp = json_converter.convert_to_dict()

44
src/util/helpers.py
View File

@@ -23,6 +23,7 @@ class ColoredFormatter(logging.Formatter):
.format(self.PREFIX, seq, record.levelname, self.SUFFIX)
return logging.Formatter.format(self, record)
class BookLogger:
def __init__(self, name, book_id, main_logger=None,
filemode='w+', logging_level=logging.INFO):
@@ -38,12 +39,14 @@ class BookLogger:
self.main_logger = main_logger
self.logger = logging.getLogger(name)
folder_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
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'
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 in %(funcName)s]')
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)
@@ -73,32 +76,29 @@ class BookStatusWrapper:
self.logger_object = logger_object
self.book_id = book_id
def set_processing(self):
def set_status(self, status: str):
str_2_status = {
'[PROCESS]': self.access.PROCESS,
'[GENERATE]': self.access.GENERATE,
'[ERROR]': self.access.ERROR
}
try:
if self.access:
self.access.update_status(self.book_id, self.access.PROCESS)
self.logger_object.log(f'Status has been updated to [PROCESS].')
self.access.update_status(self.book_id, str_2_status[status])
self.logger_object.log(f'Status has been updated to {status}.')
except Exception as exc:
self.logger_object.log("Can't update status of the book [PROCESS].", logging.ERROR)
self.logger_object.log(
f"Can't update status of the book {status}.", logging.ERROR)
self.logger_object.log_error_to_main_log()
raise exc
def set_processing(self):
self.set_status('[PROCESS]')
def set_generating(self):
try:
if self.access:
self.access.update_status(self.book_id, self.access.GENERATE)
self.logger_object.log(f'Status has been updated to [GENERATE].')
except Exception as exc:
self.logger_object.log("Can't update status of the book [GENERATE].", logging.ERROR)
self.logger_object.log_error_to_main_log()
raise exc
self.set_status('[GENERATE]')
def set_error(self):
try:
if self.access:
self.access.update_status(self.book_id, self.access.ERROR)
self.logger_object.log(f'Status has been updated to [ERROR].')
except Exception as exc:
self.logger_object.log("Can't update status of the book [ERROR].", logging.ERROR)
self.logger_object.log_error_to_main_log()
raise exc
self.set_status('[ERROR]')