Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

EPUB Input: Fix bug in unzipping EPUB files that have been zipped in depth first order. Fixes #6127 (Cannot open or convert News Feed "books" - problems with path in Windows)

Browse Source
This commit is contained in:
Kovid Goyal 2010-07-09 10:45:07 -06:00
parent ec607dc596
commit c8438cc296
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/devices/kindle/driver.py
View File

@ -213,7 +213,7 @@ class KINDLE_DX(KINDLE2):
PRODUCT_ID = [0x0003] PRODUCT_ID = [0x0003]
BCD = [0x0100] BCD = [0x0100]
class Bookmark(): class Bookmark(): # {{{
''' '''
A simple class fetching bookmark data A simple class fetching bookmark data
Kindle-specific Kindle-specific
@ -517,3 +517,6 @@ class Bookmark():
else: else:
print "unsupported bookmark_extension: %s" % self.bookmark_extension print "unsupported bookmark_extension: %s" % self.bookmark_extension
# }}}

9
src/calibre/utils/zipfile.py
View File

@ -1071,8 +1071,13 @@ class ZipFile:
# Create all upper directories if necessary. # Create all upper directories if necessary.
upperdirs = os.path.dirname(targetpath) upperdirs = os.path.dirname(targetpath)
if upperdirs and os.path.exists(upperdirs) and not os.path.isdir(upperdirs): while upperdirs:
os.unlink(upperdirs) if os.path.exists(upperdirs):
if os.path.isdir(upperdirs):
break
os.remove(upperdirs)
upperdirs = os.path.dirname(upperdirs)
upperdirs = os.path.dirname(targetpath)
if upperdirs and not os.path.exists(upperdirs): if upperdirs and not os.path.exists(upperdirs):
os.makedirs(upperdirs) os.makedirs(upperdirs)