Issue 5333 - Allow cms to generate relative pages

cms/converters.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present 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
@@ skipping 302 matching lines @@
                 self._params['source']
                 .resolve_link(url, self._params['locale']))
 
             if new_url is not None:
                 url = new_url
                 if attr == 'href':
                     post += ' hreflang="{}"'\
                         .format(jinja2.Markup.escape(locale))
 
             if self._params['relative']:
-                current_path = '/' + self._params['locale']
-                path = re.search(r'.*/pages(/.*)',

[Vasily Kuznetsov, 2018/11/07 18:03:02]

This seems fragile: there could be more than one "/pages" substring in the path.
On the other hand, there's also an easier way: self._params['page'] should
contain exactly what you're looking for.

[rhowell, 2018/11/07 20:05:25]

Thanks, that's how I had it in patch set 1, but wasn't sure which would be more
reliable. Done.

-                                 self._params['pagedata'][1])
-                current_path += path.groups()[0]
-                url = make_relative(current_path, url)
+                current_page = '/{}/{}'.format(self._params['locale'],
+                                               self._params['page'])
+                url = make_relative(current_page, url)
 
             return ''.join((pre, jinja2.Markup.escape(url), post))
 
         text = re.sub(r'(<a\s[^<>]*\b(href)=\")([^<>\"]+)(\")',
                       process_link, text)
         text = re.sub(r'(<img\s[^<>]*\b(src)=\")([^<>\"]+)(\")',
                       process_link, text)
         return text
 
     include_start_regex = '<'
@@ skipping 101 matching lines @@
             'linkify': self.linkify,
             'toclist': self.toclist,
         }
 
         globals = {
             'get_string': self.get_string,
             'has_string': self.has_string,
             'get_page_content': self.get_page_content,
             'get_pages_metadata': self.get_pages_metadata,
             'get_canonical_url': self.get_canonical_url,
-            'relative': self._params['relative'],
         }
 
         for dirname, dictionary in [('filters', filters),
                                     ('globals', globals)]:
             for filename in self._params['source'].list_files(dirname):
                 root, ext = os.path.splitext(filename)
                 if ext.lower() != '.py':
                     continue
 
                 path = os.path.join(dirname, filename)
@@ skipping 132 matching lines @@
             stack[-1]['subitems'].append(item)
             stack.append(item)
         return structured
 
 
 converters = {
     'html': RawConverter,
     'md': MarkdownConverter,
     'tmpl': TemplateConverter,
 }