X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=226a69c3a4037d64afbb3684189a2d446df8d3a5;hb=0deabd4014cbc9419d203356786e966c4f803ea3;hp=d8a9b3ff5c77cdecce3206ec8ecf11e24e73a9aa;hpb=04767c65175f2a76127cd78649c5d92a82a39bb6;p=patchwork

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index d8a9b3f..226a69c 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -22,6 +22,7 @@ from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.contrib.sites.models import Site
 from django.conf import settings
+from patchwork.parser import hash_patch
 import django.oldforms as oldforms
 
 import re
@@ -79,8 +80,8 @@ 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)
+            names = filter(bool, [self.user.first_name, self.user.last_name])
+            return ' '.join(names)
         return self.user.username
 
     def contributor_projects(self):
@@ -114,16 +115,16 @@ class UserProfile(models.Model):
         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)
+        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.user = self.user
-		 person.save()
+        else:
+            for person in people:
+                 person.link_to_user(self.user)
+                 person.save()
 
     def __str__(self):
         return self.name()
@@ -143,8 +144,8 @@ class UserPersonConfirmation(models.Model):
     active = models.BooleanField(default = True)
 
     def confirm(self):
-	if not self.active:
-	    return
+        if not self.active:
+            return
         person = None
         try:
             person = Person.objects.get(email = self.email)
@@ -168,45 +169,32 @@ class State(models.Model):
     class Meta:
         ordering = ['ordering']
 
-class HashField(models.Field):
+class HashField(models.CharField):
     __metaclass__ = models.SubfieldBase
 
     def __init__(self, algorithm = 'sha1', *args, **kwargs):
         self.algorithm = algorithm
         try:
             import hashlib
-            self.hashlib = True
+            def _construct(string = ''):
+                return hashlib.new(self.algorithm, string)
+            self.construct = _construct
+            self.n_bytes = len(hashlib.new(self.algorithm).hexdigest())
         except ImportError:
-            self.hashlib = False
-            if algorithm == 'sha1':
-                import sha
-                self.hash_constructor = sha.new
-            elif algorithm == 'md5':
-                import md5
-                self.hash_constructor = md5.new
-            else:
+            modules = { 'sha1': 'sha', 'md5': 'md5'}
+
+            if algorithm not in modules.keys():
                 raise NameError("Unknown algorithm '%s'" % algorithm)
-            
-        super(HashField, self).__init__(*args, **kwargs)
 
-    def db_type(self):
-        if self.hashlib:
-            n_bytes = len(hashlib.new(self.algorithm).digest())
-        else:
-            n_bytes = len(self.hash_constructor().digest())
-	if settings.DATABASE_ENGINE == 'postgresql':
-	    return 'bytea'
-	elif settings.DATABASE_ENGINE == 'mysql':
-	    return 'binary(%d)' % n_bytes
+            self.construct = __import__(modules[algorithm]).new
 
-    def to_python(self, value):
-        return value
+        self.n_bytes = len(self.construct().hexdigest())
 
-    def get_db_prep_save(self, value):
-        return ''.join(map(lambda x: '\\%03o' % ord(x), value))
+        kwargs['max_length'] = self.n_bytes
+        super(HashField, self).__init__(*args, **kwargs)
 
-    def get_manipulator_field_objs(self):
-        return [oldforms.TextField]
+    def db_type(self):
+        return 'char(%d)' % self.n_bytes
 
 class Patch(models.Model):
     project = models.ForeignKey(Project)
@@ -220,21 +208,23 @@ class Patch(models.Model):
     headers = models.TextField(blank = True)
     content = models.TextField()
     commit_ref = models.CharField(max_length=255, null = True, blank = True)
-    hash = HashField()
+    hash = HashField(null = True, db_index = True)
 
     def __str__(self):
         return self.name
 
     def comments(self):
-	return Comment.objects.filter(patch = self)
+        return Comment.objects.filter(patch = self)
 
     def save(self):
-	try:
+        try:
             s = self.state
         except:
             self.state = State.objects.get(ordering =  0)
-        if hash is None:
-            print "no hash"
+
+        if self.hash is None:
+            self.hash = hash_patch(self.content).hexdigest()
+
         super(Patch, self).save()
 
     def is_editable(self, user):