Issue 4575 - Fix failing tests in buildtools

packagerEdge.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import base64
 import hashlib
 import json
 import mimetypes
 import os
 import zipfile
@@ skipping 96 matching lines @@
     # original content would be lost.
     names = sorted(files.keys(), key=len, reverse=True)
     for filename in names:
         files['{}/{}'.format(EXTENSION_DIR, filename)] = files.pop(filename)
 
 
 def create_content_types_map(filenames):
     """Create [Content_Types].xml -- a mime type map."""
     params = {'defaults': {}, 'overrides': {}}
     overrides = {
-        '.otf': 'application/octet-stream',

[Sebastian Noack, 2016/10/28 12:43:51]

Why not using 'application/font-sfnt' or 'application/x-font-sfnt'?

[Vasily Kuznetsov, 2016/11/30 15:11:45]

'application/octet-stream' is what Microsoft and Facebook packagers output. I
thought being consistent with them is probably the safest way to go.

         BLOCKMAP: 'application/vnd.ms-appx.blockmap+xml',
         MANIFEST: 'application/vnd.ms-appx.manifest+xml'
     }
+    types = mimetypes.MimeTypes()
+    types.add_type('application/octet-stream', '.otf')
     for filename in filenames:
         ext = os.path.splitext(filename)[1]
-        if ext and ext not in params['defaults']:

[Sebastian Noack, 2016/10/28 12:43:51]

Rather than adding a special case here, note that you can just add a type to the
mimetypes API:

  types = mimetypes.MimeTypes()
  types.add_type('application/octet-stream', '.otf')
  ...
  content_type = types.guess_type(filename, strict=False)[0]

Initializing a local MimeTypes object isn't technically necessary, but avoids
side effects if other code is using the miemtypes module as well.

[Vasily Kuznetsov, 2016/11/30 15:11:45]

You're right, this is better.

Done.

-            content_type = mimetypes.guess_type(filename, strict=False)[0]
-            if ext in overrides:
-                content_type = overrides[ext]
+        if ext:
+            content_type = types.guess_type(filename, strict=False)[0]
             if content_type is not None:
                 params['defaults'][ext[1:]] = content_type
         if filename in overrides:
             params['overrides']['/' + filename] = overrides[filename]
     content_types_template = _get_template_for(CONTENT_TYPES)
     return content_types_template.render(params).encode('utf-8')
 
 
 def createBuild(baseDir, type='edge', outFile=None,  # noqa: preserve API.
                 buildNum=None, releaseBuild=False, keyFile=None,
@@ skipping 40 matching lines @@
     if metadata.has_section('appx_assets'):
         for name, path in metadata.items('appx_assets'):
             path = os.path.join(baseDir, path)
             files.read(path, '{}/{}'.format(ASSETS_DIR, name))
 
     files[MANIFEST] = create_appx_manifest(params, files, releaseBuild)
     files[BLOCKMAP] = create_appx_blockmap(files)
     files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
 
     files.zip(outfile, compression=zipfile.ZIP_STORED)