X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ee01d50d05b7d72dd372e8f3a0c78b9da6c23b38..69ce61e6ef27d1911538523b57371e19926641cb:/apps/wiki/models.py diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 282d4c50..e4ac7289 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -1,38 +1,51 @@ # -*- 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 django.http import Http404 + +import logging +logger = logging.getLogger("fnp.wiki") + + class DocumentStorage(object): def __init__(self, path): self.vstorage = vstorage.VersionedStorage(path) - def get(self, name, revision = None): + 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) + 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( - title = document.name, - text = document.text, - author = author, - comment = comment, - parent = parent) + title=document.name, + text=document.text, + author=author, + comment=comment, + parent=parent) 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)) @@ -54,6 +67,11 @@ class Document(object): except DocumentNotFound: 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): return re.sub(self.META_REGEX, '', self.text, 1) @@ -70,7 +88,24 @@ 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 dict(zip( + ('revision', 'last_update', 'last_comitter', 'commit_message'), + self.storage._info(self.name), + )) + + def getstorage(): return DocumentStorage(settings.REPOSITORY_PATH)