Switch the downloads API over to IDL/json_schema_compiler

chrome/common/extensions/docs/build/directory.py

 # 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.
 
 """Class for parsing metadata about extension samples."""
 
 import locale
 import os
 import os.path
 import re
@@ skipping 65 matching lines @@
 
 def parse_idl_file(path):
   """ Load the specified file and parse it as IDL.
 
   Args:
     path: Path to a file containing JSON-encoded data.
   """
   api_def = idl_schema.Load(path)
   for namespace_def in api_def:
     namespace_dot = namespace_def['namespace'] + '.'
-    types = dict((type_['id'], type_)
-                for type_ in namespace_def.get('types', [])
-                if type_)
+    inline_types = dict((type_['id'], type_)
+                        for type_ in namespace_def.get('types', [])
+                        if type_ and type_.get('inline_doc', False))
     def SubstituteInlineDoc(prop):
       prop_ref_type = prop.get('$ref', '')
-      type_obj = types.get(namespace_dot + prop_ref_type,
-                              types.get(prop_ref_type, {}))
+      type_obj = inline_types.get(namespace_dot + prop_ref_type,
+                                  inline_types.get(prop_ref_type, {}))
       if not type_obj:
         return
       if 'properties' in type_obj:
         del prop['$ref']
         prop['properties'] = dict(type_obj['properties'])
         prop['type'] = 'object'
         for sub_prop in prop['properties'].values():
           if isinstance(sub_prop, dict):
             if 'nodoc' in sub_prop:
               del sub_prop['nodoc']
             if 'name' in sub_prop:
               del sub_prop['name']
       elif 'enum' in type_obj and 'type' in type_obj:
         del prop['$ref']
         prop['type'] = type_obj['type']
         prop['enum'] = type_obj['enum']
     def FixReferences(prop):
       # Strip namespace_dot from $ref names.
       if prop.get('$ref', '').startswith(namespace_dot):
         prop['$ref'] = prop['$ref'][len(namespace_dot):]
       if (prop.get('type', '') == 'array' and
           prop.get('items', {}).get('$ref', '').startswith(namespace_dot)):
         prop['items']['$ref'] = prop['items']['$ref'][len(namespace_dot):]
-      if prop.get('inline_doc', False):
-        del prop['inline_doc']
-        SubstituteInlineDoc(prop)
-        if 'items' in prop:
-          SubstituteInlineDoc(prop['items'])
+      SubstituteInlineDoc(prop)
+      if 'items' in prop:
+        SubstituteInlineDoc(prop['items'])
 
     for type_ in namespace_def.get('types', []):
       if type_.get('id', '').startswith(namespace_dot):
         type_['id'] = type_['id'][len(namespace_dot):]
       for prop in type_.get('properties', {}).values():
         FixReferences(prop)
+      if type_.get('inline_doc', False):
+        del type_['inline_doc']
+        type_['nodoc'] = True
     for func in namespace_def.get('functions', []):
       for param in func.get('parameters', []):
         FixReferences(param)
         for cb_param in param.get('parameters', []):
           FixReferences(cb_param)
     for event in namespace_def.get('events', []):
       for param in event.get('parameters', []):
         FixReferences(param)
   return api_def
 
@@ skipping 724 matching lines @@
           zip_file.write(abspath, relpath)
           if file == 'manifest.json':
             info = zip_file.getinfo(zip_manifest_path)
             info.comment = self['source_hash']
     except RuntimeError, msg:
       raise Exception("Could not write zip at %s: %s" % (zip_path, msg))
     finally:
       zip_file.close()
 
     return self._get_relative_zip_path()