X-Git-Url: https://git.ozlabs.org/?p=patchwork;a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=86a5266cff2d2177f682c57e6fcea8897b616b66;hp=a672f9ad41ebe5f16879db45a655a42b2c5643c8;hb=c30c03312041c24c39b6a986882aae6189096c2f;hpb=6ce62d26739ebf0dd81ecff5284adf3fbe2aed23 diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py index a672f9a..86a5266 100644 --- a/apps/patchwork/models.py +++ b/apps/patchwork/models.py @@ -26,28 +26,29 @@ from patchwork.parser import hash_patch import re import datetime, time -import string 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) - user = models.ForeignKey(User, null = True) + name = models.CharField(max_length=255, null = True, blank = True) + user = models.ForeignKey(User, null = True, blank = True) - def __str__(self): + def __unicode__(self): if self.name: - return '%s <%s>' % (self.name, self.email) + return u'%s <%s>' % (self.name, self.email) else: return self.email @@ -63,13 +64,22 @@ 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 __str__(self): + def __unicode__(self): return self.name + def is_editable(self, user): + if not user.is_authenticated(): + return False + return self in user.get_profile().maintainer_projects.all() + class UserProfile(models.Model): user = models.ForeignKey(User, unique = True) - primary_project = models.ForeignKey(Project, null = True) + primary_project = models.ForeignKey(Project, null = True, blank = True) maintainer_projects = models.ManyToManyField(Project, related_name = 'maintainer_project') send_email = models.BooleanField(default = False, @@ -82,16 +92,15 @@ class UserProfile(models.Model): def name(self): if self.user.first_name or self.user.last_name: names = filter(bool, [self.user.first_name, self.user.last_name]) - return ' '.join(names) + return u' '.join(names) return self.user.username def contributor_projects(self): submitters = Person.objects.filter(user = self.user) - return Project.objects \ - .filter(id__in = \ - Patch.objects.filter( - submitter__in = submitters) \ - .values('project_id').query) + return Project.objects.filter(id__in = + Patch.objects.filter( + submitter__in = submitters) + .values('project_id').query) def sync_person(self): @@ -110,8 +119,8 @@ class UserProfile(models.Model): qs = qs.filter(archived = False) \ .filter(delegate = self.user) \ - .filter(state__in = \ - State.objects.filter(action_required = True) \ + .filter(state__in = + State.objects.filter(action_required = True) .values('pk').query) return qs @@ -127,15 +136,24 @@ class UserProfile(models.Model): person.link_to_user(self.user) person.save() - def __str__(self): + def __unicode__(self): return self.name() +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_saved_callback, sender = User) + class State(models.Model): name = models.CharField(max_length = 100) ordering = models.IntegerField(unique = True) action_required = models.BooleanField(default = True) - def __str__(self): + def __unicode__(self): return self.name class Meta: @@ -165,7 +183,7 @@ 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): @@ -176,6 +194,9 @@ class PatchMbox(MIMENonMultipart): 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) msgid = models.CharField(max_length=255) @@ -183,14 +204,15 @@ 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() + content = models.TextField(null = True, blank = True) + pull_url = models.CharField(max_length=255, null = True, blank = True) commit_ref = models.CharField(max_length=255, null = True, blank = True) - hash = HashField(null = True, db_index = True) + hash = HashField(null = True, blank = True) - def __str__(self): + def __unicode__(self): return self.name def comments(self): @@ -202,7 +224,7 @@ class Patch(models.Model): except: self.state = State.objects.get(ordering = 0) - if self.hash is None: + if self.hash is None and self.content is not None: self.hash = hash_patch(self.content).hexdigest() super(Patch, self).save() @@ -214,12 +236,7 @@ class Patch(models.Model): if self.submitter.user == user or self.delegate == user: return True - profile = user.get_profile() - return self.project in user.get_profile().maintainer_projects.all() - - def form(self): - f = PatchForm(instance = self, prefix = self.id) - return f + return self.project.is_editable(user) def filename(self): fname_re = re.compile('[^-_A-Za-z0-9\.]+') @@ -227,6 +244,8 @@ class Patch(models.Model): 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) @@ -237,7 +256,14 @@ class Patch(models.Model): if comment: body = comment.content.strip() + "\n" - responses = False + 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() @@ -245,7 +271,11 @@ class Patch(models.Model): if body: body += '\n' - body += self.content + if postscript: + body += '---\n' + postscript.strip() + '\n' + + if self.content: + body += '\n' + self.content mail = PatchMbox(body) mail['Subject'] = self.name @@ -253,10 +283,17 @@ class Patch(models.Model): 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()) - return mail + 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): @@ -275,10 +312,12 @@ class Comment(models.Model): headers = models.TextField(blank = True) content = models.TextField() - response_re = re.compile('^(Acked|Signed-off|Nacked)-by: .*$', re.M) + response_re = re.compile( \ + '^(Tested|Reviewed|Acked|Signed-off|Nacked|Reported)-by: .*$', + re.M | re.I) def patch_responses(self): - return ''.join([ match.group(0) + '\n' for match in \ + return ''.join([ match.group(0) + '\n' for match in self.response_re.finditer(self.content)]) class Meta: @@ -296,7 +335,7 @@ class Bundle(models.Model): return self.patches.all().count() def ordered_patches(self): - return self.patches.order_by('bundlepatch__order'); + return self.patches.order_by('bundlepatch__order') def append_patch(self, patch): # todo: use the aggregate queries in django 1.1 @@ -331,8 +370,8 @@ class Bundle(models.Model): })) def mbox(self): - return '\n'.join([p.mbox().as_string(True) \ - for p in self.patches.all()]) + return '\n'.join([p.mbox().as_string(True) + for p in self.ordered_patches()]) class BundlePatch(models.Model): patch = models.ForeignKey(Patch) @@ -343,34 +382,83 @@ class BundlePatch(models.Model): unique_together = [('bundle', 'patch')] ordering = ['order'] -class UserPersonConfirmation(models.Model): - user = models.ForeignKey(User) +class EmailConfirmation(models.Model): + validity = datetime.timedelta(days = settings.CONFIRMATION_VALIDITY_DAYS) + type = models.CharField(max_length = 20, choices = [ + ('userperson', 'User-Person association'), + ('registration', 'Registration'), + ('optout', 'Email opt-out'), + ]) email = models.CharField(max_length = 200) + user = models.ForeignKey(User, null = True) key = HashField() - date = models.DateTimeField(default=datetime.datetime.now) + date = models.DateTimeField(default = datetime.datetime.now) active = models.BooleanField(default = True) - def confirm(self): - if not self.active: - return - person = None - try: - person = Person.objects.get(email__iexact = self.email) - except Exception: - pass - if not person: - person = Person(email = self.email) - - person.link_to_user(self.user) - person.save() + def deactivate(self): self.active = False self.save() + def is_valid(self): + return self.date + self.validity > datetime.datetime.now() + def save(self): max = 1 << 32 if self.key == '': str = '%s%s%d' % (self.user, self.email, random.randint(0, max)) self.key = self._meta.get_field('key').construct(str).hexdigest() - super(UserPersonConfirmation, self).save() + super(EmailConfirmation, self).save() + +class EmailOptout(models.Model): + email = models.CharField(max_length = 200, primary_key = True) + + def __unicode__(self): + return self.email + + @classmethod + def is_optout(cls, email): + email = email.lower().strip() + return cls.objects.filter(email = email).count() > 0 + +class PatchChangeNotification(models.Model): + patch = models.ForeignKey(Patch, primary_key = True) + last_modified = models.DateTimeField(default = datetime.datetime.now) + orig_state = models.ForeignKey(State) + +def _patch_change_callback(sender, instance, **kwargs): + # we only want notification of modified patches + if instance.pk is None: + return + + if instance.project is None or not instance.project.send_notifications: + return + + try: + orig_patch = Patch.objects.get(pk = instance.pk) + except Patch.DoesNotExist: + return + + # If there's no interesting changes, abort without creating the + # notification + if orig_patch.state == instance.state: + return + + notification = None + try: + notification = PatchChangeNotification.objects.get(patch = instance) + except PatchChangeNotification.DoesNotExist: + pass + + if notification is None: + notification = PatchChangeNotification(patch = instance, + orig_state = orig_patch.state) + + elif notification.orig_state == instance.state: + # If we're back at the original state, there is no need to notify + notification.delete() + return + notification.last_modified = datetime.datetime.now() + notification.save() +models.signals.pre_save.connect(_patch_change_callback, sender = Patch)