Prod fix(-presets)

This commit is contained in:
Kiryl
2022-08-04 12:35:23 +03:00
parent 9959a04935
commit 2122fb82fa
4 changed files with 15 additions and 13 deletions

View File

@@ -30,7 +30,7 @@ def configure_file_logger(name: str, filename: str = "logs/converter.log", filem
return logger 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}.") logger.info(f"Start processing book-{book_id}.")
try: try:
json_file_path = "books/json/9781614382264.json" json_file_path = "books/json/9781614382264.json"

1
presets/.gitignore vendored
View File

@@ -1,2 +1,3 @@
* *
!.gitignore !.gitignore
!presets.json

View File

@@ -77,13 +77,15 @@ class BookSolver:
def get_preset_file(self): def get_preset_file(self):
"""Method for getting and saving preset from server""" """Method for getting and saving preset from server"""
try: try:
self.logger_object.log(f"Start receiving preset file from server. URL:" pass
f" {self.access.url}/doc-convert/{self.book_id}/presets") self.preset_path = "presets/presets.json"
content = self.access.get_file( # self.logger_object.log(f"Start receiving preset file from server. URL:"
file_path=f"{self.access.url}/doc-convert/{self.book_id}/presets") # f" {self.access.url}/doc-convert/{self.book_id}/presets")
self.logger_object.log("Preset file was received from server.") # content = self.access.get_file(
self.preset_path = pathlib.Path( # file_path=f"{self.access.url}/doc-convert/{self.book_id}/presets")
str(self.save_file(content, path_to_save="presets", file_type="json"))) # 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: except FileNotFoundError as f_err:
self.logger_object.log( self.logger_object.log(
"Can't get preset file from server.", logging.ERROR) "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.") f"Beginning of conversion from .{self.book_type} to .json.")
self.status_wrapper.set_processing() self.status_wrapper.set_processing()
content_dict: Dict[str, List[Dict[Union[str, List]]]] = self.get_converted_book() 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.logger_object.log("Beginning of processing .json output.")
self.status_wrapper.set_generating() self.status_wrapper.set_generating()
self.write_to_json(content_dict) self.write_to_json(content_dict)

View File

@@ -16,10 +16,8 @@ class EpubBook(BookSolver):
Function Function
Steps Steps
---------- ----------
1. Gets data from preset structure 1. Converts .epub to .html
2. Add preset to html preprocessor 2. Parses from line structure to nested structure
3. Converts .epub to .html
4. Parses from line structure to nested structure
Returns Returns
---------- ----------