Allow substitution of messages as variables in other messages.

grit/format/data_pack.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Support for formatting a data pack file used for platform agnostic resource
 files.
 '''
 
 import exceptions
@@ skipping 16 matching lines @@
 class WrongFileVersion(Exception):
   pass
 
 class DataPackContents:
   def __init__(self, resources, encoding):
     self.resources = resources
     self.encoding = encoding
 
 class DataPack(interface.ItemFormatter):
   '''Writes out the data pack file format (platform agnostic resource file).'''
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
-    if not begin_item:
-      return ''
-
+  def Format(self, item, lang='en', output_dir='.'):
     assert isinstance(item, misc.ReleaseNode)
 
     nodes = DataPack.GetDataNodes(item)
     data = {}
     for node in nodes:
       id, value = node.GetDataPackPair(lang, UTF8)
       data[id] = value
     return DataPack.WriteDataPackToString(data, UTF8)
 
   @staticmethod
@@ skipping 99 matching lines @@
                                     str(new_content.encoding))
 
       resources.update(new_content.resources)
 
     # Encoding is 0 for BINARY, 1 for UTF8 and 2 for UTF16
     if encoding is None:
       encoding = BINARY
     DataPack.WriteDataPack(resources, output_file, encoding)
 
 def main():
-  # Just write a simple file.
-  data = { 1: "", 4: "this is id 4", 6: "this is id 6", 10: "" }
-  DataPack.WriteDataPack(data, "datapack1.pak", UTF8)
-  data2 = { 1000: "test", 5: "five" }
-  DataPack.WriteDataPack(data2, "datapack2.pak", UTF8)
-  print "wrote datapack1 and datapack2 to current directory."
+  if len(sys.argv):
+    # When an argument is given, read and explode the file to text
+    # format, for easier diffing.
+    data = DataPack.ReadDataPack(sys.argv[1])
+    print data.encoding
+    for (resource_id, text) in data.resources.iteritems():
+      print "%s: %s" % (resource_id, text)
+  else:
+    # Just write a simple file.
+    data = { 1: "", 4: "this is id 4", 6: "this is id 6", 10: "" }
+    DataPack.WriteDataPack(data, "datapack1.pak", UTF8)
+    data2 = { 1000: "test", 5: "five" }
+    DataPack.WriteDataPack(data2, "datapack2.pak", UTF8)
+    print "wrote datapack1 and datapack2 to current directory."
 
 if __name__ == '__main__':
   main()