From 8a47f74e8b8c87822d825dc569d1589d56646de4 Mon Sep 17 00:00:00 2001 From: shirshasa Date: Mon, 26 Apr 2021 15:25:21 +0300 Subject: [PATCH] epub converter: fix importing --- src/consumer.py | 2 +- src/{util => }/css_reader.py | 9 ++------- src/docx_converter.py | 4 ++-- src/epub_converter.py | 4 ++-- src/epub_postprocessor.py | 6 +++--- src/html_epub_preprocessor.py | 4 ++-- src/html_preprocessor.py | 2 +- src/json_postprocessor.py | 2 +- src/{config.py => livecarta_config.py} | 2 -- 9 files changed, 14 insertions(+), 21 deletions(-) rename src/{util => }/css_reader.py (97%) rename src/{config.py => livecarta_config.py} (99%) diff --git a/src/consumer.py b/src/consumer.py index 948b014..7a0a6d5 100644 --- a/src/consumer.py +++ b/src/consumer.py @@ -11,7 +11,7 @@ import pika from access import Access from docx_converter import Book -from src.epub_converter import EpubBook +from epub_converter import EpubBook def configure_file_logger(name, filename='logs/converter_log.log', filemode='w+', diff --git a/src/util/css_reader.py b/src/css_reader.py similarity index 97% rename from src/util/css_reader.py rename to src/css_reader.py index b7977b3..6bb7d6a 100644 --- a/src/util/css_reader.py +++ b/src/css_reader.py @@ -7,8 +7,8 @@ from premailer import transform from itertools import takewhile from logging import CRITICAL -from src.config import LawCartaConfig -from src.util.color_reader import str2color_name +from livecarta_config import LawCartaConfig +from util.color_reader import str2color_name cssutils.log.setLevel(CRITICAL) @@ -103,11 +103,6 @@ def check_style_to_be_tag(style): return to_remove -''' -LATER: -text-transform: uppercase; -text-decoration-color: red; -''' def clean_css(css): diff --git a/src/docx_converter.py b/src/docx_converter.py index ac317d7..267387b 100644 --- a/src/docx_converter.py +++ b/src/docx_converter.py @@ -7,9 +7,9 @@ import subprocess from subprocess import PIPE from threading import Event -from bs4 import BeautifulSoup, NavigableString +from bs4 import BeautifulSoup -from config import BookLogger, BookApiWrapper, LawCartaConfig +from livecarta_config import BookLogger, BookApiWrapper, LawCartaConfig from html_preprocessor import HTMLPreprocessor from json_postprocessor import JSONConverter diff --git a/src/epub_converter.py b/src/epub_converter.py index 9178a91..79df20e 100644 --- a/src/epub_converter.py +++ b/src/epub_converter.py @@ -4,8 +4,8 @@ import logging import os import pathlib -from config import BookLogger, BookApiWrapper, LawCartaConfig -from src.epub_postprocessor import EpubPostprocessor +from livecarta_config import BookLogger, BookApiWrapper, LawCartaConfig +from epub_postprocessor import EpubPostprocessor class EpubBook: diff --git a/src/epub_postprocessor.py b/src/epub_postprocessor.py index 8c23edd..0e8ed37 100644 --- a/src/epub_postprocessor.py +++ b/src/epub_postprocessor.py @@ -9,8 +9,8 @@ from bs4 import BeautifulSoup from ebooklib import epub from ebooklib.epub import Link, Section -from src.data_objects import ChapterItem, NavPoint -from src.html_epub_preprocessor import unwrap_structural_tags, get_tags_between_ids, prepare_title_and_content, \ +from data_objects import ChapterItem, NavPoint +from html_epub_preprocessor import unwrap_structural_tags, get_tags_between_ids, prepare_title_and_content, \ update_src_links_in_images, preprocess_footnotes # epub3 examples: @@ -27,7 +27,7 @@ from src.html_epub_preprocessor import unwrap_structural_tags, get_tags_between_ # поиск toc в epublib: # если в content.opf есть в spine toc атрибут -> можно найти ncx файл -> из него достать navMap # если его там нет, пробуют искать nav tag в manifest -> EpubNav. -from src.util.css_reader import clean_css, add_inline_style_to_html_soup +from css_reader import clean_css, add_inline_style_to_html_soup class EpubPostprocessor: diff --git a/src/html_epub_preprocessor.py b/src/html_epub_preprocessor.py index d7ab675..6e6f638 100644 --- a/src/html_epub_preprocessor.py +++ b/src/html_epub_preprocessor.py @@ -5,8 +5,8 @@ from typing import List from bs4 import BeautifulSoup, NavigableString, Tag -from src.access import Access -from src.config import LawCartaConfig +from access import Access +from livecarta_config import LawCartaConfig def save_image_locally(img_file_path, img_content, book_id): diff --git a/src/html_preprocessor.py b/src/html_preprocessor.py index 62cec38..c82607d 100644 --- a/src/html_preprocessor.py +++ b/src/html_preprocessor.py @@ -6,7 +6,7 @@ from shutil import copyfile from bs4 import BeautifulSoup, NavigableString -from config import LawCartaConfig, BookLogger, BookApiWrapper +from livecarta_config import LawCartaConfig, BookLogger, BookApiWrapper class HTMLPreprocessor: diff --git a/src/json_postprocessor.py b/src/json_postprocessor.py index f613cf9..e67b793 100644 --- a/src/json_postprocessor.py +++ b/src/json_postprocessor.py @@ -2,7 +2,7 @@ import logging import re from copy import copy -from config import LawCartaConfig +from livecarta_config import LawCartaConfig class JSONConverter: diff --git a/src/config.py b/src/livecarta_config.py similarity index 99% rename from src/config.py rename to src/livecarta_config.py index 6e14f6e..87ce55d 100644 --- a/src/config.py +++ b/src/livecarta_config.py @@ -1,8 +1,6 @@ import logging import os -from access import Access - class BookLogger: def __init__(self, name, book_id, main_logger=None,