mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
When trying to find an ebook inside a zip file, do not error out if the zip file itself contains other zip files. Fixes #925670 (no plugin to handle input format: zip)
This commit is contained in:
parent
c1e4072ef6
commit
cf173bdb89
@ -706,8 +706,9 @@ OptionRecommendation(name='sr3_replace',
|
|||||||
files = [f if isinstance(f, unicode) else f.decode(filesystem_encoding)
|
files = [f if isinstance(f, unicode) else f.decode(filesystem_encoding)
|
||||||
for f in files]
|
for f in files]
|
||||||
from calibre.customize.ui import available_input_formats
|
from calibre.customize.ui import available_input_formats
|
||||||
fmts = available_input_formats()
|
fmts = set(available_input_formats())
|
||||||
for x in ('htm', 'html', 'xhtm', 'xhtml'): fmts.remove(x)
|
fmts -= {'htm', 'html', 'xhtm', 'xhtml'}
|
||||||
|
fmts -= set(ARCHIVE_FMTS)
|
||||||
|
|
||||||
for ext in fmts:
|
for ext in fmts:
|
||||||
for f in files:
|
for f in files:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user