3 files changed, 30 insertions, 14 deletions

diff --git a/lib/archive.py b/lib/archive.py
index aa2a47f..c31fac6 100644
--- a/lib/archive.py
+++ b/lib/archive.py
@@ -13,11 +13,12 @@ class GenericArchiveStripper(parser.Generic_parser):
     '''
         Represent a generic archive
     '''
-    def __init__(self, realname, filename, parser, editor, backup):
+    def __init__(self, realname, filename, parser, editor, backup, add2archive):
         super(GenericArchiveStripper, self).__init__(realname,
-            filename, parser, editor, backup)
+            filename, parser, editor, backup, add2archive)
         self.compression = ''
         self.folder_list = []
+        self.add2archive = add2archive
 
     def remove_folder(self):
         [shutil.rmtree(folder) for folder in self.folder_list]
@@ -49,13 +50,18 @@ class ZipStripper(GenericArchiveStripper):
             zipin.extract(item)
             if os.path.isfile(item.filename):
                 try:
-                    cfile = mat.create_class_file(item.filename, False)
+                    cfile = mat.create_class_file(item.filename, False,
+                        self.add2archive)
                     cfile.remove_all()
                     logging.debug('Processing %s from %s' % (item.filename,
                         self.filename))
+                    zipout.write(item.filename)
                 except:
-                    print('%s\' filefomart is not supported'%item.filename)
-                zipout.write(item.filename)
+                    logging.info('%s\' filefomart is not supported' %
+                        item.filename)
+                    if self.add2archive:
+                        zipout.write(item.filename)
+                mat.secure_remove(item.filename)
             else:
                 self.folder_list.insert(0, item.filename)
         logging.info('%s treated' % self.filename)
@@ -84,11 +90,15 @@ class TarStripper(GenericArchiveStripper):
             if current_file.type is '0': #is current_file a regular file ?
                 #no backup file
                 try:
-                    cfile = mat.create_class_file(current_file.name, False)
+                    cfile = mat.create_class_file(current_file.name, False,
+                    self.add2archive)
                     cfile.remove_all()
+                    tarout.add(current_file.name, filter=self._remove)
                 except:
-                    print('%s\' format is not supported'%current_file.name)
-                tarout.add(current_file.name, filter=self._remove)
+                    logging.info('%s\' format is not supported' %
+                        current_file.name)
+                    if self.add2archive:
+                        tarout.add(current_file.name, filter=self._remove)
                 mat.secure_remove(current_file.name)
             else:
                 self.folder_list.insert(0, current_file.name)
@@ -123,7 +133,8 @@ class TarStripper(GenericArchiveStripper):
             tarin.extract(current_file)
             if current_file.type is '0': #is current_file a regular file ?
                 #no backup file
-                class_file = mat.create_class_file(current_file.name, False)
+                class_file = mat.create_class_file(current_file.name, False,
+                    self.add2archive)
                 if not class_file.is_clean():#if the extracted file is not clean
                     mat.secure_remove(current_file.name) #remove it
                     self.remove_folder() #remove all the remaining folders
diff --git a/lib/mat.py b/lib/mat.py
index 1d7f53b..49a84f1 100644
--- a/lib/mat.py
+++ b/lib/mat.py
@@ -52,14 +52,16 @@ def is_secure(filename):
 
     if not(os.path.isfile(filename)): #check if the file exist
         logging.error("Error: %s is not a valid file" % filename)
-        return
+        return False
 
-def create_class_file(name, backup):
+def create_class_file(name, backup, add2archive):
     '''
         return a $FILETYPEStripper() class,
         corresponding to the filetype of the given file
     '''
-    is_secure(name)
+    if is_secure(name):
+        print 'a'
+        return
 
     filename = ""
     realname = name
@@ -83,4 +85,5 @@ def create_class_file(name, backup):
         return
     if editor.input.__class__ == hachoir_parser.misc.PDFDocument:
         return stripper_class(filename, realname, backup)
-    return stripper_class(realname, filename, parser, editor, backup)
+    return stripper_class(realname, filename, parser, editor, backup,
+        add2archive)
diff --git a/lib/parser.py b/lib/parser.py
index 2b7b52e..6e6ee34 100644
--- a/lib/parser.py
+++ b/lib/parser.py
@@ -5,16 +5,18 @@
 import hachoir_core.error
 import hachoir_parser
 import hachoir_editor
+
 import sys
 import os
 import subprocess
 import mimetypes
+
 import mat
 
 POSTFIX = ".cleaned"
 
 class Generic_parser(object):
-    def __init__(self, realname, filename, parser, editor, backup):
+    def __init__(self, realname, filename, parser, editor, backup, add2archive):
         self.filename = filename
         self.realname = realname
         self.shortname = os.path.basename(filename)