Some unicode fixes.

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 70d10b647c2dfa2da162491dc4a616e7660e1fbb..bf82708cdf604644ec0c7a2b5e76a71708d0d9bb 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -7,6 +7,8 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from forum.utils.html import sanitize_html
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from forum.utils.html import sanitize_html

+from forum.utils.userlinking import auto_user_link
+from forum.settings import SUMMARY_LENGTH

 from utils import PickledObjectField
 
 class NodeContent(models.Model):
 from utils import PickledObjectField
 
 class NodeContent(models.Model):


@@ -21,22 +23,35 @@ class NodeContent(models.Model):
 
     @property
     def html(self):
 
     @property
     def html(self):

-        return self.as_markdown()
+        return self.body
+
+    def rendered(self, content):
+        return auto_user_link(self, self._as_markdown(content, *['auto_linker']))

 
     @classmethod
     def _as_markdown(cls, content, *extensions):
 
     @classmethod
     def _as_markdown(cls, content, *extensions):

-        return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
+        try:
+            return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
+        except Exception, e:
+            import traceback
+            logging.error("Caught exception %s in markdown parser rendering %s %s:\s %s" % (
+                str(e), cls.__name__, str(e), traceback.format_exc()))
+            return ''

 
     def as_markdown(self, *extensions):
         return self._as_markdown(self.body, *extensions)
 
     @property
     def headline(self):
 
     def as_markdown(self, *extensions):
         return self._as_markdown(self.body, *extensions)
 
     @property
     def headline(self):

-        return self.title
+        title = self.title
+
+        # Replaces multiple spaces with single ones.
+        title = re.sub(' +',' ', title)
+
+        return title

 
     def tagname_list(self):
         if self.tagnames:
 
     def tagname_list(self):
         if self.tagnames:

-            t = [name.strip() for name in self.tagnames.split(u' ') if name]

             return [name.strip() for name in self.tagnames.split(u' ') if name]
         else:
             return []
             return [name.strip() for name in self.tagnames.split(u' ') if name]
         else:
             return []


@@ -72,13 +87,10 @@ class NodeMetaClass(BaseMetaClass):
             return node_cls.objects.filter(parent=self)
 
         def parent(self):
             return node_cls.objects.filter(parent=self)
 
         def parent(self):

-            p = self.__dict__.get('_%s_cache' % name, None)
-
-            if p is None and (self.parent is not None) and self.parent.node_type == name:
-                p = self.parent.leaf
-                self.__dict__['_%s_cache' % name] = p
+            if (self.parent is not None) and self.parent.node_type == name:
+                return self.parent.leaf

 
 

-            return p
+            return None

 
         Node.add_to_class(name + 's', property(children))
         Node.add_to_class(name, property(parent))
 
         Node.add_to_class(name + 's', property(children))
         Node.add_to_class(name, property(parent))


@@ -95,12 +107,44 @@ class NodeQuerySet(CachedQuerySet):
             return super(NodeQuerySet, self).obj_from_datadict(datadict)
 
     def get(self, *args, **kwargs):
             return super(NodeQuerySet, self).obj_from_datadict(datadict)
 
     def get(self, *args, **kwargs):

-        return super(NodeQuerySet, self).get(*args, **kwargs).leaf
+        node = super(NodeQuerySet, self).get(*args, **kwargs).leaf
+
+        if not isinstance(node, self.model):
+            raise self.model.DoesNotExist()
+
+        return node
+
+    def any_state(self, *args):
+        filter = None
+
+        for s in args:
+            s_filter = models.Q(state_string__contains="(%s)" % s)
+            filter = filter and (filter | s_filter) or s_filter
+
+        if filter:
+            return self.filter(filter)
+        else:
+            return self
+
+    def all_states(self, *args):
+        filter = None
+
+        for s in args:
+            s_filter = models.Q(state_string__contains="(%s)" % s)
+            filter = filter and (filter & s_filter) or s_filter
+
+        if filter:
+            return self.filter(filter)
+        else:
+            return self

 
     def filter_state(self, **kwargs):
         apply_bool = lambda q, b: b and q or ~q
         return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])
 
 
     def filter_state(self, **kwargs):
         apply_bool = lambda q, b: b and q or ~q
         return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])
 

+    def children_count(self, child_type):
+        return NodeMetaClass.types[child_type].objects.filter_state(deleted=False).filter(parent__in=self).count()
+

 
 class NodeManager(CachedManager):
     use_for_related_fields = True
 
 class NodeManager(CachedManager):
     use_for_related_fields = True


@@ -108,10 +152,11 @@ class NodeManager(CachedManager):
     def get_query_set(self):
         qs = NodeQuerySet(self.model)
 
     def get_query_set(self):
         qs = NodeQuerySet(self.model)
 

+        # If the node is an answer, question or comment we filter the Node model by type

         if self.model is not Node:
         if self.model is not Node:

-            return qs.filter(node_type=self.model.get_type())
-        else:
-            return qs
+            qs = qs.filter(node_type=self.model.get_type())
+
+        return qs

 
     def get_for_types(self, types, *args, **kwargs):
         kwargs['node_type__in'] = [t.get_type() for t in types]
 
     def get_for_types(self, types, *args, **kwargs):
         kwargs['node_type__in'] = [t.get_type() for t in types]


@@ -209,7 +254,7 @@ class Node(BaseModel, NodeContent):
     @classmethod
     def _generate_cache_key(cls, key, group="node"):
         return super(Node, cls)._generate_cache_key(key, group)
     @classmethod
     def _generate_cache_key(cls, key, group="node"):
         return super(Node, cls)._generate_cache_key(key, group)

-
+        

     @classmethod
     def get_type(cls):
         return cls.__name__.lower()
     @classmethod
     def get_type(cls):
         return cls.__name__.lower()


@@ -245,6 +290,17 @@ class Node(BaseModel, NodeContent):
 
         return nis
 
 
         return nis
 

+    @property
+    def last_activity(self):
+        try:
+            return self.actions.order_by('-action_date')[0].action_date
+        except:
+            return self.last_seen
+
+    @property
+    def state_list(self):
+        return [s.state_type for s in self.states.all()]
+

     @property
     def deleted(self):
         return self.nis.deleted
     @property
     def deleted(self):
         return self.nis.deleted


@@ -258,18 +314,29 @@ class Node(BaseModel, NodeContent):
 
     @property
     def summary(self):
 
     @property
     def summary(self):

-        return strip_tags(self.html)[:300]
+        content = strip_tags(self.html)[:SUMMARY_LENGTH]
+
+        # Remove multiple spaces.
+        content = re.sub(' +',' ', content)
+
+        # Remove line breaks. We don't need them at all.
+        content = content.replace("\n", '')
+
+        return content

 
     @models.permalink
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
 
 
     @models.permalink
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
 

-    def update_last_activity(self, user, save=False):
+    def update_last_activity(self, user, save=False, time=None):
+        if not time:
+            time = datetime.datetime.now()
+

         self.last_activity_by = user
         self.last_activity_by = user

-        self.last_activity_at = datetime.datetime.now()
+        self.last_activity_at = time

 
         if self.parent:
 
         if self.parent:

-            self.parent.update_last_activity(user, save=True)
+            self.parent.update_last_activity(user, save=True, time=time)

 
         if save:
             self.save()
 
         if save:
             self.save()


@@ -288,13 +355,26 @@ class Node(BaseModel, NodeContent):
     def activate_revision(self, user, revision):
         self.title = revision.title
         self.tagnames = revision.tagnames
     def activate_revision(self, user, revision):
         self.title = revision.title
         self.tagnames = revision.tagnames

-        self.body = revision.body
+
+        self.body = self.rendered(revision.body)

 
         self.active_revision = revision
         self.update_last_activity(user)
 
         self.save()
 
 
         self.active_revision = revision
         self.update_last_activity(user)
 
         self.save()
 

+    def get_active_users(self, active_users = None):
+        if not active_users:
+            active_users = set()
+
+        active_users.add(self.author)
+
+        for node in self.children.all():
+            if not node.nis.deleted:
+                node.get_active_users(active_users)
+
+        return active_users
+

     def _list_changes_in_tags(self):
         dirty = self.get_dirty_fields()
 
     def _list_changes_in_tags(self):
         dirty = self.get_dirty_fields()
 


@@ -302,10 +382,10 @@ class Node(BaseModel, NodeContent):
             return None
         else:
             if self._original_state['tagnames']:
             return None
         else:
             if self._original_state['tagnames']:

-                old_tags = set(name for name in self._original_state['tagnames'].split(u' '))
+                old_tags = set(self._original_state['tagnames'].split())

             else:
                 old_tags = set()
             else:
                 old_tags = set()

-            new_tags = set(name for name in self.tagnames.split(u' ') if name)
+            new_tags = set(self.tagnames.split())

 
             return dict(
                     current=list(new_tags),
 
             return dict(
                     current=list(new_tags),


@@ -323,7 +403,7 @@ class Node(BaseModel, NodeContent):
             for name in tag_changes['added']:
                 try:
                     tag = Tag.objects.get(name=name)
             for name in tag_changes['added']:
                 try:
                     tag = Tag.objects.get(name=name)

-                except:
+                except Tag.DoesNotExist:

                     tag = Tag.objects.create(name=name, created_by=self._last_active_user())
 
                 if not self.nis.deleted:
                     tag = Tag.objects.create(name=name, created_by=self._last_active_user())
 
                 if not self.nis.deleted:


@@ -356,21 +436,39 @@ class Node(BaseModel, NodeContent):
                 tag.add_to_usage_count(1)
                 tag.save()
 
                 tag.add_to_usage_count(1)
                 tag.save()
 

-    def save(self, *args, **kwargs):
-        tags_changed = self._process_changes_in_tags()
+    def delete(self, *args, **kwargs):
+        for tag in self.tags.all():
+            tag.add_to_usage_count(-1)
+            tag.save()
+
+        self.active_revision = None
+        self.save()
+
+        for n in self.children.all():
+            n.delete()

 
 

+        for a in self.actions.all():
+            a.cancel()
+
+        super(Node, self).delete(*args, **kwargs)
+
+    def save(self, *args, **kwargs):

         if not self.id:
             self.node_type = self.get_type()
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)
         if not self.id:
             self.node_type = self.get_type()
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)

-            self.update_last_activity(self.author)
+            self.activate_revision(self.author, self.active_revision)
+            self.update_last_activity(self.author, time=self.added_at)

 
         if self.parent_id and not self.abs_parent_id:
             self.abs_parent = self.parent.absolute_parent
 
         if self.parent_id and not self.abs_parent_id:
             self.abs_parent = self.parent.absolute_parent

-
+        
+        tags_changed = self._process_changes_in_tags()
+        

         super(Node, self).save(*args, **kwargs)
         super(Node, self).save(*args, **kwargs)

-        if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
+        if tags_changed:
+            self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))

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