Issue 2119 - Add get_page_content template function.

cms/utils.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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 from .converters import converters, TemplateConverter
 
-def process_page(source, locale, page, format, site_url_override=None):
+def get_page_params(source, locale, page, format=None, site_url_override=None):
+  # Guess page format if omitted, but default to Markdown for friendlier exceptions
+  if format is None:
+    for format in converters.keys():

[Sebastian Noack, 2015/04/08 09:09:32]

Nit: This creates a new list with all the keys in the dictionary, which is
unneeded here. So you should use iterkeys() instead.

(You could also just iterate over the dictionary itself, which lazily yields its
keys as well. But I think Wladimir prefer to explicitly request the keys.)

[kzar, 2015/04/08 09:32:11]

Done.

+      if source.has_page(page, format):
+        break
+    else:
+      format = "md"
+
   params = {
     "source": source,
     "template": "default",
     "locale": locale,
     "page": page,
     "pagedata": source.read_page(page, format),
     "config": source.read_config(),
   }
 
   localefile = page
   if params["config"].has_option("locale_overrides", page):
     localefile = params["config"].get("locale_overrides", page)
   params["localedata"] = source.read_locale(params["locale"], localefile)
 
   if params["config"].has_option("general", "siteurl"):
     if site_url_override:
       params["site_url"] = site_url_override
     else:
       params["site_url"] = params["config"].get("general", "siteurl")
 
   try:
     converter = converters[format](params)
   except KeyError:
     raise Exception("Page %s uses unknown format %s" % (page, format))
 
   # Note: The converter might change some parameters so we can only read in
   # template data here.
   params["templatedata"] = source.read_template(params["template"])
-  template_converter = TemplateConverter(params, key="templatedata")
 
   defaultlocale = params["config"].get("general", "defaultlocale")
   params["defaultlocale"] = defaultlocale
 
   locales = [
     locale
     for locale in source.list_locales()
     if source.has_locale(locale, localefile)
   ]
   if defaultlocale not in locales:
     locales.append(defaultlocale)
   locales.sort()
   params["available_locales"] = locales
 
   params["head"], params["body"] = converter()
-  return template_converter()
+  return params
+
+def process_page(source, locale, page, format, site_url_override=None):
+  return TemplateConverter(
+    get_page_params(source, locale, page, format, site_url_override),
+    key="templatedata"
+  )()