Changeset 2469

Timestamp:

12/03/09 08:32:36 (8 months ago)

Author:

JensDiemer

Message:

New: Clean page cache after Models changes. Fix ticket:317 and ticket:335

• merge pylucid models signals connections
• some code cleanup

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/cache.py (added)
• apps/pylucid/models/pagecontent.py (modified) (5 diffs)
• apps/pylucid/models/pagemeta.py (modified) (1 diff)
• apps/pylucid/models/pagetree.py (modified) (1 diff)
• apps/pylucid/models/pluginpage.py (modified) (1 diff)
• apps/pylucid/models/__init__.py (modified) (1 diff)
• apps/pylucid_update/views.py (modified) (1 diff)
• pylucid_plugins/blog/models.py (modified) (2 diffs)

branches/0.9/pylucid_project/apps/pylucid/models/pagecontent.py

@@ -4 +4 @@
     PyLucid models
     ~~~~~~~~~~~~~~
-
+    
     Last commit info:
     ~~~~~~~~~~~~~~~~~
@@ -16 +16 @@
 
 from django.db import models
-from django.db.models import signals
 
 # http://code.google.com/p/django-tools/
@@ -23 +22 @@
 from pylucid.models.base_models import UpdateInfoBaseModel, BaseModel, BaseModelManager
 
-from pylucid_project.pylucid_plugins import update_journal
+
 
 
@@ -44 +43 @@
     """
     A normal CMS Page with text content.
+    
+    signals connection is in pylucid_project.apps.pylucid.models.__init__
 
     inherited attributes from UpdateInfoBaseModel:
@@ -122 +123 @@
 model_utils.auto_add_check_unique_together(PageContent)
 
-signals.post_save.connect(receiver=update_journal.save_receiver, sender=PageContent)
+

branches/0.9/pylucid_project/apps/pylucid/models/pagemeta.py

@@ -28 +28 @@
 from django_tools import model_utils
 
-
 from pylucid.models.base_models import UpdateInfoBaseModel, BaseModel, BaseModelManager
 
-from pylucid_project.pylucid_plugins import update_journal
 
 

branches/0.9/pylucid_project/apps/pylucid/models/pagetree.py

@@ -31 +31 @@
 from pylucid.tree_model import BaseTreeModel, TreeGenerator
 from pylucid.models.base_models import BaseModel, BaseModelManager, UpdateInfoBaseModel
-
-from pylucid_project.pylucid_plugins import update_journal
 
 

branches/0.9/pylucid_project/apps/pylucid/models/pluginpage.py

@@ -25 +25 @@
 
 from pylucid.shortcuts import failsafe_message
-from pylucid_project.pylucid_plugins import update_journal
 from pylucid_project.system.pylucid_plugins import PYLUCID_PLUGINS
 from pylucid.models.base_models import UpdateInfoBaseModel, BaseModel, BaseModelManager

branches/0.9/pylucid_project/apps/pylucid/models/__init__.py

@@ -15 +15 @@
 """
 
-from pylucid.models.colorscheme import ColorScheme, Color
-from pylucid.models.design import Design
-from pylucid.models.editable_headfile import EditableHtmlHeadFile
-from pylucid.models.ip_ban_list import BanEntry
-from pylucid.models.language import Language
-from pylucid.models.log import LogEntry
-from pylucid.models.pagecontent import PageContent
-from pylucid.models.pagemeta import PageMeta
-from pylucid.models.pagetree import PageTree
-from pylucid.models.pluginpage import PluginPage
-from pylucid.models.userprofile import UserProfile
+from django.db.models import signals
+
+from colorscheme import ColorScheme, Color
+from design import Design
+from editable_headfile import EditableHtmlHeadFile
+from ip_ban_list import BanEntry
+from language import Language
+from log import LogEntry
+from pagecontent import PageContent
+from pagemeta import PageMeta
+from pagetree import PageTree
+from pluginpage import PluginPage
+from userprofile import UserProfile
+
+from pylucid_project.pylucid_plugins import update_journal
+from pylucid_project.apps.pylucid.cache import clean_complete_pagecache
+
+
+# Add a entry into update journal
+signals.post_save.connect(receiver=update_journal.save_receiver, sender=PageContent)
+
+# For cleaning the page cache:
+signals.post_save.connect(receiver=clean_complete_pagecache, sender=PageTree)
+signals.post_save.connect(receiver=clean_complete_pagecache, sender=PageMeta)
+signals.post_save.connect(receiver=clean_complete_pagecache, sender=PageContent)
+signals.post_save.connect(receiver=clean_complete_pagecache, sender=PluginPage)
+signals.post_save.connect(receiver=clean_complete_pagecache, sender=EditableHtmlHeadFile)

branches/0.9/pylucid_project/apps/pylucid_update/views.py

@@ -133 +133 @@
 
 def _make_new_style_name(style_name, site):
-     return posixpath.join(settings.SITE_STYLE_PREFIX, slugify(site.name), style_name + ".css")
+    return posixpath.join(settings.SITE_STYLE_PREFIX, slugify(site.name), style_name + ".css")
 
 

branches/0.9/pylucid_project/pylucid_plugins/blog/models.py

@@ -29 +29 @@
 from pylucid_project.pylucid_plugins import update_journal
 
-from pylucid.shortcuts import failsafe_message
-from pylucid.models import PageContent, Language, PluginPage
-from pylucid.markup.converter import apply_markup
-from pylucid.models.base_models import AutoSiteM2M, UpdateInfoBaseModel
+from pylucid_project.apps.pylucid.shortcuts import failsafe_message
+from pylucid_project.apps.pylucid.models import PageContent, Language, PluginPage
+from pylucid_project.apps.pylucid.markup.converter import apply_markup
+from pylucid_project.apps.pylucid.models.base_models import AutoSiteM2M, UpdateInfoBaseModel
+from pylucid_project.apps.pylucid.cache import clean_complete_pagecache
 
 
@@ -113 +114 @@
 
 
+# Add a entry into update journal
 signals.post_save.connect(receiver=update_journal.save_receiver, sender=BlogEntry)
+
+
+# For cleaning the page cache:
+signals.post_save.connect(receiver=clean_complete_pagecache, sender=BlogEntry)
+
 
 # Bug in django tagging?