Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: packagerEdge.py

Issue 29542744: Issue 5666 - Replace 4th component of version in AppxManifest.xml with 0 (Closed)
Left Patch Set: Created Sept. 12, 2017, 7:49 p.m.
Right Patch Set: Removed redundant whitespaces Created Sept. 12, 2017, 9:39 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | tests/test_packagerEdge.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # This Source Code Form is subject to the terms of the Mozilla Public 1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this 2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, You can obtain one at http://mozilla.org/MPL/2.0/. 3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
4 4
5 import base64 5 import base64
6 import hashlib 6 import hashlib
7 import json 7 import json
8 import mimetypes 8 import mimetypes
9 import os 9 import os
10 import zipfile 10 import zipfile
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 return template.render(files=files).encode('utf-8') 64 return template.render(files=files).encode('utf-8')
65 65
66 66
67 def load_translation(files, locale): 67 def load_translation(files, locale):
68 """Load translation strings for locale from files.""" 68 """Load translation strings for locale from files."""
69 path = '{}/_locales/{}/messages.json'.format(EXTENSION_DIR, locale) 69 path = '{}/_locales/{}/messages.json'.format(EXTENSION_DIR, locale)
70 return json.loads(files[path]) 70 return json.loads(files[path])
71 71
72 72
73 def fix_version(version): 73 def fix_version(version):
74 """ 74 """Prepare a version number for usage in AppxManifest.xml.
75 Prepares a version number for usage in AppxManifest.xml which requires 75
76 As required by the Windows Store, the returned version string has
76 four components with the last component being zero (e.g. 12.34.56.0). 77 four components with the last component being zero (e.g. 12.34.56.0).
tlucas 2017/09/12 21:24:18 You should use the imperative for docstrings, e.g.
Sebastian Noack 2017/09/12 21:35:45 Done.
77 """ 78 """
78 components = version.split('.')[:3] 79 components = version.split('.')[:3]
79 components.extend(['0'] * (4 - len(components))) 80 components.extend(['0'] * (4 - len(components)))
80 return '.'.join(components) 81 return '.'.join(components)
81 82
82 83
83 def create_appx_manifest(params, files, release_build=False): 84 def create_appx_manifest(params, files, release_build=False):
84 """Create AppxManifest.xml.""" 85 """Create AppxManifest.xml."""
85 params = dict(params) 86 params = dict(params)
86 metadata = params['metadata'] 87 metadata = params['metadata']
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 if metadata.has_section('appx_assets'): 190 if metadata.has_section('appx_assets'):
190 for name, path in metadata.items('appx_assets'): 191 for name, path in metadata.items('appx_assets'):
191 path = os.path.join(baseDir, path) 192 path = os.path.join(baseDir, path)
192 files.read(path, '{}/{}'.format(ASSETS_DIR, name)) 193 files.read(path, '{}/{}'.format(ASSETS_DIR, name))
193 194
194 files[MANIFEST] = create_appx_manifest(params, files, releaseBuild) 195 files[MANIFEST] = create_appx_manifest(params, files, releaseBuild)
195 files[BLOCKMAP] = create_appx_blockmap(files) 196 files[BLOCKMAP] = create_appx_blockmap(files)
196 files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP]) 197 files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
197 198
198 files.zip(outfile, compression=zipfile.ZIP_STORED) 199 files.zip(outfile, compression=zipfile.ZIP_STORED)
LEFTRIGHT

Powered by Google App Engine
This is Rietveld