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

Merge pull request #314 from Teqniksoft/kiryl/converter_fix

Browse Source 
Small folder changes
This commit is contained in:
Kiryl
2022-11-08 16:42:04 +03:00
committed by GitHub
parent 707be35a86 7569a2c2c5
commit 7886aeacfa
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/access.py
View File

@@ -42,7 +42,7 @@ class Access:
def set_credentials(self, url: str):
folder_path: str = os.path.dirname(
os.path.dirname(os.path.abspath(__file__)))
config_path: str = os.path.join(folder_path, "config/api_config.json")
config_path: str = os.path.join(folder_path, "configs/api_config.json")
with open(config_path, "r") as f:
params: Dict[str, str] = json.load(f)

8
src/book_solver.py
View File

@@ -77,14 +77,14 @@ class BookSolver:
"""Method for getting and saving preset from server"""
try:
pass
self.preset_path = "presets/docx_presets.json"
self.preset_path = "preset/docx_presets.json"
# self.logger_object.log(f"Start receiving preset file from server. URL:"
# f" {self.access.url}/doc-convert/{self.book_id}/presets")
# f" {self.access.url}/doc-convert/{self.book_id}/preset")
# content = self.access.get_file(
# file_path=f"{self.access.url}/doc-convert/{self.book_id}/presets")
# file_path=f"{self.access.url}/doc-convert/{self.book_id}/preset")
# 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")))
# str(self.save_file(content, path_to_save="preset", file_type="json")))
except FileNotFoundError as f_err:
self.logger_object.log(
"Can't get preset file from server.", logging.ERROR)

4
src/docx_converter/docx_solver.py
View File

@@ -50,7 +50,7 @@ class DocxBook(BookSolver):
# 2. Parses and cleans html, gets list of tags, gets footnotes
try:
html_preprocessor = HtmlPresetsProcessor(
logger=self.logger_object, preset_path="presets/docx_presets.json")
logger=self.logger_object, preset_path="preset/docx_presets.json")
style_preprocessor = StyleReader()
html_processor = HtmlDocxProcessor(html_soup=html_converter.html_soup,
logger=self.logger_object,
@@ -91,7 +91,7 @@ if __name__ == "__main__":
html_converter = Docx2LibreHtml(file_path=docx_file_path,
logger=logger_object, libre_locker=locker)
html_preprocessor = HtmlPresetsProcessor(
logger=logger_object, preset_path="../../presets/docx_presets.json")
logger=logger_object, preset_path="../../preset/docx_presets.json")
style_preprocessor = StyleReader()
html_processor = HtmlDocxProcessor(html_soup=html_converter.html_soup, logger=logger_object,
html_preprocessor=html_preprocessor, style_preprocessor=style_preprocessor)

4
src/epub_converter/epub_solver.py
View File

@@ -35,7 +35,7 @@ class EpubBook(BookSolver):
# Parses and cleans html, gets list of tags, gets footnotes
try:
html_preprocessor = HtmlPresetsProcessor(
logger=self.logger_object, preset_path="presets/epub_presets.json")
logger=self.logger_object, preset_path="preset/epub_presets.json")
html_processor = HtmlEpubProcessor(logger=self.logger_object,
html_preprocessor=html_preprocessor)
except Exception as exc:
@@ -58,7 +58,7 @@ if __name__ == "__main__":
logger_object.configure_book_logger(book_id=epub_file_path.split("/")[-1])
html_preprocessor = HtmlPresetsProcessor(
logger=logger_object, preset_path="../../presets/epub_presets.json")
logger=logger_object, preset_path="../../preset/epub_presets.json")
style_preprocessor = StyleReader()
html_processor = HtmlEpubProcessor(logger=logger_object,
html_preprocessor=html_preprocessor)

2
src/util/check_dirs.py
View File

@@ -20,7 +20,7 @@ def check_dir(dir_path: str):
if __name__ == "__main__":
folders = parse_args().folders
if not folders:
folders = ["books/epub", "books/docx", "books/html", "books/json", "logs", "config"]
folders = ["books/epub", "books/docx", "books/html", "books/json", "logs", "configs"]
folder_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
folders = [os.path.join(folder_path, folder) for folder in folders]