summaryrefslogtreecommitdiff
path: root/lib/mat.py
diff options
context:
space:
mode:
authorjvoisin2011-07-26 14:06:38 +0200
committerjvoisin2011-07-26 14:06:38 +0200
commite62ae6a87f630cbd389cf1b75672b06cd56973c8 (patch)
tree5433e5bde0d0448795626190f8014c61b38ac1c5 /lib/mat.py
parentf6e3d57173604dab7228c830e84415ead02e169b (diff)
Pyflakes and pep8 validation
Diffstat (limited to 'lib/mat.py')
-rw-r--r--lib/mat.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/mat.py b/lib/mat.py
index ccf653f..e4371ce 100644
--- a/lib/mat.py
+++ b/lib/mat.py
@@ -23,12 +23,11 @@ __author__ = 'jvoisin'
23 23
24LOGGING_LEVEL = logging.DEBUG 24LOGGING_LEVEL = logging.DEBUG
25 25
26logging.basicConfig(level = LOGGING_LEVEL) 26logging.basicConfig(level=LOGGING_LEVEL)
27 27
28strippers = { 28strippers = {
29 hachoir_parser.image.JpegFile: images.JpegStripper, 29 hachoir_parser.image.JpegFile: images.JpegStripper,
30 hachoir_parser.image.PngFile: images.PngStripper, 30 hachoir_parser.image.PngFile: images.PngStripper,
31 hachoir_parser.image.bmp.BmpFile: images.BmpStripper,
32 hachoir_parser.audio.MpegAudioFile: audio.MpegAudioStripper, 31 hachoir_parser.audio.MpegAudioFile: audio.MpegAudioStripper,
33 hachoir_parser.misc.PDFDocument: office.PdfStripper, 32 hachoir_parser.misc.PDFDocument: office.PdfStripper,
34 hachoir_parser.archive.TarFile: archive.TarStripper, 33 hachoir_parser.archive.TarFile: archive.TarStripper,
@@ -37,6 +36,7 @@ strippers = {
37 hachoir_parser.archive.zip.ZipFile: archive.ZipStripper, 36 hachoir_parser.archive.zip.ZipFile: archive.ZipStripper,
38} 37}
39 38
39
40def secure_remove(filename): 40def secure_remove(filename):
41 ''' 41 '''
42 securely remove the file 42 securely remove the file
@@ -52,10 +52,11 @@ def is_secure(filename):
52 Prevent shell injection 52 Prevent shell injection
53 ''' 53 '''
54 54
55 if not(os.path.isfile(filename)): #check if the file exist 55 if not(os.path.isfile(filename)): # check if the file exist
56 logging.error('Error: %s is not a valid file' % filename) 56 logging.error('Error: %s is not a valid file' % filename)
57 return False 57 return False
58 58
59
59def create_class_file(name, backup, add2archive): 60def create_class_file(name, backup, add2archive):
60 ''' 61 '''
61 return a $FILETYPEStripper() class, 62 return a $FILETYPEStripper() class,
@@ -68,7 +69,7 @@ def create_class_file(name, backup, add2archive):
68 realname = name 69 realname = name
69 try: 70 try:
70 filename = hachoir_core.cmd_line.unicodeFilename(name) 71 filename = hachoir_core.cmd_line.unicodeFilename(name)
71 except TypeError:# get rid of "TypeError: decoding Unicode is not supported" 72 except TypeError: # get rid of "decoding Unicode is not supported"
72 filename = name 73 filename = name
73 parser = hachoir_parser.createParser(filename) 74 parser = hachoir_parser.createParser(filename)
74 if not parser: 75 if not parser:
@@ -88,22 +89,22 @@ def create_class_file(name, backup, add2archive):
88 logging.info('Don\'t have stripper for format %s' % editor.description) 89 logging.info('Don\'t have stripper for format %s' % editor.description)
89 return 90 return
90 91
91 if editor.input.__class__ == hachoir_parser.misc.PDFDocument:#pdf 92 if editor.input.__class__ == hachoir_parser.misc.PDFDocument: # pdf
92 return stripper_class(filename, realname, backup) 93 return stripper_class(filename, realname, backup)
93 94
94 elif editor.input.__class__ == hachoir_parser.archive.zip.ZipFile: 95 elif editor.input.__class__ == hachoir_parser.archive.zip.ZipFile:
95 #zip based format 96 #zip based format
96 mime = mimetypes.guess_type(filename)[0] 97 mime = mimetypes.guess_type(filename)[0]
97 try:#Ugly workaround, cleaning open document delete mime (wtf?) 98 try: # ugly workaround, cleaning open document delete mime (wtf?)
98 if mime.startswith('application/vnd.oasis.opendocument'): 99 if mime.startswith('application/vnd.oasis.opendocument'):
99 return office.OpenDocumentStripper(realname, filename, parser, 100 return office.OpenDocumentStripper(realname, filename, parser,
100 editor, backup, add2archive) 101 editor, backup, add2archive)
101 else:#normal zip 102 else: # normal zip
102 return stripper_class(realname, filename, parser, editor, 103 return stripper_class(realname, filename, parser, editor,
103 backup, add2archive) 104 backup, add2archive)
104 except:#normal zip file 105 except: # normal zip
105 return stripper_class(realname, filename, parser, editor, backup, 106 return stripper_class(realname, filename, parser, editor, backup,
106 add2archive) 107 add2archive)
107 else:#normal handling 108 else: # normal handling
108 return stripper_class(realname, filename, parser, editor, backup, 109 return stripper_class(realname, filename, parser, editor, backup,
109 add2archive) 110 add2archive)