Distance MAT a bit more from hachoir

2 files changed, 8 insertions, 3 deletions

diff --git a/libmat/mat.py b/libmat/mat.py
index 954b9a3..d0fd504 100644
--- a/libmat/mat.py
+++ b/libmat/mat.py
@@ -9,6 +9,7 @@ import os
 import platform
 import subprocess
 import xml.sax
+import mimetypes
 
 import hachoir_core.cmd_line
 import hachoir_parser
@@ -166,10 +167,12 @@ def create_class_file(name, backup, **kwargs):
 
     parser = hachoir_parser.createParser(filename)
     if not parser:
-        logging.info('Unable to parse %s' % filename)
-        return None
+        logging.info('Unable to parse %s with hachoir' % filename)
 
-    mime = parser.mime_type
+    mime = mimetypes.guess_type(filename)[0]
+    if not mime:
+        logging.info('Unable to find mimetype of %s' % filename)
+        return None
 
     if mime == 'application/zip':  # some formats are zipped stuff
         if mimetypes.guess_type(name)[0]:
diff --git a/libmat/strippers.py b/libmat/strippers.py
index 008442e..d9a8706 100644
--- a/libmat/strippers.py
+++ b/libmat/strippers.py
@@ -54,7 +54,9 @@ if pdfSupport:
 try:
     import mutagen
     STRIPPERS['audio/x-flac'] = audio.FlacStripper
+    STRIPPERS['audio/flac'] = audio.FlacStripper
     STRIPPERS['audio/vorbis'] = audio.OggStripper
+    STRIPPERS['audio/ogg'] = audio.OggStripper
     STRIPPERS['audio/mpeg'] = audio.MpegAudioStripper
 except ImportError:
     logging.info('Unable to import python-mutagen: limited audio format support')