Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add baen option. Needs testing

Browse Source
This commit is contained in:
Kovid Goyal 2007-05-06 16:05:47 +00:00
parent 09eb8f2db0
commit 6ca0b3c143
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libprs500/device.py
View File

@ -115,14 +115,16 @@ class Device(object):
""" """
raise NotImplementedError() raise NotImplementedError()
def _safe(func):
@wraps(func)
def run_in_thread(*args, **kwargs):
dm = args[0]
dm
class DeviceManager(object): class DeviceManager(object):
def threaded(func):
@wraps(func)
def run_in_thread(*args, **kwargs):
dm = args[0]
dm
def __init__(self, device): def __init__(self, device):
if not isinstance(device, Device): if not isinstance(device, Device):
raise TypeError, '%s must implement the Device interface' % (str(device),) raise TypeError, '%s must implement the Device interface' % (str(device),)

20
src/libprs500/lrf/html/convert_from.py
View File

@ -208,11 +208,14 @@ class Span(_Span):
class HTMLConverter(object): class HTMLConverter(object):
SELECTOR_PAT = re.compile(r"([A-Za-z0-9\-\_\:\.]+[A-Za-z0-9\-\_\:\.\s\,]*)\s*\{([^\}]*)\}") SELECTOR_PAT = re.compile(r"([A-Za-z0-9\-\_\:\.]+[A-Za-z0-9\-\_\:\.\s\,]*)\s*\{([^\}]*)\}")
IGNORED_TAGS = (Comment, Declaration, ProcessingInstruction) IGNORED_TAGS = (Comment, Declaration, ProcessingInstruction)
BAEN_SANCTIFY = [(re.compile(r'<[Aa] id=.p[0-9]*. name=.p[0-9]*.><\/[Aa]>'),
lambda match: ''),
(re.compile('page-break-before:'), lambda match: '') ]
# Fix <a /> elements # Fix <a /> elements
markup_massage = [(re.compile("(<\s*[aA]\s+.*\/)\s*>"), MARKUP_MASSAGE = [(re.compile("(<\s*[aA]\s+.*\/)\s*>"),
lambda match: match.group(1)+"></a>")] lambda match: match.group(1)+"></a>")]
class Link(object): class Link(object):
@ -240,7 +243,7 @@ class HTMLConverter(object):
def __init__(self, book, path, width=575, height=747, def __init__(self, book, path, width=575, height=747,
font_delta=0, verbose=False, cover=None, font_delta=0, verbose=False, cover=None,
max_link_levels=sys.maxint, link_level=0, max_link_levels=sys.maxint, link_level=0,
is_root=True): is_root=True, baen=False):
''' '''
Convert HTML file at C{path} and add it to C{book}. After creating Convert HTML file at C{path} and add it to C{book}. After creating
the object, you must call L{self.process_links} on it to create the links and the object, you must call L{self.process_links} on it to create the links and
@ -296,7 +299,9 @@ class HTMLConverter(object):
print '\tParsing HTML...', print '\tParsing HTML...',
sys.stdout.flush() sys.stdout.flush()
nmassage = copy.copy(BeautifulSoup.MARKUP_MASSAGE) nmassage = copy.copy(BeautifulSoup.MARKUP_MASSAGE)
nmassage.extend(HTMLConverter.markup_massage) nmassage.extend(HTMLConverter.MARKUP_MASSAGE)
if baen:
nmassage.extend(HTMLConverter.BAEN_SANCTIFY)
self.soup = BeautifulSoup(open(self.file_name, 'r').read(), self.soup = BeautifulSoup(open(self.file_name, 'r').read(),
convertEntities=BeautifulSoup.HTML_ENTITIES, convertEntities=BeautifulSoup.HTML_ENTITIES,
markupMassage=nmassage) markupMassage=nmassage)
@ -870,7 +875,8 @@ def process_file(path, options):
header.append(Italic(options.author)) header.append(Italic(options.author))
book = Book(header=header, **args) book = Book(header=header, **args)
conv = HTMLConverter(book, path, font_delta=options.font_delta, conv = HTMLConverter(book, path, font_delta=options.font_delta,
cover=cpath, max_link_levels=options.link_levels) cover=cpath, max_link_levels=options.link_levels,
baen=options.baen)
conv.process_links() conv.process_links()
oname = options.output oname = options.output
if not oname: if not oname:
@ -903,6 +909,8 @@ def main():
help='''The maximum number of levels to recursively process help='''The maximum number of levels to recursively process
links. A value of 0 means thats links are not followed. links. A value of 0 means thats links are not followed.
A negative value means that <a> tags are ignored.''') A negative value means that <a> tags are ignored.''')
parser.add_option('--baen', action='store_true', default=False, dest='baen',
help='''Preprocess Baen HTML files to improve generated LRF.''')
options, args = parser.parse_args() options, args = parser.parse_args()
if len(args) != 1: if len(args) != 1:
parser.print_help() parser.print_help()