diff options
| -rw-r--r-- | libmat2/office.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmat2/office.py b/libmat2/office.py index 6831839..0791b07 100644 --- a/libmat2/office.py +++ b/libmat2/office.py | |||
| @@ -47,6 +47,8 @@ class ArchiveBasedAbstractParser(abstract.AbstractParser): | |||
| 47 | full_path = os.path.join(temp_folder, item.filename) | 47 | full_path = os.path.join(temp_folder, item.filename) |
| 48 | tmp_parser, mtype = parser_factory.get_parser(full_path) # type: ignore | 48 | tmp_parser, mtype = parser_factory.get_parser(full_path) # type: ignore |
| 49 | if not tmp_parser: | 49 | if not tmp_parser: |
| 50 | zout.close() | ||
| 51 | os.remove(self.output_filename) | ||
| 50 | print("%s's format (%s) isn't supported" % (item.filename, mtype)) | 52 | print("%s's format (%s) isn't supported" % (item.filename, mtype)) |
| 51 | return False | 53 | return False |
| 52 | tmp_parser.remove_all() | 54 | tmp_parser.remove_all() |
| @@ -109,8 +111,6 @@ class MSOfficeParser(ArchiveBasedAbstractParser): | |||
| 109 | continue | 111 | continue |
| 110 | 112 | ||
| 111 | if self._clean_internal_file(item, temp_folder, zin, zout) is False: | 113 | if self._clean_internal_file(item, temp_folder, zin, zout) is False: |
| 112 | zout.close() | ||
| 113 | os.remove(self.output_filename) | ||
| 114 | return False | 114 | return False |
| 115 | 115 | ||
| 116 | shutil.rmtree(temp_folder) | 116 | shutil.rmtree(temp_folder) |
| @@ -168,7 +168,6 @@ class LibreOfficeParser(ArchiveBasedAbstractParser): | |||
| 168 | continue # don't keep metadata files | 168 | continue # don't keep metadata files |
| 169 | 169 | ||
| 170 | if self._clean_internal_file(item, temp_folder, zin, zout) is False: | 170 | if self._clean_internal_file(item, temp_folder, zin, zout) is False: |
| 171 | os.remove(self.output_filename) | ||
| 172 | return False | 171 | return False |
| 173 | 172 | ||
| 174 | shutil.rmtree(temp_folder) | 173 | shutil.rmtree(temp_folder) |
