A fix in akismet module, which was crashing when the user has 0 reputation.

[osqa.git] / forum / models / utils.py

diff --git a/forum/models/utils.py b/forum/models/utils.py
index 984a55ccb20bb1c1372b27e26965bdc6125320fd..e7841a53136c91cec19964ba696385a038150421 100644 (file)
--- a/forum/models/utils.py
+++ b/forum/models/utils.py
@@ -1,77 +1,123 @@
 from django.db import models
 from django.core.cache import cache
 from django.conf import settings
 from django.db import models
 from django.core.cache import cache
 from django.conf import settings

-#try:
-#      import cPickle as pickle
-#except ImportError:
-import pickle
-import django.dispatch
+from django.utils.encoding import force_unicode
+
+try:
+    from cPickle import loads, dumps
+except ImportError:
+    from pickle import loads, dumps
+
+from copy import deepcopy
+from base64 import b64encode, b64decode
+from zlib import compress, decompress
+import re
+
+from base import BaseModel
+
+MAX_MARKABLE_STRING_LENGTH = 100

 
 class PickledObject(str):
 
 class PickledObject(str):

-       pass
+    pass
+
+def dbsafe_encode(value, compress_object=True):
+    if not compress_object:
+        value = b64encode(dumps(deepcopy(value)))
+    else:
+        value = b64encode(compress(dumps(deepcopy(value))))
+    return PickledObject(value)
+
+def dbsafe_decode(value, compress_object=True):
+    if not compress_object:
+        value = loads(b64decode(value))
+    else:
+        value = loads(decompress(b64decode(value)))
+    return value

 
 class PickledObjectField(models.Field):
     __metaclass__ = models.SubfieldBase
 
 
 class PickledObjectField(models.Field):
     __metaclass__ = models.SubfieldBase
 

-    def to_python(self, value):
-        if isinstance (value, PickledObject):
-            return value
+    marker_re = re.compile(r'^T\[(?P<type>\w+)\](?P<value>.*)$', re.DOTALL)
+    markable_types = dict((t.__name__, t) for t in (str, int, unicode))

 
 

-        try:
-            return pickle.loads(value.encode('utf-8'))
-        except:
-            return value
-    
-    def get_db_prep_save(self, value):
-        if value is not None:
-            if isinstance(value, PickledObject):
-                return str(value)
-            else:
-                           value = pickle.dumps(value)
+    def __init__(self, *args, **kwargs):
+        self.compress = kwargs.pop('compress', True)
+        self.protocol = kwargs.pop('protocol', 2)
+        kwargs.setdefault('null', True)
+        kwargs.setdefault('editable', False)
+        super(PickledObjectField, self).__init__(*args, **kwargs)

 
 

-        return value
+    def generate_type_marked_value(self, value):
+        return PickledObject("T[%s]%s" % (type(value).__name__, value))

 
 

-    def get_internal_type(self):
-        return 'TextField'
+    def read_marked_value(self, value):
+        m = self.marker_re.match(value)
+
+        if m:
+            marker = m.group('type')
+            value = m.group('value')
+            if marker in self.markable_types:
+                value = self.markable_types[marker](value)

 
 

+        return value

 
 

-class KeyValueManager(models.Manager):
+    def get_default(self):
+        if self.has_default():
+            if callable(self.default):
+                return self.default()
+            return self.default

 
 

-    def create_cache_key(self, key):
-        return "%s:key_value:%s" % (settings.APP_URL, key)
+        return super(PickledObjectField, self).get_default()

 
 

-    def save_to_cache(self, instance):
-        cache.set(self.create_cache_key(instance.key), instance, 2592000)
+    def to_python(self, value):
+        if value is not None:
+            try:
+                if value.startswith("T["):
+                    value = self.read_marked_value(value)
+                else:
+                    value = dbsafe_decode(value, self.compress)
+            except:
+                if isinstance(value, PickledObject):
+                    raise
+        return value

 
 

-    def remove_from_cache(self, instance):
-        cache.delete(self.create_cache_key(instance.key))
+    def get_db_prep_value(self, value):
+        if value is not None and not isinstance(value, PickledObject):
+            if type(value).__name__ in self.markable_types and not (isinstance(value, basestring) and len(value) > MAX_MARKABLE_STRING_LENGTH):
+                value = force_unicode(self.generate_type_marked_value(value))
+            else:
+                value = force_unicode(dbsafe_encode(value, self.compress))
+        return value

 
 

-    def get(self, **kwargs):
-        if 'key' in kwargs:
-            instance = cache.get(self.create_cache_key(kwargs['key']))
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+        return self.get_db_prep_value(value)

 
 

-            if instance is None:
-                instance = super(KeyValueManager, self).get(**kwargs)
-                self.save_to_cache(instance)
+    def get_internal_type(self):
+        return 'TextField'

 
 

-            return instance
+    def get_db_prep_lookup(self, lookup_type, value):
+        if lookup_type not in ['exact', 'in', 'isnull']:
+            raise TypeError('Lookup type %s is not supported.' % lookup_type)
+        return super(PickledObjectField, self).get_db_prep_lookup(lookup_type, value)

 
 

-        else:
-            return super(KeyValueManager, self).get(**kwargs)

 
 

-class KeyValue(models.Model):
+class KeyValue(BaseModel):

     key = models.CharField(max_length=255, unique=True)
     value = PickledObjectField()
 
     key = models.CharField(max_length=255, unique=True)
     value = PickledObjectField()
 

-    objects = KeyValueManager()
-

     class Meta:
         app_label = 'forum'
 
     class Meta:
         app_label = 'forum'
 

-    def save(self, *args, **kwargs):
-        super(KeyValue, self).save(*args, **kwargs)
-        KeyValue.objects.save_to_cache(self)
+    def cache_key(self):
+        return self._generate_cache_key(self.key)
+
+    @classmethod
+    def infer_cache_key(cls, querydict):
+        try:
+            key = [v for (k,v) in querydict.items() if k in ('key', 'key__exact')][0]
+
+            return cls._generate_cache_key(key)
+        except:
+            return None

 
 

-    def delete(self):
-        KeyValue.objects.remove_from_cache(self)
-        super(KeyValue, self).delete()