Issue 2181 - [cms] Test server should accept default page for subdirectories as well

cms/bin/test_server.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 24 matching lines @@
   ".jpeg": "image/jpeg",
 }
 
 def get_data(path):
   if source.has_static(path):
     return source.read_static(path)
 
   path = path.rstrip("/")
   if path == "":
     path = source.read_config().get("general", "defaultlocale")
-  if "/" not in path:
-    path = "%s/%s" % (path, source.read_config().get("general", "defaultpage"))
+  if "/" in path:
+    locale, page = path.split("/", 1)
+  else:
+    locale, page = path, ""
 
-  locale, page = path.split("/", 1)
+  default_page = source.read_config().get("general", "defaultpage")
+  alternative_page = "/".join([page, default_page]).lstrip("/")
   for format in converters.iterkeys():
-    if source.has_page(page, format):
-      return process_page(source, locale, page, format, "http://127.0.0.1:5000").encode("utf-8")
+    for p in (page, alternative_page):
+      if source.has_page(p, format):
+        return process_page(source, locale, p, format, "http://127.0.0.1:5000").encode("utf-8")
   if source.has_localizable_file(locale, page):
     return source.read_localizable_file(locale, page)
 
   return None
 
 @app.route("/", methods = ["GET"])
 @app.route("/<path:path>", methods = ["GET"])
 def show(path=""):
   data = get_data(path)
   if data == None:
     flask.abort(404)
 
   root, ext = os.path.splitext(path)
   mime = mime_types.get(ext.lower(), "application/octet-stream")
   return data, 200, {"Content-Type": mime}
 
 if __name__ == "__main__":
   if len(sys.argv) < 2:
     print >>sys.stderr, "Usage: %s source_dir" % sys.argv[0]
     sys.exit(1)
 
   source = FileSource(sys.argv[1])
 
   app.run(debug=True)