import re
import datetime, time
-import string
import random
try:
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 __unicode__(self):
if self.name:
name = models.CharField(max_length=255, unique=True)
listid = models.CharField(max_length=255, unique=True)
listemail = models.CharField(max_length=200)
+ send_notifications = models.BooleanField()
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,
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):
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 __unicode__(self):
return self.name()
+def _user_created_callback(sender, created, instance, **kwargs):
+ if not created:
+ return
+ profile = UserProfile(user = instance)
+ profile.save()
+
+models.signals.post_save.connect(_user_created_callback, sender = User)
+
class State(models.Model):
name = models.CharField(max_length = 100)
ordering = models.IntegerField(unique = True)
state = models.ForeignKey(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
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\.]+')
else:
postscript = ''
- responses = False
for comment in Comment.objects.filter(patch = self) \
.exclude(msgid = self.msgid):
body += comment.patch_responses()
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:
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
}))
def mbox(self):
- return '\n'.join([p.mbox().as_string(True) \
+ return '\n'.join([p.mbox().as_string(True)
for p in self.ordered_patches()])
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)