Hiding replies in threads

Sergio Oliveira
1 parent 85a58d88
Showing 4 changed files with 81 additions and 4 deletions Show diff stats
requirements.txt
src/super_archives/templates/message-thread.html
src/super_archives/templates/superarchives/tags/display_message.html
src/super_archives/templatetags/superarchives.py
-#https://www.djangoproject.com/download/1.6b4/tarball/
-Django==1.5.2
+https://www.djangoproject.com/download/1.6b4/tarball/
+#Django==1.5.2
 South==0.8.1
 psycopg2==2.5.1
 django-piston==0.2.3
@@ -8,6 +8,7 @@ chardet==1.0.1
 python-dateutil==1.5
 django-cliauth==0.9
 django-mobile==0.3.0
+html2text
  
 gunicorn
 gevent
 {% extends "base.html" %}
-{% load i18n append_to_get gravatar %}
+{% load i18n append_to_get gravatar superarchives %}
  
 {% trans "Anonymous" as anonymous %}
  
@@ -149,7 +149,7 @@
  
             </div>
             <div class="panel-body">
-              <pre>{{ email.body }}</pre>
+              {% display_message email emails %}
             </div>
           </div>
         </div>
@@ -0,0 +1,5 @@
+{% 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>
+{% endfor %}
@@ -0,0 +1,71 @@
+
+import re
+
+from django import template
+
+from html2text import html2text
+
+
+register = template.Library()
+TEMPLATE_PATH = 'superarchives/tags/'
+
+
+EXTENDED_PUNCTUATION = '!"#$%&\'()*+,-./:;=?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
+RE_WRAPPED_BY_HTML = re.compile(r'^<[a-z]+[^>]*>.*</[a-z]+[^>]*>$',
+                                re.MULTILINE|re.IGNORECASE|re.DOTALL)
+
+
+def join(block):
+    block_txt = u''.join(block)
+
+    if RE_WRAPPED_BY_HTML.match(block_txt.strip()):
+        return html2text(block_txt)
+
+    return block_txt
+
+def is_reply(line, message, thread):
+    clean_line = line.strip()
+    if clean_line.startswith('>'):
+        return True
+
+    for other_msg in thread:
+        if other_msg == message:
+            return False
+
+        clean_body = other_msg.body.replace('\r', ' ')\
+                                   .replace('\n', ' ')
+        if clean_line.strip('> ') in clean_body:
+            return True
+
+    return False
+
+
+@register.inclusion_tag(TEMPLATE_PATH + 'display_message.html',
+                        takes_context=False)
+def display_message(email, thread):
+    message = email.body
+    messages = []
+
+    block = []
+    reply_block = False
+
+    for line in message.split('\n'):
+        if line.strip(EXTENDED_PUNCTUATION):
+            if is_reply(line, email, thread):
+                if not reply_block:
+                    reply_block = True
+                    messages.append((join(block), 'normal'))
+                    block = []
+            elif reply_block:
+                reply_block = False
+                messages.append((join(block), 'reply'))
+                block = []
+
+        block.append(line.rstrip() + '\n')
+
+    if reply_block:
+        messages.append((join(block), 'reply'))
+    else:
+        messages.append((join(block), 'normal'))
+
+    return {'messages': messages}
1		-#https://www.djangoproject.com/download/1.6b4/tarball/
2		-Django==1.5.2
	1	+https://www.djangoproject.com/download/1.6b4/tarball/
	2	+#Django==1.5.2
3	3	South==0.8.1
4	4	psycopg2==2.5.1
5	5	django-piston==0.2.3
...	...	@@ -8,6 +8,7 @@ chardet==1.0.1
8	8	python-dateutil==1.5
9	9	django-cliauth==0.9
10	10	django-mobile==0.3.0
	11	+html2text
11	12
12	13	gunicorn
13	14	gevent
...	...
1	1	{% extends "base.html" %}
2		-{% load i18n append_to_get gravatar %}
	2	+{% load i18n append_to_get gravatar superarchives %}
3	3
4	4	{% trans "Anonymous" as anonymous %}
5	5
...	...	@@ -149,7 +149,7 @@
149	149
150	150	</div>
151	151	<div class="panel-body">
152		- <pre>{{ email.body }}</pre>
	152	+ {% display_message email emails %}
153	153	</div>
154	154	</div>
155	155	</div>
...	...
...	...	@@ -0,0 +1,5 @@
	1	+{% for message, class in messages %}
	2	+ {% if class == 'reply' %}
	3	+ <button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
	4	+ <pre style="display: none; color: #707";>{% else %}<pre>{% endif %}{{ message }}</pre>
	5	+{% endfor %}
...	...
...	...	@@ -0,0 +1,71 @@
	1	+
	2	+import re
	3	+
	4	+from django import template
	5	+
	6	+from html2text import html2text
	7	+
	8	+
	9	+register = template.Library()
	10	+TEMPLATE_PATH = 'superarchives/tags/'
	11	+
	12	+
	13	+EXTENDED_PUNCTUATION = '!"#$%&\'()*+,-./:;=?@[\\]^_`{\|}~ \t\n\r\x0b\x0c'
	14	+RE_WRAPPED_BY_HTML = re.compile(r'^<[a-z]+[^>]>.</[a-z]+[^>]*>$',
	15	+ re.MULTILINE\|re.IGNORECASE\|re.DOTALL)
	16	+
	17	+
	18	+def join(block):
	19	+ block_txt = u''.join(block)
	20	+
	21	+ if RE_WRAPPED_BY_HTML.match(block_txt.strip()):
	22	+ return html2text(block_txt)
	23	+
	24	+ return block_txt
	25	+
	26	+def is_reply(line, message, thread):
	27	+ clean_line = line.strip()
	28	+ if clean_line.startswith('>'):
	29	+ return True
	30	+
	31	+ for other_msg in thread:
	32	+ if other_msg == message:
	33	+ return False
	34	+
	35	+ clean_body = other_msg.body.replace('\r', ' ')\
	36	+ .replace('\n', ' ')
	37	+ if clean_line.strip('> ') in clean_body:
	38	+ return True
	39	+
	40	+ return False
	41	+
	42	+
	43	+@register.inclusion_tag(TEMPLATE_PATH + 'display_message.html',
	44	+ takes_context=False)
	45	+def display_message(email, thread):
	46	+ message = email.body
	47	+ messages = []
	48	+
	49	+ block = []
	50	+ reply_block = False
	51	+
	52	+ for line in message.split('\n'):
	53	+ if line.strip(EXTENDED_PUNCTUATION):
	54	+ if is_reply(line, email, thread):
	55	+ if not reply_block:
	56	+ reply_block = True
	57	+ messages.append((join(block), 'normal'))
	58	+ block = []
	59	+ elif reply_block:
	60	+ reply_block = False
	61	+ messages.append((join(block), 'reply'))
	62	+ block = []
	63	+
	64	+ block.append(line.rstrip() + '\n')
	65	+
	66	+ if reply_block:
	67	+ messages.append((join(block), 'reply'))
	68	+ else:
	69	+ messages.append((join(block), 'normal'))
	70	+
	71	+ return {'messages': messages}
...	...