Changeset 1551 for trunk/pylucid/PyLucid/system/plugin_manager.py

Timestamp:

05/02/08 16:47:16 (23 months ago)

Author:

JensDiemer

Message:

update preferences:

• move the preferences form from the plugin module into the plugin config modul
• a plugin must not use try...except to get the preferences
• update all modules around the plugin install/deinstall etc.
• detect_page used the system_settings "index_page" value (setup a other default index page works!)

Files:

• trunk/pylucid/PyLucid/system/plugin_manager.py (modified) (8 diffs)

trunk/pylucid/PyLucid/system/plugin_manager.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
-
 """
     PyLucid Plugin Manager
@@ -35 +34 @@
 
 #from PyLucid.db.preferences import Preferences, preference_cache, PreferenceDoesntExist
-from PyLucid.system.plugin_import import get_plugin_module, get_plugin_config
+from PyLucid.system.plugin_import import get_plugin_module, get_plugin_config, \
+                                                            get_plugin_version
 from PyLucid.system.exceptions import *
 from PyLucid.models import Plugin
@@ -68 +68 @@
         return
 
-    plugin_config = get_plugin_config(request,
+    plugin_config = get_plugin_config(
         package_name = plugin.package_name,
         plugin_name = plugin.plugin_name,
-        dissolve_version_string=False
+        debug = request.debug,
     )
 #    context["page_msg"](plugin_config.plugin_manager_data)
@@ -200 +200 @@
 
 
-def _install_plugin(request, package_name, plugin_name, plugin_config, active,
+def _install_plugin(package_name, plugin_name, plugin_config, active,
                                                                 extra_verbose):
     """
@@ -217 +217 @@
         active = active,
     )
-    debug = request.user.is_superuser or request.debug
-    plugin_module = get_plugin_module(package_name, plugin_name, debug)
-    pref_form = getattr(plugin_module, "PreferencesForm", None)
+
+    pref_form = getattr(plugin_config, "PreferencesForm", None)
     if pref_form:
         # plugin module has a preferences newform class
         plugin.init_pref_form(pref_form)
-
 
     plugin.save()
@@ -232 +230 @@
 
 
-def install_plugin(request, package_name, plugin_name, active,
+def install_plugin(package_name, plugin_name, debug, active,
                                                         extra_verbose=False):
     """
     Get the config object from disk and insert the plugin into the database
     """
-    plugin_config = get_plugin_config(request,
-        package_name, plugin_name,
-        dissolve_version_string=True, extra_verbose=extra_verbose
+    plugin_config = get_plugin_config(
+        package_name, plugin_name, debug, extra_verbose=extra_verbose
     )
     if extra_verbose:
@@ -255 +252 @@
 
     plugin = _install_plugin(
-        request, package_name, plugin_name,
-        plugin_config, active, extra_verbose
+        package_name, plugin_name, plugin_config, active, extra_verbose
     )
 
@@ -284 +280 @@
 
         try:
-            install_plugin(request,
-                package_name, plugin_name,
+            install_plugin(
+                package_name, plugin_name, request.debug,
                 active=True, extra_verbose=extra_verbose
             )
         except Exception, e:
+            # FIXME
             print "Error:"
             import traceback