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 |
11 from caching_file_system import CachingFileSystem | 11 from caching_file_system import CachingFileSystem |
12 from caching_rietveld_patcher import CachingRietveldPatcher | 12 from caching_rietveld_patcher import CachingRietveldPatcher |
13 from chained_compiled_file_system import ChainedCompiledFileSystem | 13 from chained_compiled_file_system import ChainedCompiledFileSystem |
14 from compiled_file_system import CompiledFileSystem | 14 from compiled_file_system import CompiledFileSystem |
15 from instance_servlet import InstanceServlet | 15 from instance_servlet import InstanceServlet |
16 from render_servlet import RenderServlet | 16 from render_servlet import RenderServlet |
17 from rietveld_patcher import RietveldPatcher, RietveldPatcherError | 17 from rietveld_patcher import RietveldPatcher, RietveldPatcherError |
18 from object_store_creator import ObjectStoreCreator | 18 from object_store_creator import ObjectStoreCreator |
19 from patched_file_system import PatchedFileSystem | 19 from patched_file_system import PatchedFileSystem |
20 from server_instance import ServerInstance | 20 from server_instance import ServerInstance |
21 from servlet import Request, Response, Servlet | 21 from servlet import Request, Response, Servlet |
| 22 from subversion_file_system import SubversionFileSystem |
22 import svn_constants | 23 import svn_constants |
23 import url_constants | 24 import url_constants |
24 | 25 |
25 class _PatchServletDelegate(RenderServlet.Delegate): | 26 class _PatchServletDelegate(RenderServlet.Delegate): |
26 def __init__(self, issue, delegate): | 27 def __init__(self, issue, delegate): |
27 self._issue = issue | 28 self._issue = issue |
28 self._delegate = delegate | 29 self._delegate = delegate |
29 | 30 |
30 def CreateServerInstanceForChannel(self, channel): | 31 def CreateServerInstanceForChannel(self, channel): |
31 base_object_store_creator = ObjectStoreCreator(channel, | 32 base_object_store_creator = ObjectStoreCreator(channel, |
(...skipping 14 matching lines...) Expand all Loading... |
46 AppEngineUrlFetcher(url_constants.CODEREVIEW_SERVER)), | 47 AppEngineUrlFetcher(url_constants.CODEREVIEW_SERVER)), |
47 object_store_creator) | 48 object_store_creator) |
48 patched_file_system = PatchedFileSystem(base_file_system, | 49 patched_file_system = PatchedFileSystem(base_file_system, |
49 rietveld_patcher) | 50 rietveld_patcher) |
50 patched_compiled_fs_factory = CompiledFileSystem.Factory( | 51 patched_compiled_fs_factory = CompiledFileSystem.Factory( |
51 patched_file_system, object_store_creator) | 52 patched_file_system, object_store_creator) |
52 | 53 |
53 compiled_fs_factory = ChainedCompiledFileSystem.Factory( | 54 compiled_fs_factory = ChainedCompiledFileSystem.Factory( |
54 [(patched_compiled_fs_factory, patched_file_system), | 55 [(patched_compiled_fs_factory, patched_file_system), |
55 (base_compiled_fs_factory, base_file_system)]) | 56 (base_compiled_fs_factory, base_file_system)]) |
| 57 def create_file_system(branch): |
| 58 return CachingFileSystem(SubversionFileSystem.Create(branch), |
| 59 object_store_creator) |
56 return ServerInstance(channel, | 60 return ServerInstance(channel, |
57 object_store_creator, | 61 object_store_creator, |
58 patched_file_system, | 62 patched_file_system, |
59 self._delegate.CreateAppSamplesFileSystem( | 63 self._delegate.CreateAppSamplesFileSystem( |
60 base_object_store_creator), | 64 base_object_store_creator), |
61 '/_patch/%s/static' % self._issue, | 65 '/_patch/%s/static' % self._issue, |
62 compiled_fs_factory) | 66 compiled_fs_factory, |
| 67 create_file_system) |
63 | 68 |
64 class PatchServlet(Servlet): | 69 class PatchServlet(Servlet): |
65 '''Servlet which renders patched docs. | 70 '''Servlet which renders patched docs. |
66 ''' | 71 ''' |
67 def __init__(self, request, delegate=None): | 72 def __init__(self, request, delegate=None): |
68 self._request = request | 73 self._request = request |
69 self._delegate = delegate or InstanceServlet.Delegate() | 74 self._delegate = delegate or InstanceServlet.Delegate() |
70 | 75 |
71 def Get(self): | 76 def Get(self): |
72 if (not IsDevServer() and | 77 if (not IsDevServer() and |
(...skipping 24 matching lines...) Expand all Loading... |
97 except RietveldPatcherError as e: | 102 except RietveldPatcherError as e: |
98 response = Response.NotFound(e.message, {'Content-Type': 'text/plain'}) | 103 response = Response.NotFound(e.message, {'Content-Type': 'text/plain'}) |
99 | 104 |
100 redirect_url, permanent = response.GetRedirect() | 105 redirect_url, permanent = response.GetRedirect() |
101 if redirect_url is not None: | 106 if redirect_url is not None: |
102 if redirect_url.startswith('/trunk/'): | 107 if redirect_url.startswith('/trunk/'): |
103 redirect_url = redirect_url.split('/trunk', 1)[1] | 108 redirect_url = redirect_url.split('/trunk', 1)[1] |
104 response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url), | 109 response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url), |
105 permanent) | 110 permanent) |
106 return response | 111 return response |
OLD | NEW |