Docserver overhaul: Gitiles away from me.

chrome/common/extensions/docs/server2/content_provider.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
 import mimetypes
 import posixpath
 import traceback
 
 from compiled_file_system import SingleFile
 from directory_zipper import DirectoryZipper
 from docs_server_utils import ToUnicode
 from file_system import FileNotFoundError
 from future import All, Future
 from path_canonicalizer import PathCanonicalizer
@@ skipping 58 matching lines @@
     self._default_extensions = default_extensions
     self._supports_templates = supports_templates
     if supports_zip:
       self._directory_zipper = DirectoryZipper(compiled_fs_factory, file_system)
     else:
       self._directory_zipper = None
 
   @SingleFile
   def _CompileContent(self, path, text):
     assert text is not None, path
-    _, ext = posixpath.splitext(path)
-    mimetype = _MIMETYPE_OVERRIDES.get(ext, mimetypes.guess_type(path)[0])
-    if ext == '.md':
-      # See http://pythonhosted.org/Markdown/extensions
-      # for details on "extensions=".
-      content = markdown(ToUnicode(text),
-                         extensions=('extra', 'headerid', 'sane_lists'))
-      if self._supports_templates:
-        content = Motemplate(content, name=path)
-      mimetype = 'text/html'
-    elif mimetype is None:
-      content = text
-      mimetype = 'text/plain'
-    elif mimetype == 'text/html':
-      content = ToUnicode(text)
-      if self._supports_templates:
-        content = Motemplate(content, name=path)
-    elif (mimetype.startswith('text/') or
-          mimetype in ('application/javascript', 'application/json')):
-      content = ToUnicode(text)
-    else:
-      content = text
-    return ContentAndType(content,
-                          mimetype,
-                          self.file_system.Stat(path).version)
+    try:

[Ken Rockot(use gerrit already), 2015/05/26 00:26:23]

No logic changes here, just wrapping in a try block.

This prevents things like template syntax errors from breaking refresh, which
was happening before due to some }} somewhere in multidevice HTML.

Broken content will be replaced with empty content and log a warning.

+      _, ext = posixpath.splitext(path)
+      mimetype = _MIMETYPE_OVERRIDES.get(ext, mimetypes.guess_type(path)[0])
+      if ext == '.md':
+        # See http://pythonhosted.org/Markdown/extensions
+        # for details on "extensions=".
+        content = markdown(ToUnicode(text),
+                           extensions=('extra', 'headerid', 'sane_lists'))
+        mimetype = 'text/html'
+        if self._supports_templates:
+          content = Motemplate(content, name=path)
+      elif mimetype is None:
+        content = text
+        mimetype = 'text/plain'
+      elif mimetype == 'text/html':
+        content = ToUnicode(text)
+        if self._supports_templates:
+          content = Motemplate(content, name=path)
+      elif (mimetype.startswith('text/') or
+            mimetype in ('application/javascript', 'application/json')):
+        content = ToUnicode(text)
+      else:
+        content = text
+      return ContentAndType(content,
+                            mimetype,
+                            self.file_system.Stat(path).version)
+    except Exception as e:
+      logging.warn('In file %s: %s' % (path, e.message))
+      return ContentAndType('', mimetype, self.file_system.Stat(path).version)
 
   def GetCanonicalPath(self, path):
     '''Gets the canonical location of |path|. This class is tolerant of
     spelling errors and missing files that are in other directories, and this
     returns the correct/canonical path for those.
 
     For example, the canonical path of "browseraction" is probably
     "extensions/browserAction.html".
 
     Note that the canonical path is relative to this content provider i.e.
@@ skipping 84 matching lines @@
         futures.append(self.GetContentAndType(Join(root, f)))
         # Also cache the extension-less version of the file if needed.
         base, ext = posixpath.splitext(f)
         if f != SITE_VERIFICATION_FILE and ext in self._default_extensions:
           futures.append(self.GetContentAndType(Join(root, base)))
       # TODO(kalman): Cache .zip files for each directory (if supported).
     return All(futures, except_pass=Exception, except_pass_log=True)
 
   def __repr__(self):
     return 'ContentProvider of <%s>' % repr(self.file_system)