From db55fd4df7013c2be26f058e68b9797f9094a989 Mon Sep 17 00:00:00 2001 From: gryf Date: Wed, 30 Sep 2020 18:59:02 +0200 Subject: [PATCH] Removed unused setup_cli_handlers function --- ebook_converter/__init__.py | 23 ------ ebook_converter/ebooks/lrf/lrfparser.py | 103 +++++++++++------------- 2 files changed, 47 insertions(+), 79 deletions(-) diff --git a/ebook_converter/__init__.py b/ebook_converter/__init__.py index d0c029f..e4f3e23 100644 --- a/ebook_converter/__init__.py +++ b/ebook_converter/__init__.py @@ -1,11 +1,9 @@ import html -import logging import math import mimetypes import os import pkg_resources import re -import sys from functools import partial @@ -67,27 +65,6 @@ def sanitize_file_name(name, substitute='_'): return one -def setup_cli_handlers(logger, level): - if os.getenv('CALIBRE_WORKER') and logger.handlers: - return - logger.setLevel(level) - if level == logging.WARNING: - handler = logging.StreamHandler(sys.stdout) - handler.setFormatter(logging.Formatter('%(levelname)s: %(message)s')) - handler.setLevel(logging.WARNING) - elif level == logging.INFO: - handler = logging.StreamHandler(sys.stdout) - handler.setFormatter(logging.Formatter()) - handler.setLevel(logging.INFO) - elif level == logging.DEBUG: - handler = logging.StreamHandler(sys.stderr) - handler.setLevel(logging.DEBUG) - handler.setFormatter(logging.Formatter('[%(levelname)s] %(filename)s:' - '%(lineno)s: %(message)s')) - - logger.addHandler(handler) - - def fit_image(width, height, pwidth, pheight): """ Fit image in box of width pwidth and height pheight. diff --git a/ebook_converter/ebooks/lrf/lrfparser.py b/ebook_converter/ebooks/lrf/lrfparser.py index 6b876a5..8766247 100644 --- a/ebook_converter/ebooks/lrf/lrfparser.py +++ b/ebook_converter/ebooks/lrf/lrfparser.py @@ -1,12 +1,12 @@ -import sys, array, os, re, codecs, logging -from itertools import chain +import array +import itertools +import re -from ebook_converter import setup_cli_handlers from ebook_converter.utils.config import OptionParser from ebook_converter.utils.filenames import ascii_filename from ebook_converter.ebooks.lrf.meta import LRFMetaFile -from ebook_converter.ebooks.lrf.objects import get_object, PageTree, StyleObject, \ - Font, Text, TOCObject, BookAttr, ruby_tags +from ebook_converter.ebooks.lrf.objects import get_object, PageTree, \ + StyleObject, Font, Text, TOCObject, BookAttr, ruby_tags class LRFDocument(LRFMetaFile): @@ -26,8 +26,9 @@ class LRFDocument(LRFMetaFile): def parse(self): self._parse_objects() self.metadata = LRFDocument.temp() - for a in ('title', 'title_reading', 'author', 'author_reading', 'book_id', - 'classification', 'free_text', 'publisher', 'label', 'category'): + for a in ('title', 'title_reading', 'author', 'author_reading', + 'book_id', 'classification', 'free_text', 'publisher', + 'label', 'category'): setattr(self.metadata, a, getattr(self, a)) self.doc_info = LRFDocument.temp() for a in ('thumbnail', 'language', 'creator', 'producer', 'page'): @@ -40,8 +41,10 @@ class LRFDocument(LRFMetaFile): def _parse_objects(self): self.objects = {} self._file.seek(self.object_index_offset) - obj_array = array.array("I", self._file.read(4*4*self.number_of_objects)) - if ord(array.array("i",[1]).tostring()[0:1])==0: # big-endian + obj_array = array.array("I", + self._file.read(4 * 4 * + self.number_of_objects)) + if ord(array.array("i", [1]).tostring()[0:1]) == 0: # big-endian obj_array.byteswap() for i in range(self.number_of_objects): if not self.keep_parsing: @@ -55,7 +58,8 @@ class LRFDocument(LRFMetaFile): obj.initialize() def _parse_object(self, objid, objoff, objsize): - obj = get_object(self, self._file, objid, objoff, objsize, self.scramble_key) + obj = get_object(self, self._file, objid, objoff, objsize, + self.scramble_key) self.objects[objid] = obj if isinstance(obj, PageTree): self.page_trees.append(obj) @@ -73,31 +77,44 @@ class LRFDocument(LRFMetaFile): yield pt def write_files(self): - for obj in chain(self.image_map.values(), self.font_map.values()): + for obj in itertools.chain(self.image_map.values(), + self.font_map.values()): with open(obj.file, 'wb') as f: f.write(obj.stream) def to_xml(self, write_files=True): - bookinfo = '\n\n\n' - bookinfo += '%s\n'%(self.metadata.title_reading, self.metadata.title) - bookinfo += '%s\n'%(self.metadata.author_reading, self.metadata.author) - bookinfo += '%s\n'%(self.metadata.book_id,) - bookinfo += '%s\n'%(self.metadata.publisher,) - bookinfo += '\n'%(self.metadata.label,) - bookinfo += '%s\n'%(self.metadata.category,) - bookinfo += '%s\n'%(self.metadata.classification,) - bookinfo += '%s\n\n\n'%(self.metadata.free_text,) + bookinfo = ('\n\n\n' + '%s\n' + '%s\n' + '%s\n' + '%s\n' + '\n' + '%s\n' + '%s\n' + '%s\n' + '\n\n' % + (self.metadata.title_reading, self.metadata.title, + self.metadata.author_reading, self.metadata.author, + self.metadata.book_id, self.metadata.publisher, + self.metadata.label, self.metadata.category, + self.metadata.classification, self.metadata.free_text)) th = self.doc_info.thumbnail if th: prefix = ascii_filename(self.metadata.title) - bookinfo += '\n'%(prefix+'_thumbnail.'+self.doc_info.thumbnail_extension,) + bookinfo += ('\n' % + (prefix + '_thumbnail.' + + self.doc_info.thumbnail_extension)) if write_files: - with open(prefix+'_thumbnail.'+self.doc_info.thumbnail_extension, 'wb') as f: + with open(prefix + '_thumbnail.' + + self.doc_info.thumbnail_extension, 'wb') as f: f.write(th) - bookinfo += '%s\n'%(self.doc_info.language,) - bookinfo += '%s\n'%(self.doc_info.creator,) - bookinfo += '%s\n'%(self.doc_info.producer,) - bookinfo += '%s\n\n\n%s\n'%(self.doc_info.page,self.toc) + bookinfo += ('%s\n' + '%s\n' + '%s\n' + '%s\n' + '\n\n%s\n' % + (self.doc_info.language, self.doc_info.creator, + self.doc_info.producer, self.doc_info.page, self.toc)) pages = '' done_main = False pt_id = -1 @@ -108,15 +125,16 @@ class LRFDocument(LRFMetaFile): close = '\n' pt_id = page_tree.id else: - pages += '\n'%(page_tree.id,) + pages += '\n' % (page_tree.id,) close = '\n' for page in page_tree: pages += str(page) pages += close - traversed_objects = [int(i) for i in re.findall(r'objid="(\w+)"', pages)] + [pt_id] + traversed_objects = [int(i) for i in re.findall(r'objid="(\w+)"', + pages)] + [pt_id] objects = '\n\n' - styles = '\n