X-Git-Url: https://git.ozlabs.org/?p=patchwork;a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=54b86566d7bd9a07b0dabb18c978b3d9b44f01f1;hp=5c0ca9550bf08f6cf058bbd538f66b754894ac3b;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hpb=47c56dfaceefaa44e5057236a5b63a05f68a981d diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py index 5c0ca95..54b8656 100644 --- a/apps/patchwork/models.py +++ b/apps/patchwork/models.py @@ -26,26 +26,13 @@ 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, + on_delete = models.SET_NULL) def __unicode__(self): if self.name: @@ -54,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: @@ -65,13 +52,26 @@ 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(default=False) def __unicode__(self): return self.name + def is_editable(self, user): + if not user.is_authenticated(): + return False + return self in user.profile.maintainer_projects.all() + + class Meta: + ordering = ['linkname'] + + class UserProfile(models.Model): - user = models.ForeignKey(User, unique = True) - primary_project = models.ForeignKey(Project, null = 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') send_email = models.BooleanField(default = False, @@ -89,12 +89,10 @@ class UserProfile(models.Model): 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): pass @@ -112,26 +110,23 @@ 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 - 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.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) @@ -167,16 +162,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) @@ -185,13 +175,13 @@ 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) - pull_url = models.CharField(max_length=255, null = True) + 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 __unicode__(self): return self.name @@ -217,71 +207,13 @@ 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\.]+') 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 = '' - - responses = False - 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}) @@ -304,7 +236,7 @@ class Comment(models.Model): 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: @@ -322,7 +254,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 @@ -350,15 +282,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) @@ -369,34 +304,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)