Ticket #749 - word wrapping for xml error

[redakcja.git] / apps / wiki / models.py

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index ad15c5e..da8681a 100644 (file)
--- 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.
 #
 # 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
 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
 
 
 from django.http import Http404
 


@@ -15,6 +17,29 @@ import logging
 logger = logging.getLogger("fnp.wiki")
 
 
 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)
 class DocumentStorage(object):
     def __init__(self, path):
         self.vstorage = vstorage.VersionedStorage(path)


@@ -24,7 +49,11 @@ class DocumentStorage(object):
         return Document(self, name=name, text=text, revision=rev)
 
     def get_by_tag(self, name, tag):
         return Document(self, name=name, text=text, revision=rev)
 
     def get_by_tag(self, name, tag):

-        text, rev = self.vstorage.page_text(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):
         return Document(self, name=name, text=text, revision=rev)
 
     def get_or_404(self, *args, **kwargs):


@@ -33,7 +62,7 @@ class DocumentStorage(object):
         except DocumentNotFound:
             raise Http404
 
         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,
         self.vstorage.save_text(
                 title=document.name,
                 text=document.text,


@@ -43,15 +72,14 @@ class DocumentStorage(object):
 
         return document
 
 
         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''
 
 
         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)
 
     def delete(self, name, author, comment):
         self.vstorage.delete_page(name, author, comment)


@@ -60,10 +88,14 @@ class DocumentStorage(object):
         return list(self.vstorage.all_pages())
 
     def history(self, title):
         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):
 
 
 class Document(object):


@@ -101,18 +133,29 @@ class Document(object):
             gallery = os.path.basename(gallery)
 
         result['gallery'] = gallery
             gallery = os.path.basename(gallery)
 
         result['gallery'] = gallery

-
-        if 'title' not in result:
-            result['title'] = self.name.title()
-

         return result
 
     def info(self):
         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)
 
 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
+