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

Download preset on condition

Browse Source
This commit is contained in:
Kibzik
2023-03-16 16:58:23 +03:00
parent da6e05064d
commit e0e9b89cb3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
consumer.py
View File

@@ -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()}.")

17
src/book_solver.py
View File

@@ -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()