summaryrefslogtreecommitdiff
path: root/MAT/archive.py
diff options
context:
space:
mode:
authorjvoisin2012-12-19 21:17:02 +0100
committerjvoisin2012-12-19 21:17:02 +0100
commitb0b30b8ed51d6de3671c0b133edd6f7f3230282b (patch)
treee28a33c1c1eb0e3dfa81d0a21c586a003db54b2a /MAT/archive.py
parent99f982f844aa75cfd895e16bc6f3dcac778e31ac (diff)
Preliminary support of producted pdf quality choice
Diffstat (limited to 'MAT/archive.py')
-rw-r--r--MAT/archive.py25
1 files changed, 11 insertions, 14 deletions
diff --git a/MAT/archive.py b/MAT/archive.py
index f78a2a7..69c8f1b 100644
--- a/MAT/archive.py
+++ b/MAT/archive.py
@@ -17,11 +17,10 @@ class GenericArchiveStripper(parser.GenericParser):
17 ''' 17 '''
18 Represent a generic archive 18 Represent a generic archive
19 ''' 19 '''
20 def __init__(self, filename, parser, mime, backup, add2archive): 20 def __init__(self, filename, parser, mime, backup, **kwargs):
21 super(GenericArchiveStripper, self).__init__(filename, parser, mime, 21 super(GenericArchiveStripper, self).__init__(filename, parser, mime, backup, **kwargs)
22 backup, add2archive)
23 self.compression = '' 22 self.compression = ''
24 self.add2archive = add2archive 23 self.add2archive = kwargs['add2archive']
25 self.tempdir = tempfile.mkdtemp() 24 self.tempdir = tempfile.mkdtemp()
26 25
27 def __del__(self): 26 def __del__(self):
@@ -81,7 +80,7 @@ class ZipStripper(GenericArchiveStripper):
81 if os.path.isfile(name): 80 if os.path.isfile(name):
82 try: 81 try:
83 cfile = mat.create_class_file(name, False, 82 cfile = mat.create_class_file(name, False,
84 self.add2archive) 83 add2archive=self.add2archive)
85 if not cfile.is_clean(): 84 if not cfile.is_clean():
86 return False 85 return False
87 except: 86 except:
@@ -129,7 +128,7 @@ harmless format' % item.filename)
129 if os.path.isfile(name): 128 if os.path.isfile(name):
130 try: 129 try:
131 cfile = mat.create_class_file(name, False, 130 cfile = mat.create_class_file(name, False,
132 self.add2archive) 131 add2archive=self.add2archive)
133 cfile.remove_all() 132 cfile.remove_all()
134 logging.debug('Processing %s from %s' % (item.filename, 133 logging.debug('Processing %s from %s' % (item.filename,
135 self.filename)) 134 self.filename))
@@ -173,7 +172,7 @@ class TarStripper(GenericArchiveStripper):
173 #no backup file 172 #no backup file
174 try: 173 try:
175 cfile = mat.create_class_file(name, False, 174 cfile = mat.create_class_file(name, False,
176 self.add2archive) 175 add2archive=self.add2archive)
177 cfile.remove_all() 176 cfile.remove_all()
178 tarout.add(name, item.name, filter=self._remove) 177 tarout.add(name, item.name, filter=self._remove)
179 except: 178 except:
@@ -218,7 +217,7 @@ class TarStripper(GenericArchiveStripper):
218 if item.type == '0': # is item a regular file ? 217 if item.type == '0': # is item a regular file ?
219 try: 218 try:
220 class_file = mat.create_class_file(name, 219 class_file = mat.create_class_file(name,
221 False, self.add2archive) # no backup file 220 False, add2archive=self.add2archive) # no backup file
222 if not class_file.is_clean(): 221 if not class_file.is_clean():
223 tarin.close() 222 tarin.close()
224 return False 223 return False
@@ -256,9 +255,8 @@ class GzipStripper(TarStripper):
256 ''' 255 '''
257 Represent a tar.gz archive 256 Represent a tar.gz archive
258 ''' 257 '''
259 def __init__(self, filename, parser, mime, backup, add2archive): 258 def __init__(self, filename, parser, mime, backup, **kwargs):
260 super(GzipStripper, self).__init__(filename, parser, mime, backup, 259 super(GzipStripper, self).__init__(filename, parser, mime, backup, **kwargs)
261 add2archive)
262 self.compression = ':gz' 260 self.compression = ':gz'
263 261
264 262
@@ -266,7 +264,6 @@ class Bzip2Stripper(TarStripper):
266 ''' 264 '''
267 Represents a tar.bz2 archive 265 Represents a tar.bz2 archive
268 ''' 266 '''
269 def __init__(self, filename, parser, mime, backup, add2archive): 267 def __init__(self, filename, parser, mime, backup, **kwargs):
270 super(Bzip2Stripper, self).__init__(filename, parser, mime, backup, 268 super(Bzip2Stripper, self).__init__(filename, parser, mime, backup, **kwargs)
271 add2archive)
272 self.compression = ':bz2' 269 self.compression = ':bz2'