forked from LiveCarta/BookConverter
epub converter: files and classes renaming
This commit is contained in:
@@ -6,8 +6,8 @@ from subprocess import PIPE
|
||||
from threading import Event
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from html_preprocessor import HTMLPreprocessor
|
||||
from json_postprocessor import JSONConverter
|
||||
from html_docx_preprocessor import HTMLDocxPreprocessor
|
||||
from json_postprocessor import DocxHTML2JSONConverter
|
||||
from src.solver import BookSolver
|
||||
|
||||
|
||||
@@ -117,9 +117,9 @@ class DocxBook(BookSolver):
|
||||
|
||||
def convert_from_html(self):
|
||||
html_soup = self.read_html()
|
||||
parser = HTMLPreprocessor(html_soup, self.logger_object)
|
||||
parser = HTMLDocxPreprocessor(html_soup, self.logger_object)
|
||||
content, footnotes, top_level_headers = parser.process_html(self.access, self.html_path, self.book_id)
|
||||
json_converter = JSONConverter(content, footnotes, top_level_headers, self.logger_object, self.status_wrapper)
|
||||
json_converter = DocxHTML2JSONConverter(content, footnotes, top_level_headers, self.logger_object, self.status_wrapper)
|
||||
content_dict = json_converter.convert_to_dict()
|
||||
self.write_to_json(content_dict)
|
||||
self.write_html_from_list(parser.body_tag)
|
||||
@@ -137,13 +137,13 @@ class DocxBook(BookSolver):
|
||||
html_soup = self.read_html()
|
||||
self.logger_object.log('Beginning of processing .html file.')
|
||||
|
||||
parser = HTMLPreprocessor(html_soup, self.logger_object)
|
||||
parser = HTMLDocxPreprocessor(html_soup, self.logger_object)
|
||||
bs_tags, footnotes, top_level_headers = parser.process_html(self.access, self.html_path, self.book_id)
|
||||
|
||||
self.logger_object.log('Beginning of processing json output.')
|
||||
self.status_wrapper.set_generating()
|
||||
|
||||
json_converter = JSONConverter(bs_tags, footnotes, top_level_headers, self.logger_object, self.status_wrapper)
|
||||
json_converter = DocxHTML2JSONConverter(bs_tags, footnotes, top_level_headers, self.logger_object, self.status_wrapper)
|
||||
content_dict = json_converter.convert_to_dict()
|
||||
return content_dict
|
||||
|
||||
|
||||
Reference in New Issue
Block a user