{% else %}
{% endif %}{{ block|safe|linebreaksbr }}
{% endfor %}
-{% endcache %}
diff --git a/src/super_archives/templatetags/superarchives.py b/src/super_archives/templatetags/superarchives.py
index eec4878..6e66f64 100644
--- a/src/super_archives/templatetags/superarchives.py
+++ b/src/super_archives/templatetags/superarchives.py
@@ -1,85 +1,11 @@
-import re
-
from django import template
-from django.core.cache import cache
-
-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]+[^>]*>.*]*>$',
- re.MULTILINE|re.IGNORECASE|re.DOTALL)
-RE_LINKS = re.compile(r'(?P
https?://[^ \t\r\n\<]+)')
-
-
-def find_links(block):
- links = RE_LINKS.finditer(block)
-
- block, n = RE_LINKS.subn(r'
\g',
- block)
-
- return block
-
-
-def join(block):
- block_txt = u''.join(block)
-
- if RE_WRAPPED_BY_HTML.match(block_txt.strip()):
- block = html2text(block_txt)
- else:
- block = block_txt
-
- return find_links(block)
-
-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')
-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,
- 'cache_key': email.pk,
- 'cache_timeout': cache.default_timeout}
+def display_message(email):
+ return {'blocks': email.blocks()}
diff --git a/src/super_archives/utils.py b/src/super_archives/utils.py
deleted file mode 100644
index 9095406..0000000
--- a/src/super_archives/utils.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-from django.core import mail
-from django.conf import settings
-from django.template import Context, loader
-from django.utils.translation import ugettext as _
-
-
-def colab_send_email(subject, message, to):
- from_email = settings.COLAB_FROM_ADDRESS
- return mail.send_mail(subject, message, from_email, [to])
-
-
-def send_verification_email(to, user, validation_key):
- subject = _('Please verify your email ') + u'{}'.format(to)
- msg_tmpl = loader.get_template('superarchives/emails/email_verification.txt')
- message = msg_tmpl.render(Context({'to': to, 'user': user,
- 'key': validation_key,
- 'SITE_URL': settings.SITE_URL}))
- return colab_send_email(subject, message, to)
diff --git a/src/super_archives/utils/__init__.py b/src/super_archives/utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/super_archives/utils/__init__.py
diff --git a/src/super_archives/utils/blocks.py b/src/super_archives/utils/blocks.py
new file mode 100644
index 0000000..ffadac6
--- /dev/null
+++ b/src/super_archives/utils/blocks.py
@@ -0,0 +1,99 @@
+
+import re
+
+from django.utils.html import strip_tags
+
+from html2text import html2text
+
+
+EXTENDED_PUNCTUATION = '!"#$%&\'()*+,-./:;=?@[\\]^_`{|}~ \t\n\r\x0b\x0c'
+RE_WRAPPED_BY_HTML = re.compile(r'^<[a-z]+[^>]*>.*]*>$',
+ re.MULTILINE|re.IGNORECASE|re.DOTALL)
+RE_LINKS = re.compile(r'(?P
https?://[^ \t\r\n\<]+)')
+LINK_MARKUP = u'
\g'
+
+RE_REPLY_LINE = re.compile(r'^[\s\t>]*>[\s\t]*')
+
+RE_BR_TO_LINEBREAK = re.compile(r'<\s*/?\s*br\s*/?\s*>')
+
+class EmailBlock(list):
+ def __init__(self, is_reply=False, mark_links=True, html2text=True):
+ self.mark_links = mark_links
+ self.html2text = html2text
+ self.is_reply = is_reply
+
+ def _html2text(self, text):
+ if RE_WRAPPED_BY_HTML.match(text.strip()):
+ return html2text(text)
+
+ text, n = RE_BR_TO_LINEBREAK.subn('\n', text)
+ text = strip_tags(text)
+ return text
+
+ def _mark_links(self, text):
+ text, n = RE_LINKS.subn(LINK_MARKUP, text)
+ return text
+
+ @property
+ def text(self):
+ block = u''.join(self)
+
+ if self.html2text:
+ block = self._html2text(block)
+
+ if self.mark_links:
+ block = self._mark_links(block)
+
+ return block
+
+ def __unicode__(self):
+ return self.text
+
+ def __str__(self):
+ return self.text
+
+
+class EmailBlockParser(list):
+ def __init__(self, email):
+ self.email = email
+ self.thread_emails = email.thread.message_set
+
+ message = email.body
+ block = EmailBlock()
+
+ for line in message.split('\n'):
+ if self.context_switch(line, block):
+ self.append(block)
+ new_block_context = not block.is_reply
+ block = EmailBlock(is_reply=new_block_context)
+
+ block.append(line + '\n')
+
+ self.append(block)
+
+ def context_switch(self, line, block):
+ if line.strip(EXTENDED_PUNCTUATION):
+ if self.is_reply(line):
+ if not block.is_reply:
+ return True
+
+ else:
+ if block.is_reply:
+ return True
+
+ return False
+
+ def is_reply(self, line):
+ stripped_line = line.strip()
+ if stripped_line.startswith('>') or RE_REPLY_LINE.match(line):
+ return True
+
+ clean_line = RE_REPLY_LINE.subn('', stripped_line)[0]
+ queryset = self.thread_emails.filter(
+ received_time__lt=self.email.received_time,
+ body__contains=clean_line).order_by('-received_time')
+
+ if queryset[:1]:
+ return True
+
+ return False
diff --git a/src/super_archives/utils/email.py b/src/super_archives/utils/email.py
new file mode 100644
index 0000000..9095406
--- /dev/null
+++ b/src/super_archives/utils/email.py
@@ -0,0 +1,19 @@
+
+from django.core import mail
+from django.conf import settings
+from django.template import Context, loader
+from django.utils.translation import ugettext as _
+
+
+def colab_send_email(subject, message, to):
+ from_email = settings.COLAB_FROM_ADDRESS
+ return mail.send_mail(subject, message, from_email, [to])
+
+
+def send_verification_email(to, user, validation_key):
+ subject = _('Please verify your email ') + u'{}'.format(to)
+ msg_tmpl = loader.get_template('superarchives/emails/email_verification.txt')
+ message = msg_tmpl.render(Context({'to': to, 'user': user,
+ 'key': validation_key,
+ 'SITE_URL': settings.SITE_URL}))
+ return colab_send_email(subject, message, to)
diff --git a/src/super_archives/utils/etiquetador.py b/src/super_archives/utils/etiquetador.py
new file mode 100644
index 0000000..c08c956
--- /dev/null
+++ b/src/super_archives/utils/etiquetador.py
@@ -0,0 +1,5 @@
+
+from etiquetando import Etiquetador
+
+etiquetador = Etiquetador(word_min_size=3, max_tags=24,
+ weight_range=(1, 4))
diff --git a/src/super_archives/views.py b/src/super_archives/views.py
index 5aa49f5..0333685 100644
--- a/src/super_archives/views.py
+++ b/src/super_archives/views.py
@@ -14,8 +14,8 @@ from django.contrib.auth.decorators import login_required
from django.shortcuts import render, redirect
from . import queries
-from .utils import send_verification_email
from .decorators import count_hit
+from .utils.email import send_verification_email
from .models import MailingList, Thread, EmailAddress, EmailAddressValidation
@@ -42,18 +42,19 @@ def thread(request, mailinglist, thread_token):
total_votes += email.votes_count()
# Update relevance score
- query = Thread.objects.filter(mailinglist__name=mailinglist)
- thread = query.get(subject_token=thread_token)
+ thread = Thread.objects.get(subject_token=thread_token,
+ mailinglist__name=mailinglist)
thread.update_score()
- template_data = {
+ context = {
'first_msg': first_message,
'emails': [first_message] + list(emails),
'pagehits': queries.get_page_hits(request.path_info),
'total_votes': total_votes,
+ 'thread': thread,
}
- return render(request, 'message-thread.html', template_data)
+ return render(request, 'message-thread.html', context)
def list_messages(request):
--
libgit2 0.21.2