Extension docs server: CSS and content tweaks.

chrome/common/extensions/docs/server2/converter.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.
 
 # Example run from the server2/ directory:
 # $ converter.py ../static/ ../../api templates/articles/ templates/intros/
 #   templates/public/ static/images/ -r
 
 import json
@@ skipping 19 matching lines @@
   'experimental',
   'samples',
   'index',
   'devtools', # Has an intro, but marked as nodoc.
 ]
 
 # These are mappings for APIs that have no intros. They are needed because the
 # names of the JSON files do not give enough information on the actual API name.
 CUSTOM_MAPPINGS = {
   'experimental_input_virtual_keyboard': 'experimental_input_virtualKeyboard',
+  'experimental_system_info_cpu': 'experimental_systemInfo_cpu',
+  'experimental_system_info_storage': 'experimental_systemInfo_storage',
   'input_ime': 'input_ime',
-  'app_window': 'app_window'
+  'app_runtime': 'app_runtime',
+  'app_window': 'app_window',
 }
 
 # These are the extension-only APIs that don't have explicit entries in
 # _permission_features.json, so we can't programmatically figure out that it's
 # extension-only.
 # From api_page_generator.js:548.
 EXTENSIONS_ONLY = [
   'browserAction',
   'extension',
   'input_ime',
@@ skipping 28 matching lines @@
   Shamelessly stolen from json_schema_compiler/model.py.
   """
   name = os.path.splitext(name)[0]
   s1 = re.sub('([a-z])([A-Z])', r'\1_\2', name)
   s2 = re.sub('([A-Z]+)([A-Z][a-z])', r'\1_\2', s1)
   return s2.replace('.', '_').lower()
 
 def _GetDestinations(api_name, api_dir):
   if api_name in EXTENSIONS_ONLY:
     return ['extensions']
-  if api_name.startswith('app'):
+  if api_name.count('app') > 0:
     return ['apps']
   with open(os.path.join(api_dir, '_permission_features.json')) as f:
     permissions = json.loads(json_comment_eater.Nom(f.read()))
   permissions_key = api_name.replace('experimental_', '').replace('_', '.')
   if permissions_key in permissions:
     return_list = []
     types = permissions[permissions_key]['extension_types']
     if 'platform_app' in types:
       return_list.append('apps')
     if 'extension' in types:
       return_list.append('extensions')
     return return_list
   return ['extensions', 'apps']
 
 def _ListAllAPIs(dirname):
   all_files = []
   for path, dirs, files in os.walk(dirname):
     if path == '.':
       all_files.extend([f for f in files
                         if f.endswith('.json') or f.endswith('.idl')])
     else:
       all_files.extend([os.path.join(path, f) for f in files
                         if f.endswith('.json') or f.endswith('.idl')])
   dirname = dirname.rstrip('/') + '/'
   return [f[len(dirname):] for f in all_files
           if os.path.splitext(f)[0].split('_')[-1] not in ['private',
                                                            'internal']]
 
 def _MakeArticleTemplate(filename, path):
-  return ('{{+partials.standard_%s_article article:intros.%s}}' %
+  return ('{{+partials.standard_%s_article article:intros.%s}}\n' %
           (path, filename))
 
 def _MakeAPITemplate(intro_name, path, api_name, has_intro):
   if has_intro:
-    return ('{{+partials.standard_%s_api api:apis.%s intro:intros.%s}}' %
+    return ('{{+partials.standard_%s_api api:apis.%s intro:intros.%s}}\n' %
             (path, api_name, intro_name))
   else:
-    return ('{{+partials.standard_%s_api api:apis.%s}}' %
+    return ('{{+partials.standard_%s_api api:apis.%s}}\n' %
             (path, api_name))
 
 def _GetAPIPath(name, api_dir):
   api_files = _ListAllAPIs(api_dir)
   for filename in api_files:
     if name == _UnixName(SanitizeAPIName(filename)):
       return _UnixName(filename)
 
 def _CleanAPIs(source_dir, api_dir, intros_dest, template_dest, exclude):
   source_files = os.listdir(source_dir)
@@ skipping 215 matching lines @@
   if (not opts.file and len(args) != 6) or (opts.file and len(args) != 7):
     parser.error('incorrect number of arguments.')
 
   if opts.file:
     _MoveSingleFile(*args, replace=opts.replace, svn=opts.svn)
   else:
     _MoveAllFiles(*args,
                   replace=opts.replace,
                   exclude_dir=opts.exclude,
                   svn=opts.svn)