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

- hatalı super değiştirildi.

Browse Source 
- Archive'in kullanıcısı isteğe bağlı olarak cleanDir tanımlayabilmeli.
This commit is contained in:
Barış Metin
2005-06-28 09:39:00 +00:00
parent 4d82f74e7e
commit 4fe977947e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/archive.py
+7 -6
View File
@@ -38,9 +38,9 @@ class ArchiveTar(ArchiveBase):
def __init__(self, filepath, type="tar"): def __init__(self, filepath, type="tar"):
super(ArchiveTar, self).__init__(filepath, type) super(ArchiveTar, self).__init__(filepath, type)
def unpack(self, targetDir): def unpack(self, targetDir, cleanDir=False):
"""Unpack tar archive to a given target directory(targetDir).""" """Unpack tar archive to a given target directory(targetDir)."""
super(ArchiveTar, self).unpack(targetDir) super(ArchiveTar, self).unpack(targetDir, cleanDir)
rmode = "" rmode = ""
if self.type == 'tar': if self.type == 'tar':
@@ -113,7 +113,6 @@ 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"""
super(ArchiveZip, self).unpack(targetDir, False)
zip = self.zip zip = self.zip
for info in zip.infolist(): for info in zip.infolist():
if pred(info.filename): # check if condition holds if pred(info.filename): # check if condition holds
@@ -163,7 +162,9 @@ class ArchiveZip(ArchiveBase):
def unpack_dir_flat(self, path, targetDir): def unpack_dir_flat(self, path, targetDir):
self.unpack_file_cond(lambda f:util.subpath(path,f), targetDir, path) self.unpack_file_cond(lambda f:util.subpath(path,f), targetDir, path)
def unpack(self, targetDir): def unpack(self, targetDir, cleanDir=False):
super(ArchiveZip, self).unpack(targetDir, cleanDir)
self.unpack_file_cond(lambda f: True, targetDir) self.unpack_file_cond(lambda f: True, targetDir)
self.close() self.close()
return return
@@ -185,8 +186,8 @@ class Archive:
self.archive = handlers.get(type)(filepath, type) self.archive = handlers.get(type)(filepath, type)
def unpack(self, targetDir): def unpack(self, targetDir, cleanDir=False):
self.archive.unpack(targetDir) self.archive.unpack(targetDir, cleanDir)
def unpack_files(self, files, targetDir): def unpack_files(self, files, targetDir):
self.archive.unpack_files(files, targetDir) self.archive.unpack_files(files, targetDir)