X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24c1d259ba4af084959d70c6a1f355d0a57f1191..90c3f004c1f250e2370c78688c2fed831cf94b5e:/apps/wiki/models.py?ds=inline diff --git a/apps/wiki/models.py b/apps/wiki/models.py index e4ac7289..da8681aa 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -3,11 +3,13 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.db import models import re import os import vstorage from vstorage import DocumentNotFound -from wiki import settings +from wiki import settings, constants +from django.utils.translation import ugettext_lazy as _ from django.http import Http404 @@ -15,16 +17,44 @@ import logging logger = logging.getLogger("fnp.wiki") +# _PCHARS_DICT = dict(zip((ord(x) for x in u"ĄĆĘŁŃÓŚŻŹąćęłńóśżź "), u"ACELNOSZZacelnoszz_")) +_PCHARS_DICT = dict(zip((ord(x) for x in u" "), u"_")) + +# I know this is barbaric, but I didn't find a better solution ;( +def split_name(name): + parts = name.translate(_PCHARS_DICT).split('__') + return parts + +def join_name(*parts, **kwargs): + name = u'__'.join(p.translate(_PCHARS_DICT) for p in parts) + logger.info("JOIN %r -> %r", parts, name) + return name + +def normalize_name(name): + """ + >>> normalize_name("gąska".decode('utf-8')) + u'g\u0105ska' + """ + return unicode(name).translate(_PCHARS_DICT) + +STAGE_TAGS_RE = re.compile(r'^#stage-finished: (.*)$', re.MULTILINE) + + class DocumentStorage(object): def __init__(self, path): self.vstorage = vstorage.VersionedStorage(path) def get(self, name, revision=None): - if revision is None: - text = self.vstorage.page_text(name) - else: - text = self.vstorage.revision_text(name, revision) - return Document(self, name=name, text=text) + text, rev = self.vstorage.page_text(name, revision) + return Document(self, name=name, text=text, revision=rev) + + def get_by_tag(self, name, tag): + text, rev = self.vstorage.page_text_by_tag(name, tag) + return Document(self, name=name, text=text, revision=rev) + + def revert(self, name, revision): + text, rev = self.vstorage.revert(name, revision) + return Document(self, name=name, text=text, revision=rev) def get_or_404(self, *args, **kwargs): try: @@ -32,7 +62,7 @@ class DocumentStorage(object): except DocumentNotFound: raise Http404 - def put(self, document, author, comment, parent): + def put(self, document, author, comment, parent=None): self.vstorage.save_text( title=document.name, text=document.text, @@ -40,6 +70,17 @@ class DocumentStorage(object): comment=comment, parent=parent) + return document + + def create_document(self, text, name): + title = u', '.join(p.title() for p in split_name(name)) + + if text is None: + text = u'' + + document = Document(self, name=name, text=text, title=title) + return self.put(document, u"", u"Document created.") + def delete(self, name, author, comment): self.vstorage.delete_page(name, author, comment) @@ -47,10 +88,14 @@ class DocumentStorage(object): return list(self.vstorage.all_pages()) def history(self, title): - return list(self.vstorage.page_history(title)) + def stage_desc(match): + stage = match.group(1) + return _("Finished stage: %s") % constants.DOCUMENT_STAGES_DICT[stage] + + for changeset in self.vstorage.page_history(title): + changeset['description'] = STAGE_TAGS_RE.sub(stage_desc, changeset['description']) + yield changeset - def _info(self, name): - return self.vstorage.page_meta(name) class Document(object): @@ -61,16 +106,10 @@ class Document(object): for attr, value in kwargs.iteritems(): setattr(self, attr, value) - def revision(self): - try: - return self.storage._info(self.name)[0] - except DocumentNotFound: - return - 1 - - def add_tag(self, tag): + def add_tag(self, tag, revision, author): """ Add document specific tag """ - logger.debug("Adding tag %s to doc %s version %d", tag, self.name, self.revision) - self.storage.vstorage.add_page_tag(self.name, self.revision, tag) + logger.debug("Adding tag %s to doc %s version %d", tag, self.name, revision) + self.storage.vstorage.add_page_tag(self.name, revision, tag, user=author) @property def plain_text(self): @@ -94,18 +133,29 @@ class Document(object): gallery = os.path.basename(gallery) result['gallery'] = gallery - - if 'title' not in result: - result['title'] = self.name.title() - return result def info(self): - return dict(zip( - ('revision', 'last_update', 'last_comitter', 'commit_message'), - self.storage._info(self.name), - )) - + return self.storage.vstorage.page_meta(self.name, self.revision) def getstorage(): return DocumentStorage(settings.REPOSITORY_PATH) + +# +# Django models +# + +class Theme(models.Model): + name = models.CharField(_('name'), max_length=50, unique=True) + + class Meta: + ordering = ('name',) + verbose_name = _('theme') + verbose_name_plural = _('themes') + + def __unicode__(self): + return self.name + + def __repr__(self): + return "Theme(name=%r)" % self.name +