Changeset 2071

Timestamp:

07/03/09 09:34:57 (9 months ago)

Author:

JensDiemer

Message:

* add PyLucid objects via middleware. So it's exist everywhere.
* add a "robots" field in PageMeta? for {{ page_robots }}
* add "urls_filename" in PluginPage?: It's for admin views.
* setup lang_entry direct in PyLucid objects.

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/models.py (modified) (3 diffs)
• apps/pylucid/system/pylucid_objects.py (modified) (1 diff)
• apps/pylucid/views.py (modified) (6 diffs)
• apps/pylucid_update/views.py (modified) (25 diffs)
• middlewares/PyLucidMiddleware.py (added)
• settings.py (modified) (6 diffs)

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

@@ -156 +156 @@
 
 
-
 class PageTree(UpdateInfoBaseModel):
     """
@@ -291 +290 @@
     description = models.CharField(blank=True, max_length=255, help_text="For html header")
 
+    robots = models.CharField(max_length=255, default="index,follow",
+        help_text="for html 'robots' meta content."
+    )
+
     permitViewGroup = models.ForeignKey(Group, related_name="%(class)s_permitViewGroup",
         help_text="Limit viewable to a group?",
@@ -331 +334 @@
     app_label = models.CharField(max_length=256, choices=APP_LABEL_CHOICES,
         help_text="The app lable witch is in settings.INSTALLED_APPS"
+    )
+    urls_filename = models.CharField(max_length=256, default="urls.py",
+        help_text="Filename of the urls.py"
     )
 

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

@@ -19 +19 @@
 """
 
+from django.conf import settings
+
 from pylucid.models import Language
 from pylucid.system import extrahead
 from pylucid.preference_forms import SystemPreferencesForm
 
+
 class PyLucidRequestObjects(object):
     """ PyLucid request objects """
-    def __init__(self):
+    def __init__(self, request):
         self.system_preferences = SystemPreferencesForm().get_preferences()
         default_lang_code = self.system_preferences["lang_code"]
         self.default_lang_code = default_lang_code
         self.default_lang_entry = Language.objects.get(code=default_lang_code)
-        
+
+        # The current language instance
+        try:
+            self.lang_entry = Language.objects.get(code=request.LANGUAGE_CODE)
+        except Language.DoesNotExist:
+            self.lang_entry = self.default_lang_entry
+            if settings.PYLUCID.I18N_DEBUG:
+                request.page_msg.error(
+                    'Favored language "%s" does not exist -> use default lang from system preferences' % (
+                        request.LANGUAGE_CODE
+                    )
+                )
+
         # Storing extra html head code from plugins, used in:
         # pylucid.defaulttags.extraheadBlock - redirect {% extrahead %} block tag content
         # pylucid_plugin.extrahead.context_middleware - insert the data into the global page
         self.extrahead = extrahead.ExtraHead()
-        
+
         # objects witch will be set later:
         #self.pagetree - The current PageTree model instance
         #self.pagemeta - The current PageMeta model instance
         #self.pagecontent - PageContent instance, but only if the current page is not a PagePlugin!
-        #self.lang_entry - The current language instance
         #self.page_template - The globale page template as a string
         #self.context - The globale context

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

@@ -97 +97 @@
         "page_keywords": pagemeta.keywords,
         "page_description": pagemeta.description,
+        "page_robots": pagemeta.robots,
         "page_language": pagemeta.lang.code,
     })
@@ -207 +208 @@
 
 
-def _add_pylucid_request_objects(request):
-    """ Add PyLucid objects to the request object """
-    request.PYLUCID = pylucid_objects.PyLucidRequestObjects()
-
-
 def _prepage_request(request, lang_entry):
     """
@@ -233 +229 @@
 def root_page(request):
     """ render the first root page in system default language """
-    _add_pylucid_request_objects(request)
-
     # activate language via auto detection
     i18n.activate_auto_language(request)
@@ -243 +237 @@
 def lang_root_page(request, url_lang_code):
     """ url with lang code but no page slug """
-    _add_pylucid_request_objects(request)
-
     try:
         lang_entry = Language.objects.get(code=url_lang_code)
@@ -283 +275 @@
 def resolve_url(request, url_lang_code, url_path):
     """ url with lang_code and sub page path """
-    _add_pylucid_request_objects(request)
-
     try:
         lang_entry = Language.objects.get(code=url_lang_code)
@@ -305 +295 @@
     We redirect to a url with language code.
     """
-    _add_pylucid_request_objects(request)
-
     # redirect to a url with the default language code.
     return _i18n_redirect(request, url_path)

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

@@ -52 +52 @@
     out.write("\n______________________________________________________________")
     out.write("Move JS-SHA-Login data into new UserProfile\n")
-    for old_entry in JS_LoginData08.objects.all():       
+    for old_entry in JS_LoginData08.objects.all():
         user = old_entry.user
         sha_login_checksum = old_entry.sha_checksum
         sha_login_salt = old_entry.salt
-        
-        userprofile, created = UserProfile.objects.get_or_create(user = user)
+
+        userprofile, created = UserProfile.objects.get_or_create(user=user)
         #userprofile.site.add(site)           
         if created:
@@ -63 +63 @@
         else:
             out.write("UserProfile for user '%s' exist." % user.username)
-            
+
         if not userprofile.sha_login_checksum:
             # Add old sha login data, only if not exist.
@@ -77 +77 @@
         new_template_name = settings.SITE_TEMPLATE_PREFIX + template.name + ".html"
         new_template, created = Template.objects.get_or_create(
-            name = new_template_name,
-            defaults = {
+            name=new_template_name,
+            defaults={
                 "content": template.content,
                 "creation_date": template.createtime,
@@ -97 +97 @@
     for style in Style08.objects.all():
         new_staticfile, created = EditableHtmlHeadFile.objects.get_or_create(
-            filepath = settings.SITE_TEMPLATE_PREFIX + style.name + ".css",
-            defaults = {
+            filepath=settings.SITE_TEMPLATE_PREFIX + style.name + ".css",
+            defaults={
                 "description": style.description,
                 "content": style.content,
@@ -124 +124 @@
         #---------------------------------------------------------------------
         # create/get Design entry
-        
+
         design_key = "%s %s" % (old_page.template.name, old_page.style.name)
         if design_key not in designs:
@@ -133 +133 @@
             else:
                 new_design_name = "%s + %s" % (old_page.template.name, style_name)
-                
+
             design, created = Design.objects.get_or_create(
-                name = new_design_name,
-                defaults = {
+                name=new_design_name,
+                defaults={
                     "template": templates[old_page.template.name],
                 }
@@ -149 +149 @@
             assert isinstance(css_file, EditableHtmlHeadFile)
             design.headfiles.add(css_file)
-                
+
             colorscheme, created = ColorScheme.objects.get_or_create(name=style_name)
             if created:
@@ -156 +156 @@
             else:
                 out.write("Use color scheme: %s" % colorscheme.name)
-                
+
             design.colorscheme = colorscheme
             design.save()
@@ -163 +163 @@
             design = designs[design_key]
             out.write("Use existing Design: %r" % design)
-            
+
         #---------------------------------------------------------------------
         # create/get PageTree entry
@@ -173 +173 @@
 
         tree_entry, created = PageTree.objects.get_or_create(
-            site = site,
-            slug = old_page.shortcut,
-            parent = parent,
-            defaults = {
+            site=site,
+            slug=old_page.shortcut,
+            parent=parent,
+            defaults={
                 "position": old_page.position,
 
@@ -198 +198 @@
 
         page_dict[old_page.id] = tree_entry
-        
+
         #---------------------------------------------------------------------
         # create/get PageMeta entry
-        
+
         pagemeta_entry, created = PageMeta.objects.get_or_create(
-            page = tree_entry,
-            lang = language,
-            defaults = {
+            page=tree_entry,
+            lang=language,
+            defaults={
                 "name": old_page.name,
                 "title": old_page.title,
@@ -222 +222 @@
         else:
             out.write("PageMeta entry '%s' - '%s' exist." % (language, tree_entry.slug))
-        
+
         #---------------------------------------------------------------------
         # create/get PageContent entry
 
         content_entry, created = PageContent.objects.get_or_create(
-            page = tree_entry,
-            lang = language,
-            pagemeta = pagemeta_entry,
-            defaults = {
+            page=tree_entry,
+            lang=language,
+            pagemeta=pagemeta_entry,
+            defaults={
                 "content": old_page.content,
                 "markup": old_page.markup,
@@ -277 +277 @@
     title = "Update PyLucid v0.8 templates"
     out = SimpleStringIO()
-    
+
     def replace(content, out, old, new):
         out.write("replace %r with %r" % (old, new))
@@ -285 +285 @@
             content = content.replace(old, new)
         return content
-        
-    
+
+
     for template in Template.objects.filter(name__istartswith=settings.SITE_TEMPLATE_PREFIX):
         out.write("\n______________________________________________________________")
         out.write("Update Template: '%s'\n" % template.name)
-        
+
         content = template.content
 
@@ -309 +309 @@
             )
         }
-        new_head_file_tag += '<!-- ContextMiddleware extrahead -->\n'      
-        
-        content = replace(content, out,"{% lucidTag page_style %}", new_head_file_tag)
+        new_head_file_tag += '<!-- ContextMiddleware extrahead -->\n'
+
+        content = replace(content, out, "{% lucidTag page_style %}", new_head_file_tag)
         # temp in developer version:
-        content = replace(content, out,"{% lucidTag head_files %}", new_head_file_tag)
-        content = replace(content, out,"<!-- ContextMiddleware head_files -->", new_head_file_tag)
-        
-        content = replace(content, out,"{{ login_link }}", "{% lucidTag auth %}")
-        
-        content = replace(content, out,"{% lucidTag back_links %}", "<!-- ContextMiddleware breadcrumb -->")
+        content = replace(content, out, "{% lucidTag head_files %}", new_head_file_tag)
+        content = replace(content, out, "<!-- ContextMiddleware head_files -->", new_head_file_tag)
+
+        content = replace(content, out, "{{ login_link }}", "{% lucidTag auth %}")
+
+        content = replace(content, out, "{% lucidTag back_links %}", "<!-- ContextMiddleware breadcrumb -->")
         content = replace(content, out,
             "{{ PAGE.content }}",
@@ -329 +329 @@
             "{{ page_title }}"
         )
-        content = replace(content, out,"PAGE.title", "page_title")
-        content = replace(content, out,"{{ PAGE.keywords }}", "{{ page_keywords }}")
-        content = replace(content, out,"{{ PAGE.description }}", "{{ page_description }}")
-        
-        content = replace(content, out,"{{ PAGE.datetime", "{{ page_createtime")
-        
+        content = replace(content, out, "PAGE.title", "page_title")
+        content = replace(content, out, "{{ PAGE.keywords }}", "{{ page_keywords }}")
+        content = replace(content, out, "{{ PAGE.description }}", "{{ page_description }}")
+        content = replace(content, out, "{{ robots }}", "{{ page_robots }}")
+
+        content = replace(content, out, "{{ PAGE.datetime", "{{ page_createtime")
+
         for timestring in ("lastupdatetime", "createtime"):
             # Change time with filter:
@@ -346 +347 @@
                 '{{ page_%s|date:_("DATETIME_FORMAT") }}' % timestring,
             )
-        
-        content = replace(content, out,"{{ PAGE.", "{{ page_")
-        
+
+        content = replace(content, out, "{{ PAGE.", "{{ page_")
+
         if "{% lucidTag language %}" not in content:
             # Add language plugin after breadcrumb, if not exist
@@ -356 +357 @@
                 "<p>{% lucidTag language %}</p>\n"
             )
-        
+
         # TODO: add somthing like: <meta http-equiv="Content-Language" content="en" />
-        
+
         template.content = content
         template.save()
-        
-        out.write("Template updated.")        
-    
+
+        out.write("Template updated.")
+
     context = {
         "title": title,
@@ -370 +371 @@
     return render_to_response('pylucid_update/update08result.html', context,
         context_instance=RequestContext(request))
-    
+
 
 
@@ -381 +382 @@
     title = "Update PyLucid v0.8 styles"
     out = SimpleStringIO()
-    
+
     def update_headfile_colorscheme(design, headfile):
         out.write("\nExtract colors from: '%s'" % headfile.filepath)
@@ -388 +389 @@
         if colorscheme == None:
             # This design has no color scheme, yet -> create one
-            colorscheme=ColorScheme(name=headfile.filepath)
+            colorscheme = ColorScheme(name=headfile.filepath)
             colorscheme.save()
             out.write("Add color scheme %r to %r" % (colorscheme.name, design.name))
             design.colorscheme = colorscheme
             design.save()
-        
+
         out.write("Use color scheme %r" % colorscheme.name)
-        
+
         content = headfile.content
         new_content, color_dict = extract_colors(content)
@@ -405 +406 @@
         out.write("updated colors: %r" % updated)
         out.write("exists colors: %r" % exists)
-        
+
         colorscheme.save()
-        
+
         headfile.content = new_content
         headfile.render = True
         headfile.save()
-        
-        
+
+
     def update_all_design_colorscheme(design):
         headfiles = design.headfiles.all()
         out.write("\nExisting headfiles: %r" % headfiles)
-        
+
         for headfile in headfiles:
             if not headfile.filepath.lower().endswith(".css"):
@@ -422 +423 @@
             else:
                 update_headfile_colorscheme(design, headfile)
-    
+
     for design in Design.objects.all():
         out.write("\n______________________________________________________________")
         out.write("\nUpdate color scheme for design: '%s'" % design.name)
-                
+
         update_all_design_colorscheme(design)
-    
-    
+
+
 #    styles = EditableHtmlHeadFile.objects.filter(filepath__istartswith=settings.SITE_TEMPLATE_PREFIX)
 #    styles = styles.filter(filepath__iendswith=".css")
@@ -443 +444 @@
 #        out.write(new_content)
 #        out.write(repr(color_dict))
-    
+
 #    def replace(content, out, old, new):
 #        out.write("replace %r with %r" % (old, new))
@@ -469 +470 @@
 #            style.save()
 #            out.write("additional styles inserted.")        
-    
+
     context = {
         "title": title,

branches/0.9/pylucid_project/settings.py

@@ -30 +30 @@
 
 import pylucid_project
-import pylucid_plugins
+from pylucid_project.utils import pylucid_plugins
 
 PYLUCID_PROJECT_ROOT = os.path.abspath(os.path.dirname(pylucid_project.__file__))
-PYLUCID_PLUGINS_ROOT = os.path.abspath(os.path.dirname(pylucid_plugins.__file__))
+#PYLUCID_PLUGINS_ROOT = os.path.abspath(os.path.dirname(pylucid_plugins.__file__))
 
 #______________________________________________________________________________
@@ -39 +39 @@
 
 _path_list = (
-    PYLUCID_PLUGINS_ROOT,
+#    PYLUCID_PLUGINS_ROOT,
     PYLUCID_PROJECT_ROOT,
     os.path.join(PYLUCID_PROJECT_ROOT, "apps")
@@ -85 +85 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 
+    'pylucid_project.middlewares.PyLucidMiddleware.PyLucidMiddleware',
     'pylucid_project.middlewares.PageMessages.PageMessagesMiddleware',
 
@@ -93 +94 @@
 SLOWER_DEV_SERVER_SLEEP = 0.3 # time.sleep() value (in sec.)
 
-_BASE_PATH = os.path.join(os.path.dirname(__file__))
-
-_plugins = pylucid_plugins.PluginList(
-    fs_path=os.path.join(_BASE_PATH, "pylucid_plugins"),
-    pkg_prefix="pylucid_project.pylucid_plugins"
-)
+PYLUCID_BASE_PATH = os.path.join(os.path.dirname(__file__))
+
+_PYLUCID_PLUGIN_PACKAGES = (
+    (os.path.join(PYLUCID_BASE_PATH, "pylucid_plugins"), "pylucid_project.pylucid_plugins"),
+    #(os.path.join(PYLUCID_BASE_PATH, "external_plugins"), "pylucid_project.external_pylucid_plugins"),
+)
+pylucid_plugins.setup_plugins(_PYLUCID_PLUGIN_PACKAGES)
 
 TEMPLATE_DIRS = (
-    os.path.join(_BASE_PATH, "apps/pylucid/templates/"),
-    os.path.join(_BASE_PATH, "apps/pylucid_admin/templates/"),
-    os.path.join(_BASE_PATH, "apps/pylucid_update/templates/"),
-
-    os.path.join(_BASE_PATH, "apps/dbpreferences/templates/"),
-
-    os.path.join(_BASE_PATH, "django/contrib/admin/templates"),
+    os.path.join(PYLUCID_BASE_PATH, "apps/pylucid/templates/"),
+    os.path.join(PYLUCID_BASE_PATH, "apps/pylucid_admin/templates/"),
+    os.path.join(PYLUCID_BASE_PATH, "apps/pylucid_update/templates/"),
+
+    os.path.join(PYLUCID_BASE_PATH, "apps/dbpreferences/templates/"),
+
+    os.path.join(PYLUCID_BASE_PATH, "django/contrib/admin/templates"),
 )
 # Add all templates subdirs from all existing PyLucid plugins
-TEMPLATE_DIRS += _plugins.get_template_dirs()
+TEMPLATE_DIRS += pylucid_plugins.PLUGINS.template_dirs
+#print "settings.TEMPLATE_DIRS:", TEMPLATE_DIRS
 
 TEMPLATE_LOADERS = (
@@ -161 +164 @@
 )
 # Add all existing PyLucid plugins
-INSTALLED_APPS += _plugins.get_installed_apps()
-#print INSTALLED_APPS
+INSTALLED_APPS += pylucid_plugins.PLUGINS.pkg_list
+#print "settings.INSTALLED_APPS:", INSTALLED_APPS
 
 #http://docs.djangoproject.com/en/dev/ref/settings/#setting-TEST_RUNNER
@@ -201 +204 @@
 #     Example-1: "./media/" (default)
 #     Example-2: "/home/foo/htdocs/media/"
-MEDIA_ROOT = os.path.join(_BASE_PATH, "media") + "/"
+MEDIA_ROOT = os.path.join(PYLUCID_BASE_PATH, "media") + "/"
 
 # URL that handles the media served from MEDIA_ROOT.