summaryrefslogtreecommitdiff
path: root/lib/office.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/office.py')
-rw-r--r--lib/office.py23
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/office.py b/lib/office.py
index 966a64d..2320e40 100644
--- a/lib/office.py
+++ b/lib/office.py
@@ -3,14 +3,9 @@
3''' 3'''
4 4
5import os 5import os
6import mimetypes
7import subprocess
8import tempfile
9import glob
10import logging 6import logging
11import zipfile 7import zipfile
12import re 8import re
13import shutil
14from xml.etree import ElementTree 9from xml.etree import ElementTree
15 10
16try: 11try:
@@ -103,13 +98,13 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
103 zipin.getinfo('meta.xml') 98 zipin.getinfo('meta.xml')
104 return False 99 return False
105 except KeyError: # no meta.xml in the file 100 except KeyError: # no meta.xml in the file
106 zipin.close() 101 zipin.close()
107 czf = archive.ZipStripper(self.filename, self.parser, 102 czf = archive.ZipStripper(self.filename, self.parser,
108 'application/zip', self.backup, self.add2archive) 103 'application/zip', self.backup, self.add2archive)
109 if czf.is_clean(): 104 if czf.is_clean():
110 return True 105 return True
111 else: 106 else:
112 return False 107 return False
113 return True 108 return True
114 109
115 110
@@ -172,7 +167,7 @@ class PdfStripper(parser.GenericParser):
172 ''' 167 '''
173 Return a dict with all the meta of the file 168 Return a dict with all the meta of the file
174 ''' 169 '''
175 metadata={} 170 metadata = {}
176 for key in self.meta_list: 171 for key in self.meta_list:
177 if key == 'creation-date' or key == 'mod-date': 172 if key == 'creation-date' or key == 'mod-date':
178 #creation and modification are set to -1 173 #creation and modification are set to -1
@@ -181,5 +176,5 @@ class PdfStripper(parser.GenericParser):
181 else: 176 else:
182 if self.document.get_property(key) is not None and \ 177 if self.document.get_property(key) is not None and \
183 self.document.get_property(key) != '': 178 self.document.get_property(key) != '':
184 metadata[key] = self.document.get_property(key) 179 metadata[key] = self.document.get_property(key)
185 return metadata 180 return metadata