X-Git-Url: https://git.ozlabs.org/?p=patchwork;a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=54b86566d7bd9a07b0dabb18c978b3d9b44f01f1;hp=250ad018bb87806e674c4ba63ddcea109627587e;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hpb=e7353352191516e45d21f9814375a92cc7f602dc diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py index 250ad01..54b8656 100644 --- a/apps/patchwork/models.py +++ b/apps/patchwork/models.py @@ -28,25 +28,11 @@ 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 - from email.header import Header - 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 - from email.Header import Header - 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) - user = models.ForeignKey(User, null = True, blank = True) + user = models.ForeignKey(User, null = True, blank = True, + on_delete = models.SET_NULL) def __unicode__(self): if self.name: @@ -55,7 +41,7 @@ class Person(models.Model): return self.email def link_to_user(self, user): - self.name = user.get_profile().name() + self.name = user.profile.name() self.user = user class Meta: @@ -69,7 +55,7 @@ class Project(models.Model): 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() + send_notifications = models.BooleanField(default=False) def __unicode__(self): return self.name @@ -77,10 +63,14 @@ class Project(models.Model): def is_editable(self, user): if not user.is_authenticated(): return False - return self in user.get_profile().maintainer_projects.all() + return self in user.profile.maintainer_projects.all() + + class Meta: + ordering = ['linkname'] + class UserProfile(models.Model): - user = models.ForeignKey(User, unique = True) + user = models.OneToOneField(User, unique = True, related_name='profile') primary_project = models.ForeignKey(Project, null = True, blank = True) maintainer_projects = models.ManyToManyField(Project, related_name = 'maintainer_project') @@ -104,7 +94,6 @@ class UserProfile(models.Model): submitter__in = submitters) .values('project_id').query) - def sync_person(self): pass @@ -126,24 +115,12 @@ class UserProfile(models.Model): .values('pk').query) return qs - def save(self): - super(UserProfile, self).save() - people = Person.objects.filter(email = self.user.email) - if not people: - person = Person(email = self.user.email, - name = self.name(), user = self.user) - person.save() - else: - for person in people: - person.link_to_user(self.user) - person.save() - def __unicode__(self): return self.name() def _user_saved_callback(sender, created, instance, **kwargs): try: - profile = instance.get_profile() + profile = instance.profile except UserProfile.DoesNotExist: profile = UserProfile(user = instance) profile.save() @@ -188,14 +165,6 @@ class HashField(models.CharField): 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) @@ -245,62 +214,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 - - utc_timestamp = (self.date - - datetime.datetime.utcfromtimestamp(0)).total_seconds() - - mail = PatchMbox(body) - mail['Subject'] = self.name - mail['Date'] = email.utils.formatdate(utc_timestamp) - mail['From'] = email.utils.formataddr(( - str(Header(self.submitter.name, mail.patch_charset)), - self.submitter.email)) - 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}) @@ -382,10 +295,6 @@ class Bundle(models.Model): 'bundlename': self.name, }) - def mbox(self): - return '\n'.join([p.mbox().as_string(True) - for p in self.ordered_patches()]) - class BundlePatch(models.Model): patch = models.ForeignKey(Patch) bundle = models.ForeignKey(Bundle)