Revert "ping server every 10 minutes"

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

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index ecf7837..f800481 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -1,34 +1,67 @@
+# -*- 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 re

+import os

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

+from django.http import Http404
+
+import logging
+logger = logging.getLogger("fnp.wiki")
+
+

 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):
-        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 get(self, name, revision=None):
+        text, rev = self.vstorage.page_text(name, revision)
+        return Document(self, name=name, text=text, revision=rev)
+
+    def get_by_tag(self, name, tag):
+        text, rev = self.vstorage.page_text_by_tag(name, tag)
+        return Document(self, name=name, text=text, revision=rev)
+
+    def get_or_404(self, *args, **kwargs):
+        try:
+            return self.get(*args, **kwargs)
+        except DocumentNotFound:
+            raise Http404

 
     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)
+
+        return document
+
+    def create_document(self, id, text, title=None):
+        if title is None:
+            title = id.title()
+
+        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)

 
     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 history(self, title):
         return list(self.vstorage.page_history(title))
 

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

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


@@ -38,11 +71,10 @@ class Document(object):
         for attr, value in kwargs.iteritems():
             setattr(self, attr, value)
 
         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 add_tag(self, tag, revision, author):
+        """ Add document specific tag """
+        logger.debug("Adding tag %s to doc %s version %d", tag, self.name, revision)
+        self.storage.vstorage.add_page_tag(self.name, revision, tag, user=author)

 
     @property
     def plain_text(self):
 
     @property
     def plain_text(self):


@@ -60,7 +92,21 @@ class Document(object):
                 except ValueError:
                     continue
 
                 except ValueError:
                     continue
 

+        gallery = result.get('gallery', self.name.replace(' ', '_'))
+
+        if gallery.startswith('/'):
+            gallery = os.path.basename(gallery)
+
+        result['gallery'] = gallery
+
+        if 'title' not in result:
+            result['title'] = self.name.title()
+

         return result
 
         return result
 

-# Every time somebody says "let's have a global variable", God kills a kitten.
-storage = DocumentStorage(settings.REPOSITORY_PATH)
+    def info(self):
+        return self.storage.vstorage.page_meta(self.name, self.revision)
+
+
+def getstorage():
+    return DocumentStorage(settings.REPOSITORY_PATH)