Przyspieszenie działania operatora in na vstorage.

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

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index a128133..7693da4 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -1,4 +1,6 @@
+import re

 import vstorage
 import vstorage

+from vstorage import DocumentNotFound

 from wiki import settings
 
 
 from wiki import settings
 
 


@@ -13,18 +15,49 @@ class DocumentStorage(object):
             text = self.vstorage.revision_text(name, revision)
         return Document(self, name=name, text=text)
     
             text = self.vstorage.revision_text(name, revision)
         return Document(self, name=name, text=text)
     

-    def put(self, name, document, author, comment, parent):
+    def put(self, document, author, comment, parent):

         self.vstorage.save_text(document.name, document.text, author, comment, parent)
 
         self.vstorage.save_text(document.name, document.text, author, comment, parent)
 

-    def delete(name, author, comment):
+    def delete(self, name, author, comment):

         self.vstorage.delete_page(name, author, comment)
 
         self.vstorage.delete_page(name, author, comment)
 

+    def all(self):
+        return list(self.vstorage.all_pages())
+
+    def _info(self, name):
+        return self.vstorage.page_meta(name)
+

 
 class Document(object):
 
 class Document(object):

+    META_REGEX = re.compile(r'\s*<!--\s(.*?)\s-->', re.DOTALL | re.MULTILINE)
+    

     def __init__(self, storage, **kwargs):
         self.storage = storage
     def __init__(self, storage, **kwargs):
         self.storage = storage

-        for attr, value in kwargs:
+        for attr, value in kwargs.iteritems():

             setattr(self, attr, value)
             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)
 
 
 storage = DocumentStorage(settings.REPOSITORY_PATH)