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

Fix #795

Browse Source
This commit is contained in:
Kovid Goyal 2008-06-18 10:09:33 -07:00
parent 474f2cadbb
commit 2265152c77
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/lrf/any/convert_from.py
View File

@ -158,7 +158,10 @@ def main(args=sys.argv, logger=None, gui_mode=False):
print _('No file to convert specified.') print _('No file to convert specified.')
return 1 return 1
return process_file(args[1], options, logger) src = args[1]
if not isinstance(src, unicode):
src = src.decode(sys.getfilesystemencoding())
return process_file(src, options, logger)
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())

7
src/calibre/ebooks/lrf/html/convert_from.py
View File

@ -30,7 +30,7 @@ from calibre.ebooks.lrf import option_parser as lrf_option_parser
from calibre.ebooks import ConversionError from calibre.ebooks import ConversionError
from calibre.ebooks.lrf.html.table import Table from calibre.ebooks.lrf.html.table import Table
from calibre import filename_to_utf8, setup_cli_handlers, __appname__, \ from calibre import filename_to_utf8, setup_cli_handlers, __appname__, \
fit_image, LoggingInterface fit_image, LoggingInterface, preferred_encoding
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre.ebooks.metadata.opf import OPFReader from calibre.ebooks.metadata.opf import OPFReader
from calibre.devices.interface import Device from calibre.devices.interface import Device
@ -1853,6 +1853,8 @@ def process_file(path, options, logger=None):
options.force_page_break = fpb options.force_page_break = fpb
options.link_exclude = le options.link_exclude = le
options.page_break = pb options.page_break = pb
if not isinstance(options.chapter_regex, unicode):
options.chapter_regex = options.chapter_regex.decode(preferred_encoding)
options.chapter_regex = re.compile(options.chapter_regex, re.IGNORECASE) options.chapter_regex = re.compile(options.chapter_regex, re.IGNORECASE)
fpba = options.force_page_break_attr.split(',') fpba = options.force_page_break_attr.split(',')
if len(fpba) != 3: if len(fpba) != 3:
@ -1969,7 +1971,8 @@ def main(args=sys.argv):
except Exception, err: except Exception, err:
print >> sys.stderr, err print >> sys.stderr, err
return 1 return 1
if not isinstance(src, unicode):
src = src.decode(sys.getfilesystemencoding())
process_file(src, options) process_file(src, options)
return 0 return 0

5
src/calibre/parallel.py
View File

@ -11,7 +11,10 @@ from calibre.ebooks.lrf.any.convert_from import main as any2lrf
from calibre.ebooks.lrf.web.convert_from import main as web2lrf from calibre.ebooks.lrf.web.convert_from import main as web2lrf
from calibre.ebooks.lrf.feeds.convert_from import main as feeds2lrf from calibre.ebooks.lrf.feeds.convert_from import main as feeds2lrf
from calibre.gui2.lrf_renderer.main import main as lrfviewer from calibre.gui2.lrf_renderer.main import main as lrfviewer
from calibre.ebooks.lrf.html.table_as_image import do_render as render_table try:
from calibre.ebooks.lrf.html.table_as_image import do_render as render_table
except: # Dont fail is PyQt4.4 not present
render_table = None
from calibre import iswindows, __appname__, islinux from calibre import iswindows, __appname__, islinux
try: try:
from calibre.utils.single_qt_application import SingleApplication from calibre.utils.single_qt_application import SingleApplication