Ticket #3526: rst_trac_links-r3592.patch

trac/mimeview/rst.py

@@ -29 +29 @@
 
 from trac.core import *
 from trac.mimeview.api import IHTMLPreviewRenderer, content_to_unicode
+from trac.util.markup import Element
 from trac.web.href import Href
 from trac.wiki.formatter import WikiProcessor
-from trac.wiki import WikiSystem
+from trac.wiki import WikiSystem, wiki_to_link
 
-WIKI_LINK = re.compile(r'(?:wiki:)?(.+)')
-TICKET_LINK = re.compile(r'(?:#(\d+))|(?:ticket:(\d+))')
-REPORT_LINK = re.compile(r'(?:{(\d+)})|(?:report:(\d+))')
-CHANGESET_LINK = re.compile(r'(?:\[(\d+)\])|(?:changeset:(\d+))')
-FILE_LINK = re.compile(r'(?:browser|repos|source):([^#]+)#?(.*)')
-
-def _wikipage(href, args):
-    return href.wiki(args[0])
-
-def _ticket(href, args):
-    return href.ticket(args[0])
-
-def _report(href, args):
-    return href.report(args[0])
-
-def _changeset(href, args):
-    return href.changeset(int(args[0]))
-
-def _browser(href, args):
-    path = args[0]
-    rev = len(args) == 2 and args[1] or ''
-    return href.browser(path, rev=rev)
-
-# TracLink REs and callback functions
-LINKS = [(TICKET_LINK, _ticket),
-         (REPORT_LINK, _report),
-         (CHANGESET_LINK, _changeset),
-         (FILE_LINK, _browser),
-         (WIKI_LINK, _wikipage)]
-
 class ReStructuredTextRenderer(Component):
     """
     Renders plain text in reStructuredText format as HTML.
@@ -86 +57 @@
             raise TracError, 'Docutils version >= %s required, %s found' \
                              % ('0.3.9', __version__)
 
-        def trac_get_reference(rawtext, link, text):
-            for (pattern, function) in LINKS:
-                m = pattern.match(link)
-                if m:
-                    g = filter(None, m.groups())
-                    missing = 0
-                    if not text:
-                        text = g[0]
-                    if pattern == WIKI_LINK:
-                        pagename = re.search(r'^[^\#]+',g[0])
-                        if not WikiSystem(self.env).has_page(pagename.group()):
-                            missing = 1
-                            text = text + "?"
-                    uri = function(req.href, g)
-                    reference = nodes.reference(rawtext, text)
+        def trac_get_reference(rawtext, target, text):
+            link = wiki_to_link(target, self.env, req)
+            if isinstance(link, Element):
+                uri = link.attr['href']
+                if uri:
+                    reference = nodes.reference(rawtext, text or target)
                     reference['refuri']= uri
-                    if missing:
+                    if 'missing' in link.attr.get('class', ''):
                         reference.set_class('missing')
                     return reference
             return None