X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7a243e479fd923d27ed69f2085ea2117d37977b2..42faac096df5479bd7747d9068eb88d1410d6d34:/apps/wiki/models.py?ds=sidebyside

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index 7b0f8edc..8ec4d32c 100644
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -3,26 +3,33 @@ import vstorage
 from vstorage import DocumentNotFound
 from wiki import settings
 
-
 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 put(self, document, author, comment, parent):
-        self.vstorage.save_text(document.name, document.text, author, comment, parent)
+        self.vstorage.save_text(
+                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))
 
     def _info(self, name):
         return self.vstorage.page_meta(name)
@@ -30,24 +37,25 @@ class DocumentStorage(object):
 
 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
+            return - 1
 
+    @property
     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'):
@@ -56,9 +64,8 @@ class Document(object):
                     result[k.strip()] = v.strip()
                 except ValueError:
                     continue
-        
-        return result
-
 
-storage = DocumentStorage(settings.REPOSITORY_PATH)
+        return result
 
+def getstorage():
+    return DocumentStorage(settings.REPOSITORY_PATH)