]> git.ipfire.org Git - ipfire.org.git/commitdiff
wiki: Always render live
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 6 Dec 2018 15:17:43 +0000 (15:17 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 6 Dec 2018 15:17:43 +0000 (15:17 +0000)
Since we have loads of references to other pages, these pages
need to be updated every time a linked page is being updated
and that is quite hard to find out those references now.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/backend/base.py
src/backend/wiki.py

index 70182ca6dc003f992c176ba045704b5756e62dbf..c1088282e6e6a9025686b0a02f14ebb5f574201d 100644 (file)
@@ -89,7 +89,6 @@ class Backend(object):
        def run_task(self, task, *args, **kwargs):
                tasks = {
                        "cleanup-messages"  : self.messages.queue.cleanup,
-                       "rebake-wiki"       : self.wiki.rebake,
                        "scan-files"        : self.releases.scan_files,
                        "send-all-messages" : self.messages.queue.send_all,
                        "update-blog-feeds" : self.blog.update_feeds,
index 723836726dc83915528c49d13cf4d0d9c33f096b..746d1f3ee6e79a383831a45db45a346075e7f9d2 100644 (file)
@@ -66,9 +66,6 @@ class Wiki(misc.Object):
                page = self._get_page("INSERT INTO wiki(page, author_uid, markdown, changes, address) \
                        VALUES(%s, %s, %s, %s, %s) RETURNING *", page, author.uid, content or None, changes, address)
 
-               # Render markdown
-               page.bake()
-
                # Send email to all watchers
                page._send_watcher_emails(excludes=[author])
 
@@ -82,19 +79,6 @@ class Wiki(misc.Object):
                # Just creates a blank last version of the page
                self.create_page(page, author=author, content=None, **kwargs)
 
-       @tornado.gen.coroutine
-       def rebake(self):
-               """
-                       Re-renders all wiki pages
-               """
-               pages = self._get_pages("SELECT * FROM wiki ORDER BY timestamp DESC")
-
-               for page in pages:
-                       logging.info("Baking %s from %s" % (page.page, page.timestamp))
-
-                       with self.db.transaction():
-                               page.bake()
-
        def make_breadcrumbs(self, url):
                # Split and strip all empty elements (double slashes)
                parts = list(e for e in url.split("/") if e)
@@ -341,15 +325,7 @@ class Page(misc.Object):
 
        @property
        def html(self):
-               return self.data.html or self._render(self.markdown)
-
-       def bake(self):
-               """
-                       Renders the page's markdown to HTML and stores
-                       it in the database.
-               """
-               self.db.execute("UPDATE wiki SET html = %s WHERE id = %s",
-                       self._render(self.markdown), self.id)
+               return self._render(self.markdown)
 
        @property
        def timestamp(self):