| OLD | NEW | 
|---|
| 1 # coding: utf-8 | 1 # coding: utf-8 | 
| 2 | 2 | 
| 3 # This file is part of the Adblock Plus web scripts, | 3 # This file is part of the Adblock Plus web scripts, | 
| 4 # Copyright (C) 2006-2015 Eyeo GmbH | 4 # Copyright (C) 2006-2015 Eyeo GmbH | 
| 5 # | 5 # | 
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 7 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as | 
| 8 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. | 
| 9 # | 9 # | 
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, | 
| 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| 13 # GNU General Public License for more details. | 13 # GNU General Public License for more details. | 
| 14 # | 14 # | 
| 15 # You should have received a copy of the GNU General Public License | 15 # You should have received a copy of the GNU General Public License | 
| 16 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 16 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
| 17 | 17 | 
| 18 from .converters import converters, TemplateConverter | 18 from .converters import converters, TemplateConverter | 
| 19 | 19 | 
| 20 def process_page(source, locale, page, format, site_url_override=None): | 20 def get_page_params(source, locale, page, format, site_url_override=None): | 
| 21   params = { | 21   params = { | 
| 22     "source": source, | 22     "source": source, | 
| 23     "template": "default", | 23     "template": "default", | 
| 24     "locale": locale, | 24     "locale": locale, | 
| 25     "page": page, | 25     "page": page, | 
| 26     "pagedata": source.read_page(page, format), | 26     "pagedata": source.read_page(page, format), | 
| 27     "config": source.read_config(), | 27     "config": source.read_config(), | 
| 28   } | 28   } | 
| 29 | 29 | 
| 30   localefile = page | 30   localefile = page | 
| 31   if params["config"].has_option("locale_overrides", page): | 31   if params["config"].has_option("locale_overrides", page): | 
| 32     localefile = params["config"].get("locale_overrides", page) | 32     localefile = params["config"].get("locale_overrides", page) | 
| 33   params["localedata"] = source.read_locale(params["locale"], localefile) | 33   params["localedata"] = source.read_locale(params["locale"], localefile) | 
| 34 | 34 | 
| 35   if params["config"].has_option("general", "siteurl"): | 35   if params["config"].has_option("general", "siteurl"): | 
| 36     if site_url_override: | 36     if site_url_override: | 
| 37       params["site_url"] = site_url_override | 37       params["site_url"] = site_url_override | 
| 38     else: | 38     else: | 
| 39       params["site_url"] = params["config"].get("general", "siteurl") | 39       params["site_url"] = params["config"].get("general", "siteurl") | 
| 40 | 40 | 
| 41   try: | 41   try: | 
| 42     converter = converters[format](params) | 42     converter = converters[format](params) | 
| 43   except KeyError: | 43   except KeyError: | 
| 44     raise Exception("Page %s uses unknown format %s" % (page, format)) | 44     raise Exception("Page %s uses unknown format %s" % (page, format)) | 
| 45 | 45 | 
| 46   # Note: The converter might change some parameters so we can only read in | 46   # Note: The converter might change some parameters so we can only read in | 
| 47   # template data here. | 47   # template data here. | 
| 48   params["templatedata"] = source.read_template(params["template"]) | 48   params["templatedata"] = source.read_template(params["template"]) | 
| 49   template_converter = TemplateConverter(params, key="templatedata") |  | 
| 50 | 49 | 
| 51   defaultlocale = params["config"].get("general", "defaultlocale") | 50   defaultlocale = params["config"].get("general", "defaultlocale") | 
| 52   params["defaultlocale"] = defaultlocale | 51   params["defaultlocale"] = defaultlocale | 
| 53 | 52 | 
| 54   locales = [ | 53   locales = [ | 
| 55     locale | 54     locale | 
| 56     for locale in source.list_locales() | 55     for locale in source.list_locales() | 
| 57     if source.has_locale(locale, localefile) | 56     if source.has_locale(locale, localefile) | 
| 58   ] | 57   ] | 
| 59   if defaultlocale not in locales: | 58   if defaultlocale not in locales: | 
| 60     locales.append(defaultlocale) | 59     locales.append(defaultlocale) | 
| 61   locales.sort() | 60   locales.sort() | 
| 62   params["available_locales"] = locales | 61   params["available_locales"] = locales | 
| 63 | 62 | 
| 64   params["head"], params["body"] = converter() | 63   params["head"], params["body"] = converter() | 
| 65   return template_converter() | 64   return params | 
|  | 65 | 
|  | 66 def process_page(source, locale, page, format, site_url_override=None): | 
|  | 67   return TemplateConverter( | 
|  | 68     get_page_params(source, locale, page, format, site_url_override), | 
|  | 69     key="templatedata" | 
|  | 70   )() | 
| OLD | NEW | 
|---|