summaryrefslogtreecommitdiff
path: root/lib/mat.py
diff options
context:
space:
mode:
authorjvoisin2011-07-26 21:12:58 +0200
committerjvoisin2011-07-26 21:12:58 +0200
commitc3ce1dd99ec1671d50a7cf89dc1b287fbbdf96aa (patch)
tree0d3a39a19938d6ddcc84c2a6b77937340b020afa /lib/mat.py
parent446cb258ce93a73e62c1a19779c9d67e0457412f (diff)
Simplification of the __init__() method
Diffstat (limited to 'lib/mat.py')
-rw-r--r--lib/mat.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/mat.py b/lib/mat.py
index ea4fefd..3d1687f 100644
--- a/lib/mat.py
+++ b/lib/mat.py
@@ -11,7 +11,6 @@ import mimetypes
11 11
12import hachoir_core.cmd_line 12import hachoir_core.cmd_line
13import hachoir_parser 13import hachoir_parser
14import hachoir_editor
15 14
16import images 15import images
17import audio 16import audio
@@ -39,7 +38,7 @@ STRIPPERS = {
39 38
40try: 39try:
41 import mutagen 40 import mutagen
42 STRIPPERS[hachoir_parser.audio.FlacParser] = audio.FlacStripper 41 STRIPPERS['audio/x-flac'] = audio.FlacStripper
43except ImportError: 42except ImportError:
44 print('unable to import python-mutagen : limited audio format support') 43 print('unable to import python-mutagen : limited audio format support')
45 44
@@ -85,7 +84,6 @@ def create_class_file(name, backup, add2archive):
85 logging.info('Unable to parse %s' % filename) 84 logging.info('Unable to parse %s' % filename)
86 return 85 return
87 86
88 editor = hachoir_editor.createEditor(parser)
89 mime = parser.mime_type 87 mime = parser.mime_type
90 88
91 if mime.startswith('application/vnd.oasis.opendocument'): 89 if mime.startswith('application/vnd.oasis.opendocument'):
@@ -94,8 +92,7 @@ def create_class_file(name, backup, add2archive):
94 try: 92 try:
95 stripper_class = STRIPPERS[mime] 93 stripper_class = STRIPPERS[mime]
96 except KeyError: 94 except KeyError:
97 logging.info('Don\'t have stripper for format %s' % editor.description) 95 logging.info('Don\'t have stripper for %s\' format' % filename)
98 return 96 return
99 97
100 return stripper_class(realname, filename, parser, editor, backup, 98 return stripper_class(filename, parser, mime, backup, add2archive)
101 add2archive)