Issue 2559 - [cms] Detect conflicting pages in the development server

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 32 matching lines @@
       <p>An error occurred while processing the request for {{uri}}:</p>
       <pre>{{error}}</pre>
     {% endif %}
   </body>
 </html>"""
 
 # Create our own instance, the default one will introduce "random" host-specific
 # behavior by parsing local config files.
 mime_types = mimetypes.MimeTypes()
 
-class ConflictingPage(Exception):
-  pass
+def get_page(path):
+  path = path.strip("/")
+  if path == "":
+    path = source.read_config().get("general", "defaultlocale")
+  if "/" in path:
+    locale, page = path.split("/", 1)
+  else:
+    locale, page = path, ""
 
-def get_pages_and_localizable_files(source):
-  for page, format in source.list_pages():
-    yield page
-  for filename in source.list_localizable_files():
-    yield filename
+  default_page = source.read_config().get("general", "defaultpage")
+  alternative_page = "/".join([page, default_page]).lstrip("/")
+
+  for format in converters.iterkeys():
+    for p in (page, alternative_page):
+      if source.has_page(p, format):
+        return (p, process_page(source, locale, p, format, "http://127.0.0.1:5000"))
+  if source.has_localizable_file(locale, page):
+    return (page, source.read_localizable_file(locale, page))
+
+  return (None, None)
+
+def has_conflicting_pages(page):
+  pages = [p for p, _ in source.list_pages()]
+  pages.extend(source.list_localizable_files())
+
+  if pages.count(page) > 1:
+    return True
+  if any(p.startswith(page + "/") or page.startswith(p + "/") for p in pages):
+    return True
+  return False
 
 def get_data(path):
   if source.has_static(path):
     return source.read_static(path)
 
-  path = path.strip("/")
-  if path == "":
-    path = source.read_config().get("general", "defaultlocale")
-  if "/" in path:
-    locale, requested_page = path.split("/", 1)
-  else:
-    locale, requested_page = path, ""
-
-  default_page = source.read_config().get("general", "defaultpage")
-  alternative_page = "/".join([requested_page, default_page]).lstrip("/")
-
-  found_page = None
-  func = None
-  args = None
-
-  for format in converters.iterkeys():
-    for page in (requested_page, alternative_page):
-      if source.has_page(page, format):
-        if found_page:
-          raise ConflictingPage("The requested page correpsonds to multiple files")
-
-        found_page = page
-        func = process_page
-        args = (source, locale, page, format, "http://127.0.0.1:5000")
-
-  if source.has_localizable_file(locale, requested_page):
-    if found_page:
-      raise ConflictingPage("The requested page conflicts with a localizable file")
-
-    found_page = requested_page
-    func = source.read_localizable_file
-    args = (locale, requested_page)
-
-  if not found_page:
-    return None
-
-  for page in get_pages_and_localizable_files(source):
-    if page.startswith(found_page + "/") or found_page.startswith(page + "/"):
-      raise ConflictingPage("The requested path conflicts with the path of another page")
-
-  return func(*args)
+  page, data = get_page(path)
+  if page and has_conflicting_pages(page):
+    raise Exception("The requested page conflicts with another page")
+  return data
 
 def show_error(start_response, status, **kwargs):
   env = jinja2.Environment(autoescape=True)
   template = env.from_string(ERROR_TEMPLATE)
   mime = "text/html; encoding=%s" % UNICODE_ENCODING
   start_response(status, [("Content-Type", mime)])
   for fragment in template.stream(status=status, **kwargs):
     yield fragment.encode(UNICODE_ENCODING)
 
 def handler(environ, start_response):
@@ skipping 40 matching lines @@
           return app(environ, start_response)
         except Exception, e:
           return show_error(start_response, "500 Internal Server Error",
               uri=environ.get("PATH_INFO"), error=e)
 
       server = make_server(host, port, wrapper)
       print " * Running on http://%s:%i/" % server.server_address
       server.serve_forever()
 
   run("localhost", 5000, handler, use_reloader=True, use_debugger=True)