Fix more indent errors in Mobi reader from auto formating

This commit is contained in:
John Schember 2009-05-22 06:56:51 -04:00
parent d05c344b6e
commit 9b890e279d
3 changed files with 10 additions and 9 deletions

View File

@ -438,7 +438,7 @@ class MobiReader(object):
tag.attrib.pop('xmlns', '')
if tag.tag in ('country-region', 'place', 'placetype', 'placename',
'state', 'city', 'street', 'address', 'content'):
tag.tag = 'div' if tag.tag == 'content' else 'span'
tag.tag = 'div' if tag.tag == 'content' else 'span'
for key in tag.attrib.keys():
tag.attrib.pop(key)
continue
@ -527,7 +527,7 @@ class MobiReader(object):
opf.cover = 'images/%05d.jpg' % 1
if not os.path.exists(os.path.join(os.path.dirname(htmlfile),
* opf.cover.split('/'))):
opf.cover = None
opf.cover = None
manifest = [(htmlfile, 'text/x-oeb1-document'),
(os.path.abspath('styles.css'), 'text/css')]

View File

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from __future__ import with_statement
__license__ = 'GPL 3'
__copyright__ = '2009, John Schember <john@nachtimwald.com>'
@ -12,7 +11,7 @@ from calibre.ebooks.pdf.pdftohtml import pdftohtml
from calibre.ebooks.metadata.opf2 import OPFCreator
class PDFInput(InputFormatPlugin):
name = 'PDF Input'
author = 'John Schember'
description = 'Convert PDF files to HTML'
@ -21,10 +20,10 @@ class PDFInput(InputFormatPlugin):
def convert(self, stream, options, file_ext, log,
accelerators):
html = pdftohtml(stream.name)
with open('index.html', 'wb') as index:
index.write(html)
from calibre.ebooks.metadata.meta import get_metadata
mi = get_metadata(stream, 'pdf')
opf = OPFCreator(os.getcwd(), mi)
@ -32,5 +31,5 @@ class PDFInput(InputFormatPlugin):
opf.create_spine(['index.html'])
with open('metadata.opf', 'wb') as opffile:
opf.render(opffile)
return os.path.join(os.getcwd(), 'metadata.opf')

View File

@ -1,12 +1,14 @@
# -*- coding: utf-8 -*-
from __future__ import with_statement
__license__ = 'GPL 3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>, ' \
'2009, John Schember <john@nachtimwald.com>'
__docformat__ = 'restructuredtext en'
import errno, os, sys, subprocess
import errno
import os
import sys
import subprocess
from functools import partial
from calibre.ebooks import ConversionError, DRMError