More javascript refactoring.

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

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index 7693da4..22a8119 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -1,53 +1,66 @@
+# -*- 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.  
+#

 import re
 import vstorage
 from vstorage import DocumentNotFound
 from wiki import settings
 
 import re
 import vstorage
 from vstorage import DocumentNotFound
 from wiki import settings
 

-

 class DocumentStorage(object):
     def __init__(self, path):
         self.vstorage = vstorage.VersionedStorage(path)
 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)
         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):
     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 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)
 
 
 class Document(object):
 
     def _info(self, name):
         return self.vstorage.page_meta(name)
 
 
 class Document(object):

-    META_REGEX = re.compile(r'\s*<!--\s(.*?)\s-->', re.DOTALL | re.MULTILINE)
-    
+    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 __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:
     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 plain_text(self):
         return re.sub(self.META_REGEX, '', self.text, 1)

-    
+

     def meta(self):
         result = {}
     def meta(self):
         result = {}

-        
+

         m = re.match(self.META_REGEX, self.text)
         if m:
             for line in m.group(1).split('\n'):
         m = re.match(self.META_REGEX, self.text)
         if m:
             for line in m.group(1).split('\n'):


@@ -55,10 +68,21 @@ class Document(object):
                     k, v = line.split(':', 1)
                     result[k.strip()] = v.strip()
                 except ValueError:
                     k, v = line.split(':', 1)
                     result[k.strip()] = v.strip()
                 except ValueError:

-                    continue
-        
-        return result
-
+                    continue                
+                
+        if 'gallery' not in result:
+            result['gallery'] = (settings.GALLERY_URL + self.name).replace(' ', '_')
+            
+        if 'title' not in result:
+            result['title'] = self.name.title()            

 
 

-storage = DocumentStorage(settings.REPOSITORY_PATH)
+        return result
+    
+    def info(self):
+        return dict(zip(
+            ('revision', 'last_update', 'last_comitter', 'commit_message'),
+            self.storage._info(self.name)
+        ))                         

 
 

+def getstorage():
+    return DocumentStorage(settings.REPOSITORY_PATH)