rewrite imports

This commit is contained in:
Kiryl
2021-10-05 14:01:05 +03:00
parent 236233fff1
commit 943b1f0754
12 changed files with 53 additions and 64 deletions

View File

@@ -1,19 +1,17 @@
import json
import logging
import os
import sys
from functools import partial
from pathlib import Path
from threading import Thread, active_count
from threading import Event
import json
import pika
import logging
from pathlib import Path
from threading import Event
from functools import partial
from threading import Thread, active_count
from src.access import Access
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+',
logging_level=logging.INFO,
logging_format='%(asctime)s - %(levelname)s - %(message)s'):
@@ -27,9 +25,24 @@ def configure_file_logger(name, filename='logs/converter_log.log', filemode='w+'
file_format = logging.Formatter(fmt=logging_format)
file_handler.setFormatter(file_format)
logger.setLevel(logging_level)
return logger
def local_convert_book(filename, locker):
logger = configure_file_logger('consumer')
logger.info(f'Start processing book-{filename}.')
folder_path = os.path.dirname(os.path.abspath("__file__"))
output_path = Path(os.path.join(folder_path, f'json/{filename}.json'))
try:
book = DocxBook(book_id=filename,
main_logger=logger,
libra_locker=locker)
book.test_conversion()
except Exception as exc:
raise exc
logger.info(f'Book-{filename} has been proceeded.')
def convert_book(book_type: [DocxBook, EpubBook], params: dict, logger, book_id):
logger.info(f'Start processing book-{book_id}.')
@@ -79,25 +92,6 @@ def callback(ch, method, properties, body, logger, libra_locker):
finally:
pass
def local_convert_book(filename, locker):
logger = configure_file_logger('consumer', logging_format='%(asctime)s - %(levelname)s - %(message)s')
logger.info(f'Start processing book-{filename}.')
folder_path = os.path.dirname(os.path.abspath("__file__"))
output_path = Path(os.path.join(folder_path, f'json/{filename}.json'))
try:
book = DocxBook(book_id=filename,
main_logger=logger,
libra_locker=locker)
book.test_conversion()
except Exception as exc:
raise exc
logger.info(f'Book-{filename} has been proceeded.')
def local_run(books):
locker = Event()
locker.set()
@@ -110,7 +104,6 @@ def local_run(books):
[x.start() for x in threads]
def server_run():
logger = configure_file_logger('consumer')
@@ -150,5 +143,4 @@ def server_run():
if __name__ == '__main__':
server_run()
server_run()