| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 patched_file_system, object_store_creator) | 51 patched_file_system, object_store_creator) |
| 52 | 52 |
| 53 compiled_fs_factory = ChainedCompiledFileSystem.Factory( | 53 compiled_fs_factory = ChainedCompiledFileSystem.Factory( |
| 54 [(patched_compiled_fs_factory, patched_file_system), | 54 [(patched_compiled_fs_factory, patched_file_system), |
| 55 (base_compiled_fs_factory, base_file_system)]) | 55 (base_compiled_fs_factory, base_file_system)]) |
| 56 return ServerInstance(channel, | 56 return ServerInstance(channel, |
| 57 object_store_creator, | 57 object_store_creator, |
| 58 patched_file_system, | 58 patched_file_system, |
| 59 self._delegate.CreateAppSamplesFileSystem( | 59 self._delegate.CreateAppSamplesFileSystem( |
| 60 base_object_store_creator), | 60 base_object_store_creator), |
| 61 '/_patch/%s/static' % self._issue, | 61 '/_patch/%s' % self._issue, |
| 62 compiled_fs_factory) | 62 compiled_fs_factory) |
| 63 | 63 |
| 64 class PatchServlet(Servlet): | 64 class PatchServlet(Servlet): |
| 65 '''Servlet which renders patched docs. | 65 '''Servlet which renders patched docs. |
| 66 ''' | 66 ''' |
| 67 def __init__(self, request, delegate=None): | 67 def __init__(self, request, delegate=None): |
| 68 self._request = request | 68 self._request = request |
| 69 self._delegate = delegate or InstanceServlet.Delegate() | 69 self._delegate = delegate or InstanceServlet.Delegate() |
| 70 | 70 |
| 71 def Get(self): | 71 def Get(self): |
| (...skipping 25 matching lines...) Expand all Loading... |
| 97 except RietveldPatcherError as e: | 97 except RietveldPatcherError as e: |
| 98 response = Response.NotFound(e.message, {'Content-Type': 'text/plain'}) | 98 response = Response.NotFound(e.message, {'Content-Type': 'text/plain'}) |
| 99 | 99 |
| 100 redirect_url, permanent = response.GetRedirect() | 100 redirect_url, permanent = response.GetRedirect() |
| 101 if redirect_url is not None: | 101 if redirect_url is not None: |
| 102 if redirect_url.startswith('/trunk/'): | 102 if redirect_url.startswith('/trunk/'): |
| 103 redirect_url = redirect_url.split('/trunk', 1)[1] | 103 redirect_url = redirect_url.split('/trunk', 1)[1] |
| 104 response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url), | 104 response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url), |
| 105 permanent) | 105 permanent) |
| 106 return response | 106 return response |
| OLD | NEW |