| OLD | NEW |
| 1 # Copyright 2017 The Chromium Authors. All rights reserved. | 1 # Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 """Methods for converting model objects to human-readable formats.""" | 4 """Methods for converting model objects to human-readable formats.""" |
| 5 | 5 |
| 6 import datetime | 6 import datetime |
| 7 import itertools | 7 import itertools |
| 8 import time | 8 import time |
| 9 | 9 |
| 10 import models | 10 import models |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 if self.verbose and len(removed_paths): | 168 if self.verbose and len(removed_paths): |
| 169 path_delta_desc.append('Removed files:') | 169 path_delta_desc.append('Removed files:') |
| 170 path_delta_desc.extend(' ' + p for p in sorted(removed_paths)) | 170 path_delta_desc.extend(' ' + p for p in sorted(removed_paths)) |
| 171 | 171 |
| 172 diff = diff if self.verbose else diff.WhereNotUnchanged() | 172 diff = diff if self.verbose else diff.WhereNotUnchanged() |
| 173 group_desc = self._DescribeSymbolGroup(diff) | 173 group_desc = self._DescribeSymbolGroup(diff) |
| 174 return itertools.chain(symbol_delta_desc, path_delta_desc, ('',), | 174 return itertools.chain(symbol_delta_desc, path_delta_desc, ('',), |
| 175 group_desc) | 175 group_desc) |
| 176 | 176 |
| 177 def _DescribeSizeInfoDiff(self, diff): | 177 def _DescribeSizeInfoDiff(self, diff): |
| 178 common_metadata = {k: v for k, v in diff.old_metadata.iteritems() | 178 common_metadata = {k: v for k, v in diff.before_metadata.iteritems() |
| 179 if diff.new_metadata[k] == v} | 179 if diff.after_metadata[k] == v} |
| 180 old_metadata = {k: v for k, v in diff.old_metadata.iteritems() | 180 before_metadata = {k: v for k, v in diff.before_metadata.iteritems() |
| 181 if k not in common_metadata} | 181 if k not in common_metadata} |
| 182 new_metadata = {k: v for k, v in diff.new_metadata.iteritems() | 182 after_metadata = {k: v for k, v in diff.after_metadata.iteritems() |
| 183 if k not in common_metadata} | 183 if k not in common_metadata} |
| 184 metadata_desc = itertools.chain( | 184 metadata_desc = itertools.chain( |
| 185 ('Common Metadata:',), | 185 ('Common Metadata:',), |
| 186 (' %s' % line for line in DescribeMetadata(common_metadata)), | 186 (' %s' % line for line in DescribeMetadata(common_metadata)), |
| 187 ('Old Metadata:',), | 187 ('Old Metadata:',), |
| 188 (' %s' % line for line in DescribeMetadata(old_metadata)), | 188 (' %s' % line for line in DescribeMetadata(before_metadata)), |
| 189 ('New Metadata:',), | 189 ('New Metadata:',), |
| 190 (' %s' % line for line in DescribeMetadata(new_metadata))) | 190 (' %s' % line for line in DescribeMetadata(after_metadata))) |
| 191 section_desc = self._DescribeSectionSizes(diff.section_sizes) | 191 section_desc = self._DescribeSectionSizes(diff.section_sizes) |
| 192 group_desc = self.GenerateLines(diff.symbols) | 192 group_desc = self.GenerateLines(diff.symbols) |
| 193 return itertools.chain(metadata_desc, section_desc, ('',), group_desc) | 193 return itertools.chain(metadata_desc, section_desc, ('',), group_desc) |
| 194 | 194 |
| 195 def _DescribeSizeInfo(self, size_info): | 195 def _DescribeSizeInfo(self, size_info): |
| 196 metadata_desc = itertools.chain( | 196 metadata_desc = itertools.chain( |
| 197 ('Metadata:',), | 197 ('Metadata:',), |
| 198 (' %s' % line for line in DescribeMetadata(size_info.metadata))) | 198 (' %s' % line for line in DescribeMetadata(size_info.metadata))) |
| 199 section_desc = self._DescribeSectionSizes(size_info.section_sizes) | 199 section_desc = self._DescribeSectionSizes(size_info.section_sizes) |
| 200 coverage_desc = () | 200 coverage_desc = () |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 | 277 |
| 278 def GenerateLines(obj, verbose=False, recursive=False): | 278 def GenerateLines(obj, verbose=False, recursive=False): |
| 279 """Returns an iterable of lines (without \n) that describes |obj|.""" | 279 """Returns an iterable of lines (without \n) that describes |obj|.""" |
| 280 return Describer(verbose=verbose, recursive=recursive).GenerateLines(obj) | 280 return Describer(verbose=verbose, recursive=recursive).GenerateLines(obj) |
| 281 | 281 |
| 282 | 282 |
| 283 def WriteLines(lines, func): | 283 def WriteLines(lines, func): |
| 284 for l in lines: | 284 for l in lines: |
| 285 func(l) | 285 func(l) |
| 286 func('\n') | 286 func('\n') |
| OLD | NEW |