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

Cleanup some zipfile code

Browse Source
This commit is contained in:
Kovid Goyal 2025-04-07 08:18:35 +05:30
parent 1ebbf424c2
commit b4251ab1be
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1147,7 +1147,7 @@ class ZipFile:
if upperdirs and not os.path.exists(upperdirs): if upperdirs and not os.path.exists(upperdirs):
try: try:
os.makedirs(upperdirs) os.makedirs(upperdirs)
except: # Added by Kovid except OSError: # Added by Kovid
targetpath = os.path.join(base_target, targetpath = os.path.join(base_target,
sanitize_file_name(fname)) sanitize_file_name(fname))
upperdirs = os.path.dirname(targetpath) upperdirs = os.path.dirname(targetpath)
@ -1158,7 +1158,7 @@ class ZipFile:
if not os.path.isdir(targetpath): if not os.path.isdir(targetpath):
try: try:
os.mkdir(targetpath) os.mkdir(targetpath)
except Exception: # Added by Kovid except OSError: # Added by Kovid
targetpath = os.path.join(base_target, sanitize_file_name(fname)) targetpath = os.path.join(base_target, sanitize_file_name(fname))
os.mkdir(targetpath) os.mkdir(targetpath)
return targetpath return targetpath
@ -1166,16 +1166,15 @@ class ZipFile:
if not os.path.exists(targetpath): if not os.path.exists(targetpath):
# Kovid: Could be a previously automatically created directory # Kovid: Could be a previously automatically created directory
# in which case it is ignored # in which case it is ignored
with closing(self.open(member, pwd=pwd)) as source:
try: try:
with open(targetpath, 'wb') as target: target = open(targetpath, 'wb')
shutil.copyfileobj(source, target) except OSError:
except:
# Try sanitizing the file name to remove invalid characters
components = list(os.path.split(targetpath)) components = list(os.path.split(targetpath))
components[-1] = sanitize_file_name(components[-1]) components[-1] = sanitize_file_name(components[-1])
targetpath = os.sep.join(components) targetpath = os.sep.join(components)
with open(targetpath, 'wb') as target: target = open(targetpath, 'wb')
with target, closing(self.open(member, pwd=pwd)) as source:
shutil.copyfileobj(source, target) shutil.copyfileobj(source, target)
# Kovid: Try to preserve the timestamps in the ZIP file # Kovid: Try to preserve the timestamps in the ZIP file
try: try: