Merge branch 'master' of git://git.torproject.org/user/jvoisin/mat

4 files changed, 13 insertions, 7 deletions

diff --git a/mat-cli b/mat-cli
index fbcaa62..00c5c11 100755
--- a/mat-cli
+++ b/mat-cli
@@ -61,7 +61,7 @@ def display_version(*_):
 
 def list_meta(class_file, filename, force):
     '''
-        Print all the metadataof 'filename' on stdout
+        Print all the metadata of 'filename' on stdout
     '''
     print('[+] File %s :' % filename)
     if force is False and class_file.is_clean():
diff --git a/mat/exiftool.py b/mat/exiftool.py
index c6c1ada..758a094 100644
--- a/mat/exiftool.py
+++ b/mat/exiftool.py
@@ -33,14 +33,14 @@ class ExiftoolStripper(parser.GenericParser):
         try:
             if self.backup:
                 # Note: '-All=' must be followed by a known exiftool option.
-                process = subprocess.Popen(['exiftool', '-All=',
+                process = subprocess.Popen(['exiftool', '-m', '-All=',
                     '-out', self.output, self.filename],
                     stdout=open('/dev/null'))
                 process.wait()
             else:
                 # Note: '-All=' must be followed by a known exiftool option.
                 process = subprocess.Popen(
-                    [ 'exiftool', '-All=', '-overwrite_original', self.filename ],
+                    [ 'exiftool', '-m', '-All=', '-overwrite_original', self.filename ],
                     stdout=open('/dev/null'))
                 process.wait()
             return True
diff --git a/mat/mat.py b/mat/mat.py
index 0e66df8..7fab98c 100644
--- a/mat/mat.py
+++ b/mat/mat.py
@@ -18,9 +18,15 @@ import strippers
 __version__ = '0.1'
 __author__ = 'jvoisin'
 
-LOGGING_LEVEL = logging.DEBUG
+#Silence
+LOGGING_LEVEL = logging.CRITICAL
+hachoir_core.config.quiet = True
 
-logging.basicConfig(level=LOGGING_LEVEL)
+#Verbose
+#LOGGING_LEVEL = logging.DEBUG
+#hachoir_core.config.quiet = False
+
+logging.basicConfig(filename='report.log', level=LOGGING_LEVEL)
 
 
 def get_sharedir():
@@ -31,7 +37,7 @@ def get_sharedir():
         return ''
     elif os.path.exists('/usr/local/share/mat/'):
         return '/usr/local/share/mat/'
-    elif os.path.exist('/usr/share/mat/'):
+    elif os.path.exists('/usr/share/mat/'):
         return '/usr/share/mat'
 
 
diff --git a/mat/office.py b/mat/office.py
index 41411c7..d1e781e 100644
--- a/mat/office.py
+++ b/mat/office.py
@@ -188,7 +188,7 @@ class PdfStripper(parser.GenericParser):
             import exiftool
             # Note: '-All=' must be followed by a known exiftool option.
             if self.backup:
-                process = subprocess.Popen(['exiftool', '-All=',
+                process = subprocess.Popen(['exiftool', '-m', '-All=',
                     '-out', self.output, self.filename], stdout=open('/dev/null'))
                 process.wait()
             else: