CIRCL
/
PyCIRCLean
mirror of https://github.com/CIRCL/PyCIRCLean
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix typo, force overwrite on extract

pull/2/head
Raphaël Vinot 2015-05-29 17:34:55 +02:00
parent b2447d9d56
commit 3b759eb9ab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/generic.py
View File

@ -71,7 +71,7 @@ class File(FileBase):
expected_extensions = mimetypes.guess_all_extensions(mimetype, strict=False) expected_extensions = mimetypes.guess_all_extensions(mimetype, strict=False)
if expected_extensions is not None: if expected_extensions is not None:
if len(self.extension) > 0 and self.extension not in expected_extensions: if len(self.extension) > 0 and self.extension not in expected_extensions:
self.log_details.update({'expected_mimetype': expected_extensions}) self.log_details.update({'expected_extensions': expected_extensions})
self.make_dangerous() self.make_dangerous()
else: else:
# there are no known extensions associated to this mimetype. # there are no known extensions associated to this mimetype.
@ -263,7 +263,7 @@ class KittenGroomer(KittenGroomerBase):
self.cur_file.log_string += 'Archive extracted, processing content.' self.cur_file.log_string += 'Archive extracted, processing content.'
tmpdir = self.cur_file.dst_path + '_temp' tmpdir = self.cur_file.dst_path + '_temp'
self._safe_mkdir(tmpdir) self._safe_mkdir(tmpdir)
extract_command = '{} -p1 x {} -o{} -bd'.format(SEVENZ, self.cur_file.src_path, tmpdir) extract_command = '{} -p1 x {} -o{} -bd -aoa'.format(SEVENZ, self.cur_file.src_path, tmpdir)
self._run_process(extract_command) self._run_process(extract_command)
self.recursive += 1 self.recursive += 1
self.processdir(tmpdir, self.cur_file.dst_path) self.processdir(tmpdir, self.cur_file.dst_path)