X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1033d6518f376bfd7ef4acaefaab6aa183354f42..fe388980b431aef835eaf43f4547e51f763c3f4b:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index a92dee9..b375ec4 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -1,8 +1,9 @@ -from akismet import * from base import * +import re from tag import Tag import markdown +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 @@ -19,7 +20,10 @@ class NodeContent(models.Model): @property def html(self): - return mark_safe(sanitize_html(markdown.markdown(self.body))) + return self.as_markdown() + + def as_markdown(self, *extensions): + return mark_safe(sanitize_html(markdown.markdown(self.body, extensions=extensions))) @property def headline(self): @@ -27,25 +31,26 @@ class NodeContent(models.Model): def tagname_list(self): if self.tagnames: - return [name for name in self.tagnames.split(u' ')] + 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 [] def tagname_meta_generator(self): - return u','.join([unicode(tag) for tag in self.tagname_list()]) + return u','.join([tag for tag in self.tagname_list()]) class Meta: abstract = True app_label = 'forum' -class NodeMetaClass(models.Model.__metaclass__): +class NodeMetaClass(BaseMetaClass): types = {} def __new__(cls, *args, **kwargs): new_cls = super(NodeMetaClass, cls).__new__(cls, *args, **kwargs) if not new_cls._meta.abstract and new_cls.__name__ is not 'Node': - NodeMetaClass.types[new_cls.__name__.lower()] = new_cls + NodeMetaClass.types[new_cls.get_type()] = new_cls return new_cls @@ -59,10 +64,7 @@ class NodeMetaClass(models.Model.__metaclass__): name = node_cls.__name__.lower() def children(self): - if node_cls._meta.proxy: - return node_cls.objects.filter(node_type=name, parent=self) - else: - return node_cls.objects.filter(parent=self) + return node_cls.objects.filter(parent=self) def parent(self): p = self.__dict__.get('_%s_cache' % name, None) @@ -77,142 +79,289 @@ class NodeMetaClass(models.Model.__metaclass__): Node.add_to_class(name, property(parent)) -node_create = django.dispatch.Signal(providing_args=['instance']) -node_edit = django.dispatch.Signal(providing_args=['instance']) +class NodeQuerySet(CachedQuerySet): + def obj_from_datadict(self, datadict): + cls = NodeMetaClass.types.get(datadict.get("node_type", ""), None) + if cls: + obj = cls() + obj.__dict__.update(datadict) + return obj + else: + return super(NodeQuerySet, self).obj_from_datadict(datadict) -class Node(BaseModel, NodeContent, DeletableContent): - __metaclass__ = NodeMetaClass + def get(self, *args, **kwargs): + return super(NodeQuerySet, self).get(*args, **kwargs).leaf + + 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()]) + + +class NodeManager(CachedManager): + use_for_related_fields = True + + def get_query_set(self): + qs = NodeQuerySet(self.model) + + if self.model is not Node: + return qs.filter(node_type=self.model.get_type()) + else: + return qs - node_type = models.CharField(max_length=16, default='node') - parent = models.ForeignKey('Node', related_name='children', null=True) - abs_parent = models.ForeignKey('Node', related_name='all_children', null=True) + def get_for_types(self, types, *args, **kwargs): + kwargs['node_type__in'] = [t.get_type() for t in types] + return self.get(*args, **kwargs) - added_at = models.DateTimeField(default=datetime.datetime.now) + def filter_state(self, **kwargs): + return self.all().filter_state(**kwargs) - tags = models.ManyToManyField('Tag', related_name='%(class)ss') - score = DenormalizedField(default=0) - vote_up_count = DenormalizedField(default=0) - vote_down_count = models.IntegerField(default=0) +class NodeStateDict(object): + def __init__(self, node): + self.__dict__['_node'] = node - comment_count = DenormalizedField(default=0) - offensive_flag_count = DenormalizedField(default=0) + def __getattr__(self, name): + if self.__dict__.get(name, None): + return self.__dict__[name] - last_edited_at = models.DateTimeField(null=True, blank=True) - last_edited_by = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_%(class)ss') + try: + node = self.__dict__['_node'] + action = NodeState.objects.get(node=node, state_type=name).action + self.__dict__[name] = action + return action + except: + return None + def __setattr__(self, name, value): + current = self.__getattr__(name) + + if value: + if current: + current.action = value + current.save() + else: + node = self.__dict__['_node'] + state = NodeState(node=node, action=value, state_type=name) + state.save() + self.__dict__[name] = value + + if not "(%s)" % name in node.state_string: + node.state_string = "%s(%s)" % (node.state_string, name) + node.save() + else: + if current: + node = self.__dict__['_node'] + node.state_string = "".join("(%s)" % s for s in re.findall('\w+', node.state_string) if s != name) + node.save() + current.node_state.delete() + del self.__dict__[name] + + +class NodeStateQuery(object): + def __init__(self, node): + self.__dict__['_node'] = node + + def __getattr__(self, name): + node = self.__dict__['_node'] + return "(%s)" % name in node.state_string + + + +class Node(BaseModel, NodeContent): + __metaclass__ = NodeMetaClass + + node_type = models.CharField(max_length=16, default='node') + parent = models.ForeignKey('Node', related_name='children', null=True) + abs_parent = models.ForeignKey('Node', related_name='all_children', null=True) + + added_at = models.DateTimeField(default=datetime.datetime.now) + score = models.IntegerField(default=0) + + state_string = models.TextField(default='') + last_edited = models.ForeignKey('Action', null=True, unique=True, related_name="edited_node") + + last_activity_by = models.ForeignKey(User, null=True) + last_activity_at = models.DateTimeField(null=True, blank=True) + + tags = models.ManyToManyField('Tag', related_name='%(class)ss') active_revision = models.OneToOneField('NodeRevision', related_name='active', null=True) + extra_ref = models.ForeignKey('Node', null=True) + extra_count = models.IntegerField(default=0) + + marked = models.BooleanField(default=False) + + comment_count = DenormalizedField("children", node_type="comment", canceled=False) + flag_count = DenormalizedField("flags") + + friendly_name = _("post") + + objects = NodeManager() + + @classmethod + def cache_key(cls, pk): + return '%s:node:%s' % (settings.APP_URL, pk) + + @classmethod + def get_type(cls): + return cls.__name__.lower() + @property def leaf(self): - return NodeMetaClass.types[self.node_type].objects.get(id=self.id) + leaf_cls = NodeMetaClass.types.get(self.node_type, None) + + if leaf_cls is None: + return self + + leaf = leaf_cls() + leaf.__dict__ = self.__dict__ + return leaf + + @property + def nstate(self): + state = self.__dict__.get('_nstate', None) + + if state is None: + state = NodeStateDict(self) + self._nstate = state + + return state + + @property + def nis(self): + nis = self.__dict__.get('_nis', None) + + if nis is None: + nis = NodeStateQuery(self) + self._nis = nis + + return nis + + @property + def deleted(self): + return self.nis.deleted @property def absolute_parent(self): if not self.abs_parent_id: - return self.leaf + return self - return self.abs_parent.leaf + return self.abs_parent @property def summary(self): return strip_tags(self.html)[:300] - def create_revision(self, user, **kwargs): - revision = NodeRevision(author=user, **kwargs) - - if not self.id: - self.author = user + @models.permalink + def get_revisions_url(self): + return ('revisions', (), {'id': self.id}) + + def update_last_activity(self, user, save=False): + self.last_activity_by = user + self.last_activity_at = datetime.datetime.now() + + if self.parent: + self.parent.update_last_activity(user, save=True) + + if save: self.save() - revision.revision = 1 - else: - revision.revision = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1 - revision.node_id = self.id + def _create_revision(self, user, number, **kwargs): + revision = NodeRevision(author=user, revision=number, node=self, **kwargs) revision.save() + return revision + + def create_revision(self, user, **kwargs): + number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1 + revision = self._create_revision(user, number, **kwargs) self.activate_revision(user, revision) + return revision def activate_revision(self, user, revision): self.title = revision.title self.tagnames = revision.tagnames self.body = revision.body - old_revision = self.active_revision self.active_revision = revision - - if not old_revision: - signal = node_create - else: - self.last_edited_at = datetime.datetime.now() - self.last_edited_by = user - signal = node_edit + self.update_last_activity(user) self.save() - signal.send(sender=self.__class__, instance=self) - def get_tag_list_if_changed(self): + def _list_changes_in_tags(self): dirty = self.get_dirty_fields() - if 'tagnames' in dirty: - new_tags = self.tagname_list() - old_tags = dirty['tagnames'] - - if old_tags is None or not old_tags: - old_tags = [] + if not 'tagnames' in dirty: + return None + else: + if self._original_state['tagnames']: + old_tags = set(name for name in self._original_state['tagnames'].split(u' ')) else: - old_tags = [name for name in dirty['tagnames'].split(u' ')] + old_tags = set() + new_tags = set(name for name in self.tagnames.split(u' ') if name) + + return dict( + 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 - tag_list = [] + def _process_changes_in_tags(self): + tag_changes = self._list_changes_in_tags() - for name in new_tags: + if tag_changes is not None: + for name in tag_changes['added']: try: tag = Tag.objects.get(name=name) except: - tag = Tag.objects.create(name=name, created_by=self.last_edited_by or self.author) + tag = Tag.objects.create(name=name, created_by=self._last_active_user()) - tag_list.append(tag) - - if not name in old_tags: - tag.used_count = tag.used_count + 1 - if tag.deleted: - tag.unmark_deleted() + if not self.nis.deleted: + tag.used_count = models.F('used_count') + 1 tag.save() - for name in [n for n in old_tags if not n in new_tags]: - tag = Tag.objects.get(name=name) - tag.used_count = tag.used_count - 1 - if tag.used_count == 0: - tag.mark_deleted(self.last_edited_by or self.author) - 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.save() + except: + pass - return tag_list + return True - return None + return False + + def mark_deleted(self, action): + self.nstate.deleted = action + self.save() + + if action: + for tag in self.tags.all(): + tag.used_count = models.F('used_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.save() def save(self, *args, **kwargs): + tags_changed = self._process_changes_in_tags() + if not self.id: - self.node_type = self.__class__.__name__.lower() + 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) if self.parent_id and not self.abs_parent_id: self.abs_parent = self.parent.absolute_parent - self.__dict__['score'] = self.__dict__['vote_up_count'] - self.__dict__['vote_down_count'] - - tags = self.get_tag_list_if_changed() super(Node, self).save(*args, **kwargs) - if tags is not None: self.tags = tags - - @staticmethod - def isSpam(comment, data): - api = Akismet() - if api.key is None: - print "problem" # raise APIKeyError - else: - if api.comment_check(comment, data): - return True - else: - return False - return data + if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list())) class Meta: app_label = 'forum' @@ -229,11 +378,13 @@ class NodeRevision(BaseModel, NodeContent): app_label = 'forum' -from user import ValidationHash - -class AnonymousNode(Node): - validation_hash = models.ForeignKey(Node, related_name='anonymous_content') - convertible_to = models.CharField(max_length=16, default='node') +class NodeState(models.Model): + node = models.ForeignKey(Node, related_name='states') + state_type = models.CharField(max_length=16) + action = models.OneToOneField('Action', related_name="node_state") class Meta: - app_label = 'forum' \ No newline at end of file + unique_together = ('node', 'state_type') + app_label = 'forum' + +