| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from fnmatch import fnmatch | 5 from fnmatch import fnmatch |
| 6 import logging | 6 import logging |
| 7 from urlparse import urlparse | 7 from urlparse import urlparse |
| 8 | 8 |
| 9 from appengine_url_fetcher import AppEngineUrlFetcher | 9 from appengine_url_fetcher import AppEngineUrlFetcher |
| 10 from appengine_wrappers import IsDevServer | 10 from appengine_wrappers import IsDevServer |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 import url_constants | 23 import url_constants |
| 24 | 24 |
| 25 class _PatchServletDelegate(RenderServlet.Delegate): | 25 class _PatchServletDelegate(RenderServlet.Delegate): |
| 26 def __init__(self, issue, delegate): | 26 def __init__(self, issue, delegate): |
| 27 self._issue = issue | 27 self._issue = issue |
| 28 self._delegate = delegate | 28 self._delegate = delegate |
| 29 | 29 |
| 30 def CreateServerInstanceForChannel(self, channel): | 30 def CreateServerInstanceForChannel(self, channel): |
| 31 base_object_store_creator = ObjectStoreCreator(channel, | 31 base_object_store_creator = ObjectStoreCreator(channel, |
| 32 start_empty=False) | 32 start_empty=False) |
| 33 branch_utility = self._delegate.CreateBranchUtility( |
| 34 base_object_store_creator) |
| 33 # TODO(fj): Use OfflineFileSystem here once all json/idl files in api/ | 35 # TODO(fj): Use OfflineFileSystem here once all json/idl files in api/ |
| 34 # are pulled into data store by cron jobs. | 36 # are pulled into data store by cron jobs. |
| 35 base_file_system = CachingFileSystem( | 37 base_file_system = CachingFileSystem( |
| 36 self._delegate.CreateHostFileSystemForBranch(channel), | 38 self._delegate.CreateHostFileSystemForBranch( |
| 39 branch_utility.GetChannelInfo(channel).branch), |
| 37 base_object_store_creator) | 40 base_object_store_creator) |
| 38 base_compiled_fs_factory = CompiledFileSystem.Factory( | 41 base_compiled_fs_factory = CompiledFileSystem.Factory( |
| 39 base_file_system, base_object_store_creator) | 42 base_file_system, base_object_store_creator) |
| 40 | 43 |
| 41 object_store_creator = ObjectStoreCreator('trunk@%s' % self._issue, | 44 object_store_creator = ObjectStoreCreator('trunk@%s' % self._issue, |
| 42 start_empty=False) | 45 start_empty=False) |
| 43 rietveld_patcher = CachingRietveldPatcher( | 46 rietveld_patcher = CachingRietveldPatcher( |
| 44 RietveldPatcher(svn_constants.EXTENSIONS_PATH, | 47 RietveldPatcher(svn_constants.EXTENSIONS_PATH, |
| 45 self._issue, | 48 self._issue, |
| 46 AppEngineUrlFetcher(url_constants.CODEREVIEW_SERVER)), | 49 AppEngineUrlFetcher(url_constants.CODEREVIEW_SERVER)), |
| 47 object_store_creator) | 50 object_store_creator) |
| 48 patched_file_system = PatchedFileSystem(base_file_system, | 51 patched_file_system = PatchedFileSystem(base_file_system, |
| 49 rietveld_patcher) | 52 rietveld_patcher) |
| 50 patched_compiled_fs_factory = CompiledFileSystem.Factory( | 53 patched_compiled_fs_factory = CompiledFileSystem.Factory( |
| 51 patched_file_system, object_store_creator) | 54 patched_file_system, object_store_creator) |
| 52 | 55 |
| 53 compiled_fs_factory = ChainedCompiledFileSystem.Factory( | 56 compiled_fs_factory = ChainedCompiledFileSystem.Factory( |
| 54 [(patched_compiled_fs_factory, patched_file_system), | 57 [(patched_compiled_fs_factory, patched_file_system), |
| 55 (base_compiled_fs_factory, base_file_system)]) | 58 (base_compiled_fs_factory, base_file_system)]) |
| 59 |
| 60 def create_file_system(version): |
| 61 return CachingFileSystem( |
| 62 self._delegate.CreateHostFileSystemForBranch( |
| 63 branch_utility.GetBranchForVersion(version)), |
| 64 base_object_store_creator) |
| 65 |
| 56 return ServerInstance(channel, | 66 return ServerInstance(channel, |
| 57 object_store_creator, | 67 object_store_creator, |
| 58 patched_file_system, | 68 patched_file_system, |
| 59 self._delegate.CreateAppSamplesFileSystem( | 69 self._delegate.CreateAppSamplesFileSystem( |
| 60 base_object_store_creator), | 70 base_object_store_creator), |
| 61 '/_patch/%s' % self._issue, | 71 '/_patch/%s' % self._issue, |
| 62 compiled_fs_factory) | 72 compiled_fs_factory, |
| 73 branch_utility, |
| 74 create_file_system) |
| 63 | 75 |
| 64 class PatchServlet(Servlet): | 76 class PatchServlet(Servlet): |
| 65 '''Servlet which renders patched docs. | 77 '''Servlet which renders patched docs. |
| 66 ''' | 78 ''' |
| 67 def __init__(self, request, delegate=None): | 79 def __init__(self, request, delegate=None): |
| 68 self._request = request | 80 self._request = request |
| 69 self._delegate = delegate or InstanceServlet.Delegate() | 81 self._delegate = delegate or InstanceServlet.Delegate() |
| 70 | 82 |
| 71 def Get(self): | 83 def Get(self): |
| 72 if (not IsDevServer() and | 84 if (not IsDevServer() and |
| (...skipping 24 matching lines...) Expand all Loading... |
| 97 except RietveldPatcherError as e: | 109 except RietveldPatcherError as e: |
| 98 response = Response.NotFound(e.message, {'Content-Type': 'text/plain'}) | 110 response = Response.NotFound(e.message, {'Content-Type': 'text/plain'}) |
| 99 | 111 |
| 100 redirect_url, permanent = response.GetRedirect() | 112 redirect_url, permanent = response.GetRedirect() |
| 101 if redirect_url is not None: | 113 if redirect_url is not None: |
| 102 if redirect_url.startswith('/trunk/'): | 114 if redirect_url.startswith('/trunk/'): |
| 103 redirect_url = redirect_url.split('/trunk', 1)[1] | 115 redirect_url = redirect_url.split('/trunk', 1)[1] |
| 104 response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url), | 116 response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url), |
| 105 permanent) | 117 permanent) |
| 106 return response | 118 return response |
| OLD | NEW |