pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] base: guess_mimetype

Browse Source 
When receiving an email containing two attachments(.docx, .odt) with the chatter
the icons displayed for the two attachments were the icon of a zip file instead
of the icon of a document file.

ps: the dictionnary "mapping" with the mimetypes and the signatures has been
changed in a tuple of tuples to keep the order of the mimetypes because
all the document files (.docx, .dot) begin by 'PK\x03\x04' and all the
zip files by 'PK'.

opw:658706
This commit is contained in:
Goffin Simon
2015-12-11 09:27:53 +01:00
parent c7b7094248
commit f720e365c5
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_attachment.py
+13 -13
View File
@@ -34,21 +34,21 @@ except ImportError:
def guess_mimetype(bin_data):
# by default, guess the type using the magic number of file hex signature (like magic, but more limited)
# see http://www.filesignatures.net/ for file signatures
mapping = {
mapping = (
# pdf
'application/pdf' : ['%PDF'],
# jpg, jpeg, png, gif
'image/jpeg' : ['\xFF\xD8\xFF\xE0', '\xFF\xD8\xFF\xE2', '\xFF\xD8\xFF\xE3', '\xFF\xD8\xFF\xE1'],
'image/png' : ['\x89\x50\x4E\x47\x0D\x0A\x1A\x0A'],
'image/gif' : ['GIF87a', '\x47\x49\x46\x38\x37\x61', 'GIF89a', '\x47\x49\x46\x38\x39\x61'],
('application/pdf', ['%PDF']),
# jpg, jpeg, png, gif
('image/jpeg', ['\xFF\xD8\xFF\xE0', '\xFF\xD8\xFF\xE2', '\xFF\xD8\xFF\xE3', '\xFF\xD8\xFF\xE1']),
('image/png', ['\x89\x50\x4E\x47\x0D\x0A\x1A\x0A']),
('image/gif', ['GIF87a', '\x47\x49\x46\x38\x37\x61', 'GIF89a', '\x47\x49\x46\x38\x39\x61']),
# docx, odt, doc, xls
('application/msword', ['PK\x03\x04', '\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00', '\xEC\xA5\xC1\x00', '\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1', '\x0D\x44\x4F\x43']),
# zip, but will include jar, odt, ods, odp, docx, xlsx, pptx, apk
'application/zip' : ['PK'],
# doc, xls
'application/msword' : ['\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00', '\xEC\xA5\xC1\x00', '\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1', '\x0D\x44\x4F\x43'],
'application/vnd.ms-excel' : ['\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1','\x09\x08\x10\x00\x00\x06\x05\x00','\xFD\xFF\xFF\xFF\x10','\xFD\xFF\xFF\xFF\x1F','\xFD\xFF\xFF\xFF\x23','\xFD\xFF\xFF\xFF\x28','\xFD\xFF\xFF\xFF\x29'],
}
for mimetype in mapping.keys():
for signature in mapping[mimetype]:
('application/zip', ['PK']),
('application/vnd.ms-excel', ['\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1', '\x09\x08\x10\x00\x00\x06\x05\x00', '\xFD\xFF\xFF\xFF\x10', '\xFD\xFF\xFF\xFF\x1F', '\xFD\xFF\xFF\xFF\x23', '\xFD\xFF\xFF\xFF\x28', '\xFD\xFF\xFF\xFF\x29']),
)
for mimetype, signatures in mapping:
for signature in signatures:
if bin_data.startswith(signature):
return mimetype
return 'application/octet-stream'