Changeset 2055

Timestamp:

06/22/09 15:52:19 (9 months ago)

Author:

JensDiemer

Message:

inserting colors from ColorScheme?.

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/admin.py (modified) (1 diff)
• apps/pylucid/models.py (modified) (7 diffs)
• apps/pylucid/system/headfile.py (modified) (1 diff)
• apps/pylucid/views.py (modified) (3 diffs)
• pylucid_plugins/extrahead/context_middleware.py (modified) (1 diff)

branches/0.9/pylucid_project/apps/pylucid/admin.py

@@ -130 +130 @@
 
 class EditableHtmlHeadFileAdmin(VersionAdmin):
-    list_display = ("filepath", "description", "lastupdatetime", "lastupdateby")
+    list_display = ("filepath", "render", "description", "lastupdatetime", "lastupdateby")
     list_display_links = ("filepath", "description")
-    list_filter = ("site",)
+    list_filter = ("site","render")
 
 admin.site.register(models.EditableHtmlHeadFile, EditableHtmlHeadFileAdmin)

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

@@ -39 +39 @@
 
 from django_tools.middlewares import ThreadLocal
+from django_tools.template import render
 
 from pylucid_project.utils import crypt
@@ -469 +470 @@
         return u"ColorScheme '%s' (on sites: %r)" % (self.name, sites)
 
+class ColorManager(models.Manager):
+    def get_color_dict(self, colorscheme):
+        colors = self.all().filter(colorscheme=colorscheme)
+        color_list = colors.values_list('name', 'value')
+        return dict([(name, "#%s" % value) for name,value in color_list])
 
 class Color(AutoSiteM2M, UpdateInfoBaseModel):
@@ -476 +482 @@
         on_site -> sites.managers.CurrentSiteManager instance
     """
+    objects = ColorManager()
+    
     colorscheme = models.ForeignKey(ColorScheme)
     name = models.CharField(max_length=128,
@@ -567 +575 @@
     content = models.TextField()
     
-    def get_cachepath(self):
+    def get_color_filepath(self, colorscheme):
+        """ Colorscheme + filepath """
+        assert isinstance(colorscheme, ColorScheme)
+        return os.path.join("ColorScheme_%s" % colorscheme.pk, self.filepath)
+        
+    def get_path(self, colorscheme):
+        """ Path for filesystem cache path and link url. """
+        return os.path.join(
+            settings.PYLUCID.PYLUCID_MEDIA_DIR, settings.PYLUCID.CACHE_DIR,
+            self.get_color_filepath(colorscheme)
+        )
+    
+    def get_cachepath(self, colorscheme):
         """
         filesystem path with filename.
         TODO: Install section sould create the directories!
         """
-        return os.path.join(
-            settings.MEDIA_ROOT, settings.PYLUCID.PYLUCID_MEDIA_DIR, settings.PYLUCID.CACHE_DIR,
-            self.filepath
-        )
-        
-    def save_cache_file(self):
+        return os.path.join(settings.MEDIA_ROOT, self.get_path(colorscheme))
+        
+    def get_rendered(self, colorscheme):
+        color_dict = Color.objects.get_color_dict(colorscheme)
+        return render.render_string_template(self.content, color_dict)        
+        
+    def save_cache_file(self, colorscheme):
         """
         Try to cache the head file into filesystem (Only worked, if python process has write rights)
         Try to create the out path, if it's not exist.
         """
-        cachepath = self.get_cachepath()
+        cachepath = self.get_cachepath(colorscheme)
         
         def _save_cache_file(auto_create_dir=True):
+            rendered_content = self.get_rendered(colorscheme)
             try:
                 f = file(cachepath, "w")
-                f.write(self.content)
+                f.write(rendered_content)
                 f.close()
             except IOError, err:
@@ -609 +631 @@
                 user_message_or_warn("EditableHtmlHeadFile cached successful into: %r" % cachepath)
 
-    def get_absolute_url(self):
-        cachepath = self.get_cachepath()
+    def save_all_color_cachfiles(self):
+        """ this headfile was changed: resave all cache files in every existing colors"""
+        designs = Design.objects.all().filter(colorscheme=colorscheme)
+        for design in designs:
+            print design
+            headfiles = design.headfiles.all()
+            for headfile in headfiles:
+                print headfile
+                headfile.save_cache_file(colorscheme)
+
+    def get_absolute_url(self, colorscheme):
+        cachepath = self.get_cachepath(colorscheme)
         if os.path.isfile(cachepath):
             # The file exist in media path -> Let the webserver send this file ;)
-            return posixpath.join(
-                settings.MEDIA_URL, settings.PYLUCID.PYLUCID_MEDIA_DIR, settings.PYLUCID.CACHE_DIR,
-                self.filepath
-            )
+            return os.path.join(settings.MEDIA_URL, self.get_path(colorscheme))
         else:
             # not cached into filesystem -> use pylucid.views.send_head_file for it
-            return reverse('PyLucid-send_head_file', kwargs={"filepath":self.filepath})
-
-
-    def get_headfilelink(self):
+            url = reverse('PyLucid-send_head_file', kwargs={"filepath":self.filepath})
+            return url + "?ColorScheme=%s" % colorscheme.pk
+
+    def get_headfilelink(self, colorscheme):
         """ Get the link url to this head file. """
-        url = self.get_absolute_url()
+        url = self.get_absolute_url(colorscheme)
         return headfile.HeadfileLink(url)
 
@@ -643 +672 @@
 
         # Try to cache the head file into filesystem (Only worked, if python process has write rights)
-        self.save_cache_file()
+        self.save_all_color_cachfiles()
 
         return super(EditableHtmlHeadFile, self).save(*args, **kwargs)
@@ -705 +734 @@
         ordering = ("user",)
 
+
+#______________________________________________________________________________
+
+def cache_headfiles(sender, **kwargs):
+    """
+    One colorscheme was changes: resave all cache headfiles with new color values. 
+    """
+    colorscheme = kwargs["instance"]
+
+    designs = Design.objects.all().filter(colorscheme=colorscheme)
+    for design in designs:
+        headfiles = design.headfiles.all()
+        for headfile in headfiles:
+            headfile.save_cache_file(colorscheme)
+    
+signals.post_save.connect(cache_headfiles, sender=ColorScheme)
 
 #______________________________________________________________________________

branches/0.9/pylucid_project/apps/pylucid/system/headfile.py

@@ -76 +76 @@
     def __init__(self, url, tag_attrs={}):
         self.url = url
-        self.data_type = os.path.splitext(self.url)[1].lstrip(".")
+        if "?" in url:
+            path = url.split("?",1)[0]
+        else:
+            path = url
+        self.data_type = os.path.splitext(path)[1].lstrip(".")
         self.check_type()
 

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

@@ -10 +10 @@
 from pylucid.system import pylucid_plugin, i18n, pylucid_objects
 from pylucid.markup.converter import apply_markup
-from pylucid.models import PageTree, PageContent, EditableHtmlHeadFile, Language
+from pylucid.models import PageTree, PageContent, ColorScheme, EditableHtmlHeadFile, Language
 
 
@@ -174 +174 @@
 # view functions
 
-
 def send_head_file(request, filepath):
     """
@@ -180 +179 @@
     only a fall-back method if the file can't be stored into the media path
     """
+    if "ColorScheme" in request.GET:
+        colorscheme_pk = request.GET["ColorScheme"]
+        try:
+            colorscheme = ColorScheme.objects.get(pk=colorscheme_pk)
+        except ColorScheme.DoesNotExist:
+            if settings.DEBUG:
+                msg = "ColorScheme %r not found!" % colorscheme_pk
+            else:
+                msg = ""
+            raise http.Http404(msg)
+    
     try:
         headfile = EditableHtmlHeadFile.objects.get(filepath=filepath)
     except EditableHtmlHeadFile.DoesNotExist:
         if settings.DEBUG:
-            request.page_msg.error("Headfile %r not found!" % filepath)
-        raise http.Http404
-    
-    content = headfile.content
+            msg = "Headfile %r not found!" % filepath
+        else:
+            msg = ""
+        raise http.Http404(msg)
+    
+    if headfile.render:
+        content = headfile.get_rendered(colorscheme)
+    else:
+        content = headfile.content
+        
     mimetype = headfile.mimetype    
     return http.HttpResponse(content, mimetype=mimetype)

branches/0.9/pylucid_project/pylucid_plugins/extrahead/context_middleware.py

@@ -42 +42 @@
         design = pagetree.design
         
+        colorscheme = design.colorscheme
         headfiles = design.headfiles.all()
         
         for headfile in headfiles:
             # Get a instance from pylucid.system.headfile.HeadfileLink():
-            headfilelink = headfile.get_headfilelink()
+            headfilelink = headfile.get_headfilelink(colorscheme)
             head_tag = headfilelink.get_head_tag()
             self.extrahead.append(head_tag)