X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/00a90d6175599e055f5a84697c8388d81ac1b007..e33227021472d98ab797912e73427a9a71c5a531:/apps/wiki/models.py?ds=inline

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index f35c3073..a8a94057 100644
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -7,7 +7,8 @@ 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,6 +16,29 @@ 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 name.translate(_PCHARS_DICT).lower()
+
+STAGE_TAGS_RE = re.compile(r'^#stage-finished: (.*)$', re.MULTILINE)
+
+
 class DocumentStorage(object):
     def __init__(self, path):
         self.vstorage = vstorage.VersionedStorage(path)
@@ -27,13 +51,17 @@ class DocumentStorage(object):
         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:
             return self.get(*args, **kwargs)
         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,
@@ -43,15 +71,14 @@ class DocumentStorage(object):
 
         return document
 
-    def create_document(self, id, text, title=None):
-        if title is None:
-            title = id.title()
+    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=id, text=text, title=title)
-        return self.put(document, u"<wiki>", u"Document created.", None)
+        document = Document(self, name=name, text=text, title=title)
+        return self.put(document, u"<wiki>", u"Document created.")
 
     def delete(self, name, author, comment):
         self.vstorage.delete_page(name, author, comment)
@@ -60,10 +87,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):
@@ -101,18 +132,14 @@ 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
+#