views: Move mbox handling from models to views

[patchwork] / apps / patchwork / models.py

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 22062c2189f468eb20e4b8ad2ff1f9e1a16b3632..ec5727d25a862776a6489dcd078cb9166106814e 100644 (file)
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -28,19 +28,6 @@ import re
 import datetime, time
 import random
 
-try:
-    from email.mime.nonmultipart import MIMENonMultipart
-    from email.encoders import encode_7or8bit
-    from email.parser import HeaderParser
-    import email.utils
-except ImportError:
-    # Python 2.4 compatibility
-    from email.MIMENonMultipart import MIMENonMultipart
-    from email.Encoders import encode_7or8bit
-    from email.Parser import HeaderParser
-    import email.Utils
-    email.utils = email.Utils
-
 class Person(models.Model):
     email = models.CharField(max_length=255, unique = True)
     name = models.CharField(max_length=255, null = True, blank = True)
@@ -64,6 +51,9 @@ class Project(models.Model):
     name = models.CharField(max_length=255, unique=True)
     listid = models.CharField(max_length=255, unique=True)
     listemail = models.CharField(max_length=200)
+    web_url = models.CharField(max_length=2000, blank=True)
+    scm_url = models.CharField(max_length=2000, blank=True)
+    webscm_url = models.CharField(max_length=2000, blank=True)
     send_notifications = models.BooleanField()
 
     def __unicode__(self):
@@ -136,13 +126,14 @@ class UserProfile(models.Model):
     def __unicode__(self):
         return self.name()
 
-def _user_created_callback(sender, created, instance, **kwargs):
-    if not created:
-        return
-    profile = UserProfile(user = instance)
+def _user_saved_callback(sender, created, instance, **kwargs):
+    try:
+        profile = instance.get_profile()
+    except UserProfile.DoesNotExist:
+        profile = UserProfile(user = instance)
     profile.save()
 
-models.signals.post_save.connect(_user_created_callback, sender = User)
+models.signals.post_save.connect(_user_saved_callback, sender = User)
 
 class State(models.Model):
     name = models.CharField(max_length = 100)
@@ -179,16 +170,11 @@ class HashField(models.CharField):
         kwargs['max_length'] = self.n_bytes
         super(HashField, self).__init__(*args, **kwargs)
 
-    def db_type(self):
+    def db_type(self, connection=None):
         return 'char(%d)' % self.n_bytes
 
-class PatchMbox(MIMENonMultipart):
-    patch_charset = 'utf-8'
-    def __init__(self, _text):
-        MIMENonMultipart.__init__(self, 'text', 'plain',
-                        **{'charset': self.patch_charset})
-        self.set_payload(_text.encode(self.patch_charset))
-        encode_7or8bit(self)
+def get_default_initial_patch_state():
+    return State.objects.get(ordering=0)
 
 class Patch(models.Model):
     project = models.ForeignKey(Project)
@@ -197,7 +183,7 @@ class Patch(models.Model):
     date = models.DateTimeField(default=datetime.datetime.now)
     submitter = models.ForeignKey(Person)
     delegate = models.ForeignKey(User, blank = True, null = True)
-    state = models.ForeignKey(State)
+    state = models.ForeignKey(State, default=get_default_initial_patch_state)
     archived = models.BooleanField(default = False)
     headers = models.TextField(blank = True)
     content = models.TextField(null = True, blank = True)
@@ -236,58 +222,6 @@ class Patch(models.Model):
         str = fname_re.sub('-', self.name)
         return str.strip('-') + '.patch'
 
-    def mbox(self):
-        postscript_re = re.compile('\n-{2,3} ?\n')
-
-        comment = None
-        try:
-            comment = Comment.objects.get(patch = self, msgid = self.msgid)
-        except Exception:
-            pass
-
-        body = ''
-        if comment:
-            body = comment.content.strip() + "\n"
-
-        parts = postscript_re.split(body, 1)
-        if len(parts) == 2:
-            (body, postscript) = parts
-            body = body.strip() + "\n"
-            postscript = postscript.strip() + "\n"
-        else:
-            postscript = ''
-
-        for comment in Comment.objects.filter(patch = self) \
-                .exclude(msgid = self.msgid):
-            body += comment.patch_responses()
-
-        if body:
-            body += '\n'
-
-        if postscript:
-            body += '---\n' + postscript.strip() + '\n'
-
-        if self.content:
-            body += '\n' + self.content
-
-        mail = PatchMbox(body)
-        mail['Subject'] = self.name
-        mail['Date'] = email.utils.formatdate(
-                        time.mktime(self.date.utctimetuple()))
-        mail['From'] = unicode(self.submitter)
-        mail['X-Patchwork-Id'] = str(self.id)
-        mail['Message-Id'] = self.msgid
-        mail.set_unixfrom('From patchwork ' + self.date.ctime())
-
-
-        copied_headers = ['To', 'Cc']
-        orig_headers = HeaderParser().parsestr(str(self.headers))
-        for header in copied_headers:
-            if header in orig_headers:
-                mail[header] = orig_headers[header]
-
-        return mail
-
     @models.permalink
     def get_absolute_url(self):
         return ('patchwork.views.patch.patch', (), {'patch_id': self.id})
@@ -356,15 +290,18 @@ class Bundle(models.Model):
             return None
         site = Site.objects.get_current()
         return 'http://%s%s' % (site.domain,
-                reverse('patchwork.views.bundle.public',
+                reverse('patchwork.views.bundle.bundle',
                         kwargs = {
                                 'username': self.owner.username,
                                 'bundlename': self.name
                         }))
 
-    def mbox(self):
-        return '\n'.join([p.mbox().as_string(True)
-                        for p in self.ordered_patches()])
+    @models.permalink
+    def get_absolute_url(self):
+        return ('patchwork.views.bundle.bundle', (), {
+                                'username': self.owner.username,
+                                'bundlename': self.name,
+                            })
 
 class BundlePatch(models.Model):
     patch = models.ForeignKey(Patch)