Lisibility improvement for tempfile suppression.

2 files changed, 6 insertions, 10 deletions

diff --git a/lib/archive.py b/lib/archive.py
index 3f16ee4..c97385b 100644
--- a/lib/archive.py
+++ b/lib/archive.py
@@ -26,8 +26,13 @@ class GenericArchiveStripper(parser.GenericParser):
 
     def __del__(self):
         '''
-            Remove the temp dir
+            Remove the files inside the temp dir,
+            then remove the temp dir
         '''
+        for root, dirs, files in os.walk(self.tempdir):
+            for item in files:
+                path_file = os.path.join(root, item)
+                mat.secure_remove(path_file)
         shutil.rmtree(self.tempdir)
 
     def remove_all(self):
@@ -101,7 +106,6 @@ harmless format' % item.filename)
                     if ext not in parser.NOMETA:
                         if bname != 'mimetype' and bname != '.rels':
                             return False
-                mat.secure_remove(name)
         zipin.close()
         return True
 
@@ -152,7 +156,6 @@ harmless format' % item.filename)
                     _, ext = os.path.splitext(name)
                     if self.add2archive or ext in parser.NOMETA:
                         zipout.write(name, item.filename)
-                mat.secure_remove(name)
         zipout.comment = ''
         zipin.close()
         zipout.close()
@@ -197,7 +200,6 @@ class TarStripper(GenericArchiveStripper):
                     _, ext = os.path.splitext(name)
                     if self.add2archive or ext in parser.NOMETA:
                         tarout.add(name, item.name, filter=self._remove)
-                mat.secure_remove(name)
         tarin.close()
         tarout.close()
         self.do_backup()
@@ -244,7 +246,6 @@ class TarStripper(GenericArchiveStripper):
                     if ext not in parser.NOMETA:
                         tarin.close()
                         return False
-                mat.secure_remove(name)
         tarin.close()
         return True
 
diff --git a/lib/office.py b/lib/office.py
index 9c9d367..33af48e 100644
--- a/lib/office.py
+++ b/lib/office.py
@@ -62,14 +62,12 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
                     if not 'meta.xml' in line:
                         print line
                 zipout.write(name, item)
-                mat.secure_remove(name)
 
             elif ext in parser.NOMETA or item == 'mimetype':
                 #keep NOMETA files, and the "manifest" file
                 if item != 'meta.xml':  # contains the metadata
                     zipin.extract(item, self.tempdir)
                     zipout.write(name, item)
-                    mat.secure_remove(name)
 
             else:
                 zipin.extract(item, self.tempdir)
@@ -88,7 +86,6 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
                         logging.info('%s\' fileformat is not supported' % item)
                         if self.add2archive:
                             zipout.write(name, item)
-                    mat.secure_remove(name)
         zipout.comment = ''
         logging.info('%s treated' % self.filename)
         zipin.close()
@@ -208,7 +205,6 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
                 #keep parser.NOMETA files, and the file named ".rels"
                 zipin.extract(item, self.tempdir)
                 zipout.write(name, item)
-                mat.secure_remove(name)
             else:
                 zipin.extract(item, self.tempdir)
                 if os.path.isfile(name):  # don't care about folders
@@ -226,7 +222,6 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
                         logging.info('%s\' fileformat is not supported' % item)
                         if self.add2archive:
                             zipout.write(name, item)
-                    mat.secure_remove(name)
         zipout.comment = ''
         logging.info('%s treated' % self.filename)
         zipin.close()