Issue 6552 - Support arbitrary manifest values

packagerChrome.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 errno
 import glob
 import io
 import json
 import os
 import re
@@ skipping 83 matching lines @@
                 # ... = icon-19.png icon-38.png popup.html
                 popup = icons.pop()
                 icon = makeIcons(files, icons)
         else:
             # ... = icon-16.png icon-32.png icon-48.png
             icon = makeIcons(files, icons)
             popup = None
 
         templateData[opt] = {'icon': icon, 'popup': popup}
 
+    # Generate templatedataa which does not need special processing

[Sebastian Noack, 2018/04/14 00:33:07]

Typo: templatedataa -> templatedata

[tlucas, 2018/04/14 08:36:23]

Acknowledged.

[tlucas, 2018/04/18 14:46:04]

Done. (Removed it completely)

+    templateData.update({'extra': metadata.as_json_object('manifest')})
+
     if metadata.has_option('general', 'icons'):
         templateData['icons'] = makeIcons(files,
                                           metadata.get('general', 'icons').split())
 
-    if metadata.has_option('general', 'permissions'):
-        templateData['permissions'] = metadata.get('general', 'permissions').split()
-
-    if metadata.has_option('general', 'optionalPermissions'):
-        templateData['optionalPermissions'] = metadata.get(
-            'general', 'optionalPermissions').split()
-
     if metadata.has_option('general', 'backgroundScripts'):
         templateData['backgroundScripts'] = metadata.get(
             'general', 'backgroundScripts').split()
         if params['devenv']:
             templateData['backgroundScripts'].append('devenvPoller__.js')
 
-    if metadata.has_option('general', 'webAccessible') and metadata.get('general', 'webAccessible') != '':
-        templateData['webAccessible'] = metadata.get('general',
-                                                     'webAccessible').split()
-
     if metadata.has_section('contentScripts'):
         contentScripts = []
         for run_at, scripts in metadata.items('contentScripts'):
             if scripts == '':
                 continue
             contentScripts.append({
                 'matches': ['http://*/*', 'https://*/*'],
                 'js': scripts.split(),
                 'run_at': run_at,
                 'all_frames': True,
                 'match_about_blank': True,
             })
         templateData['contentScripts'] = contentScripts
     if params['type'] == 'gecko':
         templateData['app_id'] = get_app_id(params['releaseBuild'], metadata)
 
     manifest = template.render(templateData)
 
     # Normalize JSON structure
     licenseComment = re.compile(r'/\*.*?\*/', re.S)
     data = json.loads(re.sub(licenseComment, '', manifest, 1))
     if '_dummy' in data:
         del data['_dummy']
     manifest = json.dumps(data, sort_keys=True, indent=2)

[Sebastian Noack, 2018/04/14 09:08:39]

If we inject the generic keys here, we don't have to touch the template at all: 

  data.update(metadata.as_json_object('manifest'))

Or even better, if we pass "data" to "metadata.as_json_object()" (or whatever we
end up calling this function), and merge the keys into the existing document,
adding foo.x through the "metadata" section would work correctly even if foo.y
is already generated by other means.

Also I just noticed the sort_keys=True here. So I wonder if there is even a
point to use OrderedDict?

[tlucas, 2018/04/18 14:46:05]

OrderedDict is indeed not necessary, removed it.
The rest is also pretty neat, done!

 
     return manifest.encode('utf-8')
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
@@ skipping 237 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)