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 285 matching lines @@
             lookup_string,
             text,
             flags=re.S,
         )
 
     def process_links(self, text):
         def make_relative(base_url, target):
             if not target.startswith('/'):
                 # Links to an external resource
                 return target
-            if base_url == target:

[Vasily Kuznetsov, 2018/11/06 12:45:17]

This special case should not be necessary if the algorithm is working right.

[rhowell, 2018/11/07 16:16:58]

Done.

-                target = target.split('/')
-                return target[-1]
-            return relpath(target, base_url)
+            return relpath(target, base_url.rsplit('/', 1)[0])
 
         def process_link(match):
             pre, attr, url, post = match.groups()
             url = jinja2.Markup(url).unescape()
 
             locale, new_url = (
                 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']
-                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,
 }