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

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index f354acb..226a69c 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -169,48 +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.startswith('postgresql'):
-            return 'bytea'
-        elif settings.DATABASE_ENGINE == 'mysql':
-            return 'binary(%d)' % n_bytes
-        else:
-            raise Exception("Unknown database engine '%s'" % \
-                            settings.DATABASE_ENGINE)
+            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)
@@ -224,7 +208,7 @@ 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(null = True)
+    hash = HashField(null = True, db_index = True)
 
     def __str__(self):
         return self.name
@@ -239,7 +223,7 @@ class Patch(models.Model):
             self.state = State.objects.get(ordering =  0)
 
         if self.hash is None:
-            self.hash = hash_patch(self.content).digest()
+            self.hash = hash_patch(self.content).hexdigest()
 
         super(Patch, self).save()