From 009b755a31a97e662c6e883c47952fceb2de65c0 Mon Sep 17 00:00:00 2001 From: Kiryl Date: Thu, 28 Jul 2022 11:52:47 +0300 Subject: [PATCH] Add path to backend preset --- src/access.py | 33 +++++++++++------------ src/epub_converter/epub_converter.py | 2 +- src/epub_converter/html_epub_processor.py | 2 +- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/access.py b/src/access.py index ba8ddb6..6d22202 100644 --- a/src/access.py +++ b/src/access.py @@ -8,28 +8,25 @@ from io import BytesIO class Access: """Class accessing our platform""" - - PENDING = 1 - PROCESS = 2 - GENERATE = 3 - FINISH = 4 - ERROR = 5 - - url = None - username = None - password = None - - token = None - refresh = None - refresh_time = None - headers = None - refreshing = Event() - - def __init__(self, url): + def __init__(self, url=None): """ :param url: str, url received from queue message, if field apiURL exists else None """ + self.PENDING = 1 + self.PROCESS = 2 + self.GENERATE = 3 + self.FINISH = 4 + self.ERROR = 5 + + self.username = None + self.password = None + + self.token = None + self.refresh = None + self.refresh_time = None + self.headers = None + self.refreshing = Event() self.set_credentials(url) self.get_token() diff --git a/src/epub_converter/epub_converter.py b/src/epub_converter/epub_converter.py index b8bccf2..fb3b786 100644 --- a/src/epub_converter/epub_converter.py +++ b/src/epub_converter/epub_converter.py @@ -638,7 +638,7 @@ if __name__ == "__main__": name="epub", book_id=epub_file_path.split("/")[-1]) css_processor = CSSPreprocessor() - html_processor = HtmlEpubPreprocessor("../../presets/presets.json", logger=logger_object) + html_processor = HtmlEpubPreprocessor(logger=logger_object) json_converter = EpubConverter(epub_file_path, logger=logger_object, css_processor=css_processor, html_processor=html_processor) diff --git a/src/epub_converter/html_epub_processor.py b/src/epub_converter/html_epub_processor.py index d8403d1..da2a6c0 100644 --- a/src/epub_converter/html_epub_processor.py +++ b/src/epub_converter/html_epub_processor.py @@ -6,7 +6,7 @@ from src.util.helpers import BookLogger class HtmlEpubPreprocessor: - def __init__(self, preset_path, logger=None): + def __init__(self, preset_path="../../presets/presets.json", logger=None): self.preset = json.load(open(preset_path)) self.logger: BookLogger = logger self.name2function = {