kallithea Changeset - ca830f9d01a8

Changeset - ca830f9d01a8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com

helpers: inline url markup in urlify_text

We inline it so we eventually can match all patterns in the same regexp and
thus avoid problems with parsing of formatted html. Inlining it will also make
repo_name and other parameters easily available.

2 files changed with 23 insertions and 13 deletions:

kallithea/lib/helpers.py

kallithea/lib/markup_renderer.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1268,16 +1268,12 @@ def fancy_file_stats(stats): @@
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def _urlify_text_replace(match_obj):
     url_full = match_obj.group(1)
     return '<a href="%(url)s">%(url)s</a>' % {'url': url_full}
 _URLIFY_RE = re.compile(r'''
 # URL markup
 (?P<url>%s)
 ''' % (url_re.pattern),
     re.VERBOSE | re.MULTILINE | re.IGNORECASE)
 def _urlify_text(s):
     """
     Extract urls from text and make html links out of them
     """
     return url_re.sub(_urlify_text_replace, s)
 def urlify_text(s, repo_name=None, link_=None, truncate=None, stylize=False, truncatef=truncate):
@@ @@ -1289,6 +1285,19 @@ def urlify_text(s, repo_name=None, link_ @@
     Issues are linked to given issue-server.
     If link_ is provided, all text not already linking somewhere will link there.
     """
     def _replace(match_obj):
         url = match_obj.group('url')
         if url is not None:
             return '<a href="%(url)s">%(url)s</a>' % {'url': url}
         return match_obj.group(0)
     def _urlify(s):
         """
         Extract urls from text and make html links out of them
         """
         return _URLIFY_RE.sub(_replace, s)
     if truncate is None:
         s = s.rstrip()
     else:
@@ @@ -1298,7 +1307,7 @@ def urlify_text(s, repo_name=None, link_ @@
         s = urlify_changesets(s, repo_name)
     if stylize:
         s = desc_stylize(s)
-    s = _urlify_text(s)
+    s = _urlify(s)
     if repo_name is not None:
         s = urlify_issues(s, repo_name, link_)
     s = MENTIONS_REGEX.sub(_mentions_replace, s)

kallithea/lib/markup_renderer.py

➞

Show inline comments

@@ @@ -35,8 +35,9 @@ from kallithea.lib.utils2 import safe_un @@
 log = logging.getLogger(__name__)
 url_re = re.compile(r'''(\bhttps?://(?:[\da-zA-Z0-9@:.-]+)'''
                     r'''(?:[/a-zA-Z0-9_=@#~&+%.,:;?!*()-]*[/a-zA-Z0-9_=@#~])?)''')
 url_re = re.compile(r'''\bhttps?://(?:[\da-zA-Z0-9@:.-]+)'''
                     r'''(?:[/a-zA-Z0-9_=@#~&+%.,:;?!*()-]*[/a-zA-Z0-9_=@#~])?''')
 class MarkupRenderer(object):
     RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES = ['include', 'meta', 'raw']
@@ @@ -132,7 +133,7 @@ class MarkupRenderer(object): @@
             source = newline.join(source.splitlines())
         def url_func(match_obj):
-            url_full = match_obj.groups()[0]
+            url_full = match_obj.group(0)
             return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
         source = url_re.sub(url_func, source)
         return '<br />' + source.replace("\n", '<br />')

0 comments (0 inline, 0 general)