Finding and interpreting links inside email msgs

Sergio Oliveira
1 parent 5346dbc8
Showing 2 changed files with 16 additions and 5 deletions Show diff stats
src/super_archives/templates/superarchives/tags/display_message.html
src/super_archives/templatetags/superarchives.py
@@ -4,6 +4,6 @@
 {% for message, class in messages %}
   {% if class == 'reply' %}
     <button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
-    <pre style="display: none; color: #707";>{% else %}<pre>{% endif %}{{ message }}</pre>
+    <div style="display: none; color: #707";>{% else %}<div>{% endif %}{{ message|safe|linebreaksbr }}</div>
 {% endfor %}
 {% endcache %}
@@ -14,15 +14,27 @@ TEMPLATE_PATH = &#39;superarchives/tags/&#39;
 EXTENDED_PUNCTUATION = '!"#$%&\'()*+,-./:;=?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
 RE_WRAPPED_BY_HTML = re.compile(r'^<[a-z]+[^>]*>.*</[a-z]+[^>]*>$',
                                 re.MULTILINE|re.IGNORECASE|re.DOTALL)
+RE_LINKS = re.compile(r'(?P<link>https?://[^ \t\r\n\<]+)')
+
+
+def find_links(block):
+    links = RE_LINKS.finditer(block)
+
+    block, n = RE_LINKS.subn(r'<a target="_blank" href="\g<link>">\g<link></a>',
+                             block)
+
+    return block
 def join(block):
     block_txt = u''.join(block)
     if RE_WRAPPED_BY_HTML.match(block_txt.strip()):
-        return html2text(block_txt)
+        block = html2text(block_txt)
+    else:
+        block = block_txt
-    return block_txt
+    return find_links(block)
 def is_reply(line, message, thread):
     clean_line = line.strip()
@@ -41,8 +53,7 @@ def is_reply(line, message, thread):
     return False
-@register.inclusion_tag(TEMPLATE_PATH + 'display_message.html',
-                        takes_context=False)
+@register.inclusion_tag(TEMPLATE_PATH + 'display_message.html')
 def display_message(email, thread):
     message = email.body
     messages = []
	@@ -4,6 +4,6 @@		@@ -4,6 +4,6 @@
4	{% for message, class in messages %}	4	{% for message, class in messages %}
5	{% if class == 'reply' %}	5	{% if class == 'reply' %}
6	<button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>	6	<button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
7	- <pre style="display: none; color: #707";>{% else %}<pre>{% endif %}{{ message }}</pre>	7	+ <div style="display: none; color: #707";>{% else %}<div>{% endif %}{{ message\|safe\|linebreaksbr }}</div>
8	{% endfor %}	8	{% endfor %}
9	{% endcache %}	9	{% endcache %}