Merge branch 'merge_1' into edumed

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

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index 7b0f8ed..c539908 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -1,64 +1,26 @@
-import re
-import vstorage
-from vstorage import DocumentNotFound
-from wiki import settings
+# -*- 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.
+#
+from django.db import models
+from django.utils.translation import ugettext_lazy as _

 
 

+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):
-        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 put(self, document, author, comment, parent):
-        self.vstorage.save_text(document.name, document.text, author, comment, parent)

 
 

-    def delete(self, name, author, comment):
-        self.vstorage.delete_page(name, author, comment)
+class Theme(models.Model):
+    name = models.CharField(_('name'), max_length=50, unique=True)

 
 

-    def all(self):
-        return list(self.vstorage.all_pages())
+    class Meta:
+        ordering = ('name',)
+        verbose_name = _('theme')
+        verbose_name_plural = _('themes')

 
 

-    def _info(self, name):
-        return self.vstorage.page_meta(name)
+    def __unicode__(self):
+        return self.name

 
 

-
-class Document(object):
-    META_REGEX = re.compile(r'\s*<!--\s(.*?)-->', re.DOTALL | re.MULTILINE)
-    
-    def __init__(self, storage, **kwargs):
-        self.storage = storage
-        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 plain_text(self):
-        return re.sub(self.META_REGEX, '', self.text, 1)
-    
-    def meta(self):
-        result = {}
-        
-        m = re.match(self.META_REGEX, self.text)
-        if m:
-            for line in m.group(1).split('\n'):
-                try:
-                    k, v = line.split(':', 1)
-                    result[k.strip()] = v.strip()
-                except ValueError:
-                    continue
-        
-        return result
-
-
-storage = DocumentStorage(settings.REPOSITORY_PATH)
+    def __repr__(self):
+        return "Theme(name=%r)" % self.name