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

Merge from custcol trunk

Browse Source
This commit is contained in:
Charles Haley 2010-05-09 19:51:52 +01:00
commit d5bfabdf29
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/html/input.py
View File

@ -296,8 +296,8 @@ class HTMLInput(InputFormatPlugin):
return self._is_case_sensitive return self._is_case_sensitive
if not path or not os.path.exists(path): if not path or not os.path.exists(path):
return islinux or isfreebsd return islinux or isfreebsd
self._is_case_sensitive = os.path.exists(path.lower()) \ self._is_case_sensitive = not (os.path.exists(path.lower()) \
and os.path.exists(path.upper()) and os.path.exists(path.upper()))
return self._is_case_sensitive return self._is_case_sensitive
def create_oebbook(self, htmlpath, basedir, opts, log, mi): def create_oebbook(self, htmlpath, basedir, opts, log, mi):

6
src/calibre/ebooks/metadata/epub.py
View File

@ -133,11 +133,11 @@ def get_cover(opf, opf_path, stream, reader=None):
stream.seek(0) stream.seek(0)
zf = ZipFile(stream) zf = ZipFile(stream)
if raster_cover: if raster_cover:
if reader is not None and \
reader.encryption_meta.is_encrypted(raster_cover):
return
base = posixpath.dirname(opf_path) base = posixpath.dirname(opf_path)
cpath = posixpath.normpath(posixpath.join(base, raster_cover)) cpath = posixpath.normpath(posixpath.join(base, raster_cover))
if reader is not None and \
reader.encryption_meta.is_encrypted(cpath):
return
try: try:
member = zf.getinfo(cpath) member = zf.getinfo(cpath)
except: except: