Docserver: Enable GitHub content providers.

chrome/common/extensions/docs/server2/content_providers.py

 # Copyright 2013 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.
 
 import logging
 from operator import itemgetter
 import posixpath
 
 from chroot_file_system import ChrootFileSystem
 from content_provider import ContentProvider
 from svn_constants import JSON_PATH
 from third_party.json_schema_compiler.memoize import memoize
 
 
 _CONFIG_PATH = '%s/content_providers.json' % JSON_PATH
 
 
 class ContentProviders(object):
   '''Implements the content_providers.json configuration; see
   chrome/common/extensions/docs/templates/json/content_providers.json for its
   current state and a description of the format.
 
   Returns ContentProvider instances based on how they're configured there.
   '''
 
-  def __init__(self, compiled_fs_factory, host_file_system):
+  def __init__(self,
+               compiled_fs_factory,
+               host_file_system,
+               github_file_system_provider):
     self._compiled_fs_factory = compiled_fs_factory
     self._host_file_system = host_file_system
+    self._github_file_system_provider = github_file_system_provider
     self._cache = compiled_fs_factory.ForJson(host_file_system)
 
   @memoize
   def GetByName(self, name):
     '''Gets the ContentProvider keyed by |name| in content_providers.json, or
     None of there is no such content provider.
     '''
     config = self._GetConfig().get(name)
     if config is None:
       logging.error('No content provider found with name "%s"' % name)
@@ skipping 31 matching lines @@
     supports_templates = config.get('supportsTemplates', False)
     supports_zip = config.get('supportsZip', False)
 
     if 'chromium' in config:
       chromium_config = config['chromium']
       if 'dir' not in chromium_config:
         logging.error('"chromium" must have a "dir" property')
         return None
       file_system = ChrootFileSystem(self._host_file_system,
                                      chromium_config['dir'])
+    elif 'github' in config:
+      github_config = config['github']
+      if 'owner' not in github_config or 'repo' not in github_config:
+        logging.error('"github" must provide a owner and repo')

[Jeffrey Yasskin, 2013/11/06 04:00:19]

I think your error should include the name of the content provider, so that it's
clear which lines in the json file we should be fixing. I missed this for the
'chromium' error, but that should include the name too.

[not at google - send to devlin, 2013/11/06 23:00:13]

Good idea.

+        return None
+      file_system = self._github_file_system_provider.Create(

[Jeffrey Yasskin, 2013/11/06 04:00:19]

Does github need to provide a chroot too?

[not at google - send to devlin, 2013/11/06 23:00:13]

Not yet, but might as well.

+          github_config['owner'], github_config['repo'])
     else:
       logging.error('Content provider type "%s" not supported', type_)
       return None
 
     return ContentProvider(name,
                            self._compiled_fs_factory,
                            file_system,
                            supports_templates=supports_templates,
                            supports_zip=supports_zip)
 
   def Cron(self):
     for name, config in self._GetConfig().iteritems():
       self._CreateContentProvider(name, config).Cron()