Docs: Remove unnecessary redirects from directories to 'index' files since we

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 Future
 from path_canonicalizer import PathCanonicalizer
-from path_util import AssertIsValid, Join, ToDirectory
+from path_util import AssertIsValid, IsDirectory, Join, ToDirectory
 from special_paths import SITE_VERIFICATION_FILE
 from third_party.handlebar import Handlebar
 from third_party.markdown import markdown
 
 
 _MIMETYPE_OVERRIDES = {
   # SVG is not supported by mimetypes.guess_type on AppEngine.
   '.svg': 'image/svg+xml',
 }
 
@@ skipping 114 matching lines @@
           lambda: ContentAndType(zip_future.Get(), 'application/zip', None))
 
     # If there is no file extension, look for a file with one of the default
     # extensions. If one cannot be found, check if the path is a directory.
     # If it is, then check for an index file with one of the default
     # extensions.
     if not ext:
       new_path = self._AddExt(path)
       # Add a trailing / to check if it is a directory and not a file with
       # no extension.
-      if new_path is None and self.file_system.Exists(path + '/').Get():
-        new_path = self._AddExt(path + '/index')
+      if new_path is None and self.file_system.Exists(ToDirectory(path)).Get():
+        new_path = self._AddExt(Join(path, 'index'))
       if new_path is not None:
         path = new_path
 
+    # If a directory hasn't been rewritten to an index file by now then it's

[Jeffrey Yasskin, 2014/04/16 22:44:09]

"hasn't been ... by now" implies that something previous to this function might
have done it, but I think this would happen 4 lines up if it were going to.
Maybe say that directly? "clearly not found" seems like more of an assumption
than it actually is, since there's a self.file_system.Exists(ToDirectory(path))
call just above too.

[not at google - send to devlin, 2014/04/16 23:03:23]

Good idea, and a check 4 lines up has more context anyway, so I moved it there.

+    # clearly not found, since this class only knows how to serve files.
+    if IsDirectory(path):
+      return FileNotFoundError.RaiseInFuture('"%s" is a directory' % path)
+
     return self._content_cache.GetFromFile(path)
 
   def _AddExt(self, path):
     '''Tries to append each of the default file extensions to path and returns
     the first one that is an existing file.
     '''
     for default_ext in self._default_extensions:
       if self.file_system.Exists(path + default_ext).Get():
         return path + default_ext
     return None
@@ skipping 13 matching lines @@
                           self.GetContentAndType(Join(root, base))))
       # TODO(kalman): Cache .zip files for each directory (if supported).
     def resolve():
       for label, future in futures:
         try: future.Get()
         except: logging.error('%s: %s' % (label, traceback.format_exc()))
     return Future(callback=resolve)
 
   def __repr__(self):
     return 'ContentProvider of <%s>' % repr(self.file_system)