X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ee01d50d05b7d72dd372e8f3a0c78b9da6c23b38..58e0903a3f0e1e105a11638b18b588e9eb6a8b9e:/apps/wiki/models.py diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 282d4c50..a530916f 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -4,10 +4,16 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # import re +import os import vstorage from vstorage import DocumentNotFound from wiki import settings +from django.http import Http404 + +import logging +logger = logging.getLogger("fnp.wiki") + class DocumentStorage(object): def __init__(self, path): self.vstorage = vstorage.VersionedStorage(path) @@ -18,6 +24,12 @@ class DocumentStorage(object): else: text = self.vstorage.revision_text(name, revision) return Document(self, name = name, text = text) + + 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( @@ -52,7 +64,12 @@ class Document(object): try: return self.storage._info(self.name)[0] except DocumentNotFound: - return - 1 + return -1 + + def add_tag(self, tag): + """ 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) @property def plain_text(self): @@ -68,9 +85,25 @@ class Document(object): k, v = line.split(':', 1) result[k.strip()] = v.strip() except ValueError: - continue + 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 dict(zip( + ('revision', 'last_update', 'last_comitter', 'commit_message'), + self.storage._info(self.name) + )) def getstorage(): return DocumentStorage(settings.REPOSITORY_PATH)