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

Timestamp:

05/01/08 12:24:21 (23 months ago)

Author:

JensDiemer

Message:

put the plugin preferences into the plugin model.
TODO: update detect_page and set system_settings at install.

Files:

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

trunk/pylucid/PyLucid/system/plugin_manager.py

@@ -34 +34 @@
 from django.http import HttpResponse, Http404
 
-from PyLucid.db.preferences import Preferences, preference_cache, \
-                                                        PreferenceDoesntExist
+#from PyLucid.db.preferences import Preferences, preference_cache, PreferenceDoesntExist
 from PyLucid.system.plugin_import import get_plugin_module, get_plugin_config
 from PyLucid.system.exceptions import *
@@ -112 +111 @@
     URLs.current_plugin = plugin_name
 
-    plugin_module = get_plugin_module(request, plugin.package_name, plugin_name)
-
-    if plugin_name in preference_cache:
-        context.preferences = preference_cache[plugin_name]
-    else:
-        if hasattr(plugin_module, "PreferencesForm"):
-            # Get the preferences dict data from the database
-            try:
-                p = Preferences()
-                p.set_plugin(plugin)
-                p.load_from_db()
-                context.preferences = p.data_dict
-            except PreferenceDoesntExist, e:
-                error("Can't get preferences: %s" % e)
-                return
-        else:
-            # plugin has no preferences
-            context.preferences = None
+    debug = request.user.is_superuser or request.debug
+    plugin_module = get_plugin_module(plugin.package_name, plugin_name, debug)
 
     plugin_class = getattr(plugin_module, plugin_name)
+#    print plugin_class, type(plugin_class)
     class_instance = plugin_class(context, local_response)
     unbound_method = getattr(class_instance, method_name)
@@ -216 +200 @@
 
 
-def _install_plugin(package_name, plugin_name, plugin_config, active,
+def _install_plugin(request, package_name, plugin_name, plugin_config, active,
                                                                 extra_verbose):
     """
@@ -223 +207 @@
     if extra_verbose:
         print "Install %s.%s..." % (package_name, plugin_name),
+
     plugin = Plugin.objects.create(
         package_name = package_name,
         plugin_name = plugin_name,
-        version = plugin_config.__version__,
         author = plugin_config.__author__,
         url = plugin_config.__url__,
         description = plugin_config.__description__,
-        long_description = plugin_config.__long_description__,
         can_deinstall = getattr(plugin_config, "__can_deinstall__", True),
         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)
+    if pref_form:
+        # plugin module has a preferences newform class
+        plugin.init_pref_form(pref_form)
+
+
     plugin.save()
     if extra_verbose:
@@ -239 +230 @@
     return plugin
 
-
-def _insert_preferences(request, plugin, package_name, plugin_name):
-    """
-    insertet the initial values from the newforms preferences class into the
-    database.
-    """
-    plugin_module = get_plugin_module(request, package_name, plugin_name)
-
-    pref_form = getattr(plugin_module, "PreferencesForm", None)
-    if pref_form == None:
-        # Has no preferences newform class
-        return
-
-    p = Preferences()
-    p.set_plugin(plugin)
-    p.create_initial(pref_form)
 
 
@@ -280 +255 @@
 
     plugin = _install_plugin(
-        package_name, plugin_name, plugin_config, active, extra_verbose
+        request, package_name, plugin_name,
+        plugin_config, active, extra_verbose
     )
-    _insert_preferences(request, plugin, package_name, plugin_name)
 
 
@@ -314 +289 @@
             )
         except Exception, e:
-            print "Error:", e
+            print "Error:"
+            import traceback
+            traceback.print_exc()
             continue