Revert "Revert 149811 - adding redirect from codesite to chrome domain (bug 138776)"

chrome/common/extensions/docs/server/main.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 cgi
 import logging
 import os
 import re
 
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp.util import run_wsgi_app
 from google.appengine.api import memcache
 from google.appengine.api import urlfetch
 
 import app_known_issues
 
 DEFAULT_CACHE_TIME = 300
 VIEW_VC_ROOT = 'http://src.chromium.org'
-
+CHROME_DOMAIN_URL = 'http://developer.chrome.com'
 
 class Channel():
   def __init__(self, name, tag):
     self.name = name
     self.tag = tag
 
 Channel.DEV = Channel("dev", "2.0-dev")
 Channel.BETA = Channel("beta", "1.1-beta")
 Channel.STABLE = Channel("stable", "")
 Channel.TRUNK = Channel("trunk", "")
@@ skipping 116 matching lines @@
 
     # TODO(aa): Remove once we have a homepage for developer.chrome.com.
     if (self.path == [] and
         self.request.url.startswith('http://developer.chrome.com')):
       self.redirect('http://developers.google.com/chrome')
       return False
 
     return self.redirectToIndexIfNecessary()
 
 
-  def stripPathPrefix(self):
-    # Remove chrome prefix if present. This happens in the case of
-    # http://code.google.com/chrome/extensions/...
-    if self.path[0:2] == ['chrome', 'extensions']:
-      self.path = self.path[2:]
-    return self.redirectToIndexIfNecessary()
-
-
   def initChannel(self):
     self.channel = GetChannelByName(self.path[0])
     if self.channel is not None:
       self.path.pop(0)
     else:
       self.channel = Channel.DEFAULT
     return self.redirectToIndexIfNecessary()
 
 
   def initDocFamily(self):
     if self.path[0] in ('extensions', 'apps'):
-      self.docFamily = self.path[0]
-      self.path.pop(0)
+      self.docFamily = self.path.pop(0)
     else:
       self.docFamily = 'extensions'
     return self.redirectToIndexIfNecessary()
 
 
+  def redirectDomain(self):
+    if (self.request.url.startswith('http://code.google.com')):
+      self.path.pop(0)  # 'chrome'
+      for channel in ['dev', 'beta', 'stable', 'trunk']:
+        if channel in self.path:
+          position = self.path.index(channel)
+          self.path.pop(position)
+          self.path.insert(0, channel)
+      self.redirect(CHROME_DOMAIN_URL + '/' + '/'.join(self.path), True)
+      return False
+    else:
+      return True
+
+
   def fetchContent(self):
     logging.info("fetching: %s" % str((self.branch, self.docFamily, self.path)))
 
     # For extensions, try the old directory layout first.
     result = None
     oldUrl = ''
 
     if self.docFamily == 'extensions':
       oldUrl = GetSrcUrl(self.branch, None, self.path)
       result = urlfetch.fetch(oldUrl)
@@ skipping 10 matching lines @@
     if (self.path[0] == 'examples' and
         not (result.headers['content-type'].startswith('image/') or
              result.headers['Content-Type'].startswith('image/'))):
       result.headers['content-type'] = 'text/plain'
 
     return result
 
 
   def get(self):
     if (not self.initPath() or
-        not self.stripPathPrefix() or
+        not self.redirectDomain() or
         not self.initChannel() or
         not self.initDocFamily()):
       return
 
     cacheKey = str((self.channel.name, self.docFamily, self.path))
     result = memcache.get(cacheKey)
     if result is None:
       logging.info("cache miss: " + cacheKey)
 
       self.branch = None
@@ skipping 14 matching lines @@
   ('/.*', MainPage),
 ], debug=False)
 
 
 def main():
   run_wsgi_app(application)
 
 
 if __name__ == '__main__':
   main()