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

IGN:Handle HTML files containing only an image in html2lrf. Fixe regression that was causing jobs that failed in the GUI to be marked successfull

Browse Source
This commit is contained in:
Kovid Goyal 2008-09-12 14:43:55 -07:00
parent fdf4c4342f
commit f7bf112ae2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ class HTMLConverter(object, LoggingInterface):
return tb return tb
for page in list(self.book.pages()[index+1:]): for page in list(self.book.pages()[index+1:]):
for c in page.contents: for c in page.contents:
if isinstance(c, (TextBlock, ImageBlock)): if isinstance(c, (TextBlock, ImageBlock, Canvas)):
return c return c
raise ConversionError(_('Could not parse file: %s')%self.file_name) raise ConversionError(_('Could not parse file: %s')%self.file_name)

9
src/calibre/parallel.py
View File

@ -466,7 +466,9 @@ class Overseer(object):
self.job.update_status(percent, msg) self.job.update_status(percent, msg)
elif word == 'ERROR': elif word == 'ERROR':
self.write('OK') self.write('OK')
self.job.excetion, self.job.traceback = cPickle.loads(msg) exception, traceback = cPickle.loads(msg)
self.job.output(u'%s\n%s'%(exception, traceback))
self.job.exception, self.job.traceback = exception, traceback
return True return True
else: else:
self.terminate() self.terminate()
@ -914,10 +916,11 @@ def worker(host, port):
write(client_socket, 'RESULT:'+ cPickle.dumps(result)) write(client_socket, 'RESULT:'+ cPickle.dumps(result))
except BaseException, err: except BaseException, err:
exception = (err.__class__.__name__, unicode(str(err), 'utf-8', 'replace')) exception = (err.__class__.__name__, unicode(str(err), 'utf-8', 'replace'))
tb = traceback.format_exc() tb = unicode(traceback.format_exc(), 'utf-8', 'replace')
msg = 'ERROR:'+cPickle.dumps((exception, tb),-1) msg = 'ERROR:'+cPickle.dumps((exception, tb),-1)
write(client_socket, msg) write(client_socket, msg)
if read(client_socket, 10) != 'OK': res = read(client_socket, 10)
if res != 'OK':
break break
gc.collect() gc.collect()
elif msg == 'PING:': elif msg == 'PING:':