X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ee01d50d05b7d72dd372e8f3a0c78b9da6c23b38..a5103645ffd3cb707677aa733bfbee3c2738f87f:/apps/wiki/models.py diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 282d4c50..a4dc7941 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -1,43 +1,77 @@ # -*- coding: utf-8 -*- # # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # 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 + +import logging +logger = logging.getLogger("fnp.wiki") + + +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) + def get(self, name, revision=None): + 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 get_or_404(self, *args, **kwargs): + try: + return self.get(*args, **kwargs) + except DocumentNotFound: + raise Http404 def put(self, document, author, comment, parent): self.vstorage.save_text( - title = document.name, - text = document.text, - author = author, - comment = comment, - parent = parent) + title=document.name, + text=document.text, + author=author, + comment=comment, + parent=parent) + + return document + + def create_document(self, id, text, title=None): + if title is None: + title = id.title() + + if text is None: + text = u'' + + document = Document(self, name=id, text=text, title=title) + return self.put(document, u"", u"Document created.", None) def delete(self, name, author, comment): self.vstorage.delete_page(name, author, comment) def all(self): 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): @@ -48,11 +82,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, revision, author): + """ Add document specific 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): @@ -70,7 +103,25 @@ class Document(object): except ValueError: continue + gallery = result.get('gallery', self.name.replace(' ', '_')) + + if gallery.startswith('/'): + gallery = os.path.basename(gallery) + + result['gallery'] = gallery + + if 'title' not in result: + result['title'] = self.name.title() + return result + def info(self): + return self.storage.vstorage.page_meta(self.name, self.revision) + + def getstorage(): return DocumentStorage(settings.REPOSITORY_PATH) + +# +# Django models +#