From 2122fb82fa656f190e98ef0a2a2f19add5ee9144 Mon Sep 17 00:00:00 2001
From: Kiryl <kiryl.miatselitsa@teqniksoft.com>
Date: Thu, 4 Aug 2022 12:35:23 +0300
Subject: [PATCH] Prod fix(-presets)

---
 consumer.py                       |  2 +-
 presets/.gitignore                |  1 +
 src/book_solver.py                | 19 +++++++++++--------
 src/epub_converter/epub_solver.py |  6 ++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/consumer.py b/consumer.py
index c6b47d5..28d5e20 100644
--- a/consumer.py
+++ b/consumer.py
@@ -30,7 +30,7 @@ def configure_file_logger(name: str, filename: str = "logs/converter.log", filem
     return logger
 
 
-def local_convert_book(book_type: [DocxBook, EpubBook], book_id, logger: logging.Logger, params: dict):
+def local_convert_book(book_type: [DocxBook, EpubBook], book_id: int, logger: logging.Logger, params: dict):
     logger.info(f"Start processing book-{book_id}.")
     try:
         json_file_path = "books/json/9781614382264.json"
diff --git a/presets/.gitignore b/presets/.gitignore
index d6b7ef3..c5fb5c6 100644
--- a/presets/.gitignore
+++ b/presets/.gitignore
@@ -1,2 +1,3 @@
 *
 !.gitignore
+!presets.json
\ No newline at end of file
diff --git a/src/book_solver.py b/src/book_solver.py
index f11946e..3479d6b 100644
--- a/src/book_solver.py
+++ b/src/book_solver.py
@@ -77,13 +77,15 @@ class BookSolver:
     def get_preset_file(self):
         """Method for getting and saving preset from server"""
         try:
-            self.logger_object.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.logger_object.log("Preset file was received from server.")
-            self.preset_path = pathlib.Path(
-                str(self.save_file(content, path_to_save="presets", file_type="json")))
+            pass
+            self.preset_path = "presets/presets.json"
+            # self.logger_object.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.logger_object.log("Preset file was received from server.")
+            # self.preset_path = pathlib.Path(
+            #     str(self.save_file(content, path_to_save="presets", file_type="json")))
         except FileNotFoundError as f_err:
             self.logger_object.log(
                 "Can't get preset file from server.", logging.ERROR)
@@ -168,7 +170,8 @@ class BookSolver:
                 f"Beginning of conversion from .{self.book_type} to .json.")
             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.preset_path, self.book_path]]
+            # todo add delete of preset path
+            [os.remove(path) for path in [self.book_path]]
             self.logger_object.log("Beginning of processing .json output.")
             self.status_wrapper.set_generating()
             self.write_to_json(content_dict)
diff --git a/src/epub_converter/epub_solver.py b/src/epub_converter/epub_solver.py
index 69b0c04..58336e7 100644
--- a/src/epub_converter/epub_solver.py
+++ b/src/epub_converter/epub_solver.py
@@ -16,10 +16,8 @@ class EpubBook(BookSolver):
         Function
         Steps
         ----------
-        1. Gets data from preset structure
-        2. Add preset to html preprocessor
-        3. Converts .epub to .html
-        4. Parses from line structure to nested structure
+        1. Converts .epub to .html
+        2. Parses from line structure to nested structure
 
         Returns
         ----------