From e0e9b89cb37c8510295e2af31289784b6ffc5d04 Mon Sep 17 00:00:00 2001 From: Kibzik Date: Thu, 16 Mar 2023 16:58:23 +0300 Subject: [PATCH] Download preset on condition --- consumer.py | 5 +++-- src/book_solver.py | 17 ++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/consumer.py b/consumer.py index 4f39741..b5fc79a 100644 --- a/consumer.py +++ b/consumer.py @@ -18,9 +18,9 @@ from src.epub_converter.epub_solver import EpubBook def local_convert_book(book_type: [DocxBook, EpubBook], book_id: int, main_logger: logging.Logger, params: dict): main_logger.info(f"Start processing book-{book_id}.") try: - json_file_path = "books/json/9781614382264.json" + json_file_path = "books/json/9781264269044.json" book = book_type(book_id=book_id, main_logger=main_logger, **params) - book.conversion(json_file_path) + book.conversion_local(json_file_path) except Exception as exc: raise exc main_logger.info(f"Book-{book_id} has been proceeded.") @@ -59,6 +59,7 @@ def callback(ch, method, properties, body: bytes, main_logger: logging.Logger, l } thread = Thread(target=convert_book, kwargs=params) + # thread = Thread(target=local_convert_book, kwargs=params) thread.start() logging.log(logging.INFO, f"Active threads: {active_count()}.") # print(f"Active threads: {active_count()}.") diff --git a/src/book_solver.py b/src/book_solver.py index 5a88d20..1e6ffe8 100644 --- a/src/book_solver.py +++ b/src/book_solver.py @@ -78,12 +78,15 @@ class BookSolver: try: self.book_logger.log(f"Start receiving preset file from server. URL:" f" {self.access.url}/doc-convert/{self.book_id}/presets") - # content = self.access.get_file( - # file_path=f"{self.access.url}/doc-convert/{self.book_id}/presets") - # self.book_logger.log("Preset file was received from server.") - # self.preset_path = pathlib.Path( - # str(self.save_file(content, path_to_save="preset", file_type="json"))) - self.preset_path = "preset/epub_presets.json" + content = self.access.get_file( + file_path=f"{self.access.url}/doc-convert/{self.book_id}/presets") + self.book_logger.log("Preset file was received from server.") + if len(content) > 3: + self.preset_path = pathlib.Path( + str(self.save_file(content, path_to_save="preset", file_type="json"))) + else: + self.preset_path = "preset/docx_presets.json" if self.book_type == "docx" \ + else "preset/epub_presets.json" except FileNotFoundError as f_err: self.book_logger.log( "Can't get preset file from server.", logging.ERROR) @@ -169,7 +172,7 @@ class BookSolver: self.status_wrapper.set_processing() content_dict: Dict[str, List[Dict[Union[str, List]]]] = self.get_converted_book() [os.remove(path) for path in [self.book_path, - # self.preset_path + self.preset_path ]] self.book_logger.log("Beginning of processing .json output.") self.status_wrapper.set_generating()