Issue 4047 - Improved configuration of converted JS files

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 io
 import json
 import os
 import re
 from StringIO import StringIO
 import struct
 import sys
-from collections import OrderedDict
+import collections
 
 import packager
 from packager import readMetadata, getMetadataPath, getDefaultFileName, getBuildVersion, getTemplate, Files
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
@@ skipping 115 matching lines @@
 
 
 def createInfoModule(params):
     template = getTemplate('chromeInfo.js.tmpl')
     return template.render(params).encode('utf-8')
 
 
 def convertJS(params, files):
     from jshydra.abp_rewrite import rewrite_js
 
-    output_files = OrderedDict()
+    output_files = collections.OrderedDict()
+    args = collections.defaultdict(list)
+
     for item in params['metadata'].items('convert_js'):
         filename, arg = re.search(r'^(.*?)(?:\[(.*)\])?$', item[0]).groups()
         if arg is None:
-            output_files[filename] = (item[1].split(), item.source, [])
+            output_files[filename] = (item[1].split(), item.source)
         else:
-            output_files[filename][2].append('{}={}'.format(arg, item[1]))

[Vasily Kuznetsov, 2016/08/29 16:56:40]

Perhaps we should issue a more user-friendly message here if the options come
before the destination. It seems right now it will just `KeyError`.

[Sebastian Noack, 2016/08/30 12:40:31]

Well, it's simpler to avoid that error than handling it. Did that.

[Vasily Kuznetsov, 2016/08/30 13:30:18]

Indeed. Actually you can make the code even cleaner by using
`collections.defaultdict` for `args`.

[Sebastian Noack, 2016/08/30 14:06:50]

Yeah, that is even better. Done.

-
-    for filename, (input_files, origin, args) in output_files.iteritems():
+            args[filename].append('{}={}'.format(arg, item[1]))
+
+    for filename, (input_files, origin) in output_files.iteritems():
         if '/' in filename and not files.isIncluded(filename):
             continue
 
         base_dir = os.path.dirname(origin)
-        jshydra_args = ['--arg', ' '.join(args)]
+        jshydra_args = ['--arg', ' '.join(args[filename])]
 
         for input_filename in input_files:
             jshydra_args.append(os.path.join(base_dir, input_filename))
             files.pop(input_filename, None)
 
         files[filename] = rewrite_js(jshydra_args)
 
 
 def toJson(data):
     return json.dumps(
@@ skipping 209 matching lines @@
         files['qunit/index.html'] = createScriptPage(params, 'testIndex.html.tmpl',
                                                      ('general', 'testScripts'))
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)