X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a702df34f63291c9aa76a202824455d64fdd8bf9..4bbb2156110a75e84ef95ee28ba31490d986b870:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index bf05cb5..20ede47 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -1,12 +1,17 @@ +# -*- coding: utf-8 -*- + from base import * import re from tag import Tag import markdown +from django.utils.encoding import smart_unicode 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 forum.utils.userlinking import auto_user_link +from forum.settings import SUMMARY_LENGTH from utils import PickledObjectField class NodeContent(models.Model): @@ -21,19 +26,36 @@ class NodeContent(models.Model): @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): + 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 mark_safe(sanitize_html(markdown.markdown(self.body, extensions=extensions))) + return self._as_markdown(smart_unicode(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: - t = [name.strip() for name in self.tagnames.split(u' ') if name] - return [name.strip() for name in self.tagnames.split(u' ') if name] + return [name.strip() for name in self.tagnames.split() if name] else: return [] @@ -58,7 +80,7 @@ class NodeMetaClass(BaseMetaClass): @classmethod def setup_relations(cls): for node_cls in NodeMetaClass.types.values(): - NodeMetaClass.setup_relation(node_cls) + NodeMetaClass.setup_relation(node_cls) @classmethod def setup_relation(cls, node_cls): @@ -68,13 +90,10 @@ class NodeMetaClass(BaseMetaClass): return node_cls.objects.filter(parent=self) def parent(self): - p = self.__dict__.get('_%s_cache' % name, None) + if (self.parent is not None) and self.parent.node_type == name: + return self.parent.leaf - 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 - - return p + return None Node.add_to_class(name + 's', property(children)) Node.add_to_class(name, property(parent)) @@ -91,23 +110,56 @@ class NodeQuerySet(CachedQuerySet): 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 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 - def get_query_set(self): + def get_queryset(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: - 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] @@ -167,7 +219,6 @@ class NodeStateQuery(object): return "(%s)" % name in node.state_string - class Node(BaseModel, NodeContent): __metaclass__ = NodeMetaClass @@ -194,7 +245,7 @@ class Node(BaseModel, NodeContent): marked = models.BooleanField(default=False) comment_count = DenormalizedField("children", node_type="comment", canceled=False) - flag_count = DenormalizedField("flags") + flag_count = DenormalizedField("actions", action_type="flag", canceled=False) friendly_name = _("post") @@ -242,11 +293,22 @@ class Node(BaseModel, NodeContent): 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 + @property def absolute_parent(self): if not self.abs_parent_id: return self @@ -255,18 +317,40 @@ class Node(BaseModel, NodeContent): @property def summary(self): - return strip_tags(self.html)[:300] + content = strip_tags(self.html) + + # Remove multiple spaces. + content = re.sub(' +',' ', content) + + # Replace line breaks with a space, we don't need them at all. + content = content.replace("\n", ' ') + + # Truncate and all an ellipsis if length greater than summary length. + content = (content[:SUMMARY_LENGTH] + '...') if len(content) > SUMMARY_LENGTH else content + + return content + + # Can be used to block subscription notifications for a specific node from a module + def _is_notifiable(self): + return True + + @property + def is_notifiable(self): + return self._is_notifiable() @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_at = datetime.datetime.now() + self.last_activity_at = time 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() @@ -285,13 +369,53 @@ class Node(BaseModel, NodeContent): 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) + + # Try getting the previous revision + try: + prev_revision = NodeRevision.objects.get(node=self, revision=revision.revision-1) + + update_activity = True + + # Do not update the activity if only the tags are changed + if prev_revision.title == revision.title and prev_revision.body == revision.body \ + and prev_revision.tagnames != revision.tagnames and not settings.UPDATE_LATEST_ACTIVITY_ON_TAG_EDIT: + update_activity = False + except NodeRevision.DoesNotExist: + update_activity = True + finally: + if update_activity: + 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 get_last_edited(self): + if not self.last_edited: + try: + le = self.actions.exclude(action_type__in=('voteup', 'votedown', 'flag'), canceled=True).order_by('-action_date')[0] + self.last_edited = le + self.save() + except: + pass + + return self.last_edited + + def _list_changes_in_tags(self): dirty = self.get_dirty_fields() @@ -299,16 +423,16 @@ class Node(BaseModel, NodeContent): 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() - 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), - added=list(new_tags - old_tags), - removed=list(old_tags - new_tags) - ) + current=list(new_tags), + added=list(new_tags - old_tags), + removed=list(old_tags - new_tags) + ) def _last_active_user(self): return self.last_edited and self.last_edited.by or self.author @@ -320,18 +444,18 @@ class Node(BaseModel, NodeContent): 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.used_count = models.F('used_count') + 1 + tag.add_to_usage_count(1) tag.save() if not self.nis.deleted: for name in tag_changes['removed']: try: tag = Tag.objects.get(name=name) - tag.used_count = models.F('used_count') - 1 + tag.add_to_usage_count(-1) tag.save() except: pass @@ -346,27 +470,49 @@ class Node(BaseModel, NodeContent): if action: for tag in self.tags.all(): - tag.used_count = models.F('used_count') - 1 + tag.add_to_usage_count(-1) tag.save() else: for tag in Tag.objects.filter(name__in=self.tagname_list()): - tag.used_count = models.F('used_count') + 1 + tag.add_to_usage_count(1) tag.save() + 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): - tags_changed = self._process_changes_in_tags() - 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.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames, + body=self.body) + 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 - + + tags_changed = self._process_changes_in_tags() + super(Node, self).save(*args, **kwargs) - if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list())) + if tags_changed: + if self.tagnames.strip(): + self.tags = list(Tag.objects.filter(name__in=self.tagname_list())) + else: + self.tags = [] class Meta: app_label = 'forum'