federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Applied cleaned up fixes from Anders.Du (duyu)

Browse source
This commit is contained in:
Yuri Baburov 2013-07-25 18:47:49 +01:00
parent 6697e848c8
commit ac0f2153c0
1 changed files with 22 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

57
django_mailbox/models.py
View file

@ -25,12 +25,7 @@ from django_mailbox.transports import Pop3Transport, ImapTransport,\
from django_mailbox.signals import message_received from django_mailbox.signals import message_received
import six import six
from dateutil import parser
from django.db import IntegrityError, DatabaseError
from django.utils.encoding import smart_unicode, smart_str
from tickets.models import Ticket
import re
import traceback
STRIP_UNALLOWED_MIMETYPES = getattr( STRIP_UNALLOWED_MIMETYPES = getattr(
settings, settings,
'DJANGO_MAILBOX_STRIP_UNALLOWED_MIMETYPES', 'DJANGO_MAILBOX_STRIP_UNALLOWED_MIMETYPES',
@ -251,35 +246,27 @@ class Mailbox(models.Model):
return new return new
def _process_message(self, message): def _process_message(self, message):
try: msg = Message()
msg = Message() msg.mailbox = self
msg.mailbox = self if 'subject' in message:
if 'subject' in message: msg.subject = message['subject'][0:255]
msg.subject = message['subject'][0:255] if 'message-id' in message:
if 'message-id' in message: msg.message_id = message['message-id'][0:255]
msg.message_id = message['message-id'][0:255] if 'from' in message:
if 'from' in message: msg.from_header = message['from']
msg.from_header = message['from'] if 'to' in message:
if 'to' in message: msg.to_header = message['to']
msg.to_header = message['to'] msg.save()
msg.save() message = self._get_dehydrated_message(message, msg)
message = self._get_dehydrated_message(message, msg) msg.body = unicode(message.as_string(),errors='ignore')
msg.body = unicode(e_message.as_string(),errors='ignore') if message['in-reply-to']:
if message['in-reply-to']: try:
try: msg.in_reply_to = Message.objects.filter(
msg.in_reply_to = Message.objects.filter( message_id=message['in-reply-to']
message_id=message['in-reply-to'] )[0]
)[0] except IndexError:
except IndexError: pass
pass msg.save()
msg.save()
except IntegrityError,e:
traceback.print_exc()
pass
except DatabaseError, e:
traceback.print_exc()
pass
return msg return msg
def get_new_mail(self): def get_new_mail(self):