Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zip adında bir python built-in var. zipObj kullan.

Browse Source 
add_to_archive'de r1601'de eklenen tek satırlık bir hatayı geri al.
This commit is contained in:
Barış Metin
2005-07-01 13:41:58 +00:00
parent c2c1fc01a4
commit 462ebd4b11
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/archive.py
+9 -9
View File
@@ -70,18 +70,18 @@ class ArchiveZip(ArchiveBase):
def __init__(self, filepath, ArchType = "zip", mode = 'r'): def __init__(self, filepath, ArchType = "zip", mode = 'r'):
super(ArchiveZip, self).__init__(filepath, ArchType) super(ArchiveZip, self).__init__(filepath, ArchType)
self.zip = zipfile.ZipFile(self.filePath, mode) self.zipObj = zipfile.ZipFile(self.filePath, mode)
def close(self): def close(self):
"""Close the zip archive.""" """Close the zip archive."""
self.zip.close() self.zipObj.close()
def add_to_archive(self, fileName): def add_to_archive(self, fileName):
"""Add file or directory path to the zip file""" """Add file or directory path to the zip file"""
# It's a pity that zipfile can't handle unicode strings. Grrr! # It's a pity that zipfile can't handle unicode strings. Grrr!
fileName = str(fileName) fileName = str(fileName)
if os.path.isdir(fileName) and not os.path.islink(fileName): if os.path.isdir(fileName) and not os.path.islink(fileName):
self.zip.writestr(os.path.join(fileName, '')) self.zipObj.writestr(fileName + '/', '')
for f in os.listdir(fileName): for f in os.listdir(fileName):
self.add_to_archive(os.path.join(fileName, f)) self.add_to_archive(os.path.join(fileName, f))
else: else:
@@ -91,9 +91,9 @@ class ArchiveZip(ArchiveBase):
attr.filename = fileName attr.filename = fileName
attr.create_system = 3 attr.create_system = 3
attr.external_attr = self.symmagic attr.external_attr = self.symmagic
self.zip.writestr(attr, dest) self.zipObj.writestr(attr, dest)
else: else:
self.zip.write(fileName, fileName, zipfile.ZIP_DEFLATED) self.zipObj.write(fileName, fileName, zipfile.ZIP_DEFLATED)
def add_basename_to_archive(self, fileName): def add_basename_to_archive(self, fileName):
"""Add only the basepath to the zip file. For example; if the given """Add only the basepath to the zip file. For example; if the given
@@ -111,8 +111,8 @@ class ArchiveZip(ArchiveBase):
def unpack_file_cond(self, pred, targetDir, archiveRoot = ''): def unpack_file_cond(self, pred, targetDir, archiveRoot = ''):
"""Unpack/Extract a file according to predicate function filename -> """Unpack/Extract a file according to predicate function filename ->
bool""" bool"""
zip = self.zip zipObj = self.zipObj
for info in zip.infolist(): for info in zipObj.infolist():
if pred(info.filename): # check if condition holds if pred(info.filename): # check if condition holds
# below code removes that, so we find it here # below code removes that, so we find it here
@@ -138,7 +138,7 @@ class ArchiveZip(ArchiveBase):
util.check_dir(os.path.dirname(ofile)) util.check_dir(os.path.dirname(ofile))
if info.external_attr == self.symmagic: if info.external_attr == self.symmagic:
target = zip.read(info.filename) target = zipObj.read(info.filename)
os.symlink(target, ofile) os.symlink(target, ofile)
else: else:
perm = info.external_attr perm = info.external_attr
@@ -146,7 +146,7 @@ class ArchiveZip(ArchiveBase):
perm >>= 16 perm >>= 16
perm |= 0x00000100 perm |= 0x00000100
buff = open (ofile, 'wb') buff = open (ofile, 'wb')
fileContent = zip.read(info.filename) fileContent = zipObj.read(info.filename)
buff.write(fileContent) buff.write(fileContent)
buff.close() buff.close()
os.chmod(ofile, perm) os.chmod(ofile, perm)