Handle changing ComplexList options

[cascardo/ipsilon.git] / ipsilon / admin / common.py

diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py
old mode 100755 (executable)
new mode 100644 (file)
index af315ff..4e92d1f
--- a/ipsilon/admin/common.py
+++ b/ipsilon/admin/common.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright (C) 2014  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information
@@ -68,6 +66,67 @@ class AdminPluginConfig(AdminPage):
                                                          self._po.name),
                               config=self._po.get_config_obj())
 
+    def get_complex_list_value(self, name, old_value, **kwargs):
+        delete = list()
+        change = dict()
+        for key, val in kwargs.iteritems():
+            if not key.startswith(name):
+                continue
+            n = key[len(name):]
+            if len(n) == 0 or n[0] != ' ':
+                continue
+            try:
+                index, field = n[1:].split('-')
+            except ValueError:
+                continue
+            if field == 'delete':
+                delete.append(int(index))
+            elif field == 'name':
+                change[int(index)] = val
+
+        if len(delete) == 0 and len(change) == 0:
+            return None
+
+        value = old_value
+
+        # remove unwanted changes
+        for i in delete:
+            if i in change:
+                del change[i]
+
+        # perform requested changes
+        for index, val in change.iteritems():
+            val_list = val.split('/')
+            stripped = list()
+            for v in val_list:
+                stripped.append(v.strip())
+            if len(stripped) == 1:
+                stripped = stripped[0]
+            if len(value) <= index:
+                value.extend([None]*(index + 1 - len(value)))
+            value[index] = stripped
+
+            if len(value[index]) == 0:
+                value[index] = None
+
+        # the previous loop may add 'None' entries
+        # if any still exists mark them to be deleted
+        for i in xrange(0, len(value)):
+            if value[i] is None:
+                delete.append(i)
+
+        # remove duplicates and set in reverse order
+        delete = list(set(delete))
+        delete.sort(reverse=True)
+
+        for i in delete:
+            if len(value) > i:
+                del value[i]
+
+        if len(value) == 0:
+            value = None
+        return value
+
     @admin_protect
     def GET(self, *args, **kwargs):
         return self.root_with_msg()
@@ -102,6 +161,12 @@ class AdminPluginConfig(AdminPage):
                         aname = '%s_%s' % (name, a)
                         if aname in kwargs:
                             value.append(a)
+                elif type(option) is pconfig.ComplexList:
+                    value = self.get_complex_list_value(name,
+                                                        option.get_value(),
+                                                        **kwargs)
+                    if value is None:
+                        continue
                 else:
                     continue
 
@@ -141,13 +206,6 @@ class AdminPluginsOrder(AdminPage):
     def GET(self, *args, **kwargs):
         return self.parent.root_with_msg()
 
-    def _get_enabled_list(self):
-        cur = list()
-        for p in self._site[self.facility].available.values():
-            if p.is_enabled:
-                cur.append(p.name)
-        return cur
-
     @admin_protect
     def POST(self, *args, **kwargs):
 
@@ -158,7 +216,8 @@ class AdminPluginsOrder(AdminPage):
 
         message = "Nothing was modified."
         message_type = "info"
-        cur_enabled = self._get_enabled_list()
+        changed = None
+        cur_enabled = self._site[self.facility].enabled
 
         if 'order' in kwargs:
             order = kwargs['order'].split(',')
@@ -185,6 +244,12 @@ class AdminPluginsOrder(AdminPage):
                     message = "New configuration saved."
                     message_type = ADMIN_STATUS_OK
 
+                    changed = dict()
+                    self.debug('%s -> %s' % (cur_enabled, new_order))
+                    for i in range(0, len(cur_enabled)):
+                        if cur_enabled[i] != new_order[i]:
+                            changed[cur_enabled[i]] = 'reordered'
+
                 except ValueError, e:
                     message = str(e)
                     message_type = ADMIN_STATUS_ERROR
@@ -194,7 +259,8 @@ class AdminPluginsOrder(AdminPage):
                     message_type = ADMIN_STATUS_ERROR
 
         return self.parent.root_with_msg(message=message,
-                                         message_type=message_type)
+                                         message_type=message_type,
+                                         changed=changed)
 
 
 class AdminPlugins(AdminPage):
@@ -223,15 +289,19 @@ class AdminPlugins(AdminPage):
     def save_enabled_plugins(self, names):
         self._site[self.facility].save_enabled(names)
 
-    def root_with_msg(self, message=None, message_type=None):
+    def root_with_msg(self, message=None, message_type=None, changed=None):
         plugins = self._site[self.facility]
 
+        if changed is None:
+            changed = dict()
+
         targs = {'title': self.title,
                  'menu': self._master.menu,
                  'message': message,
                  'message_type': message_type,
                  'available': plugins.available,
                  'enabled': plugins.enabled,
+                 'changed': changed,
                  'baseurl': self.url,
                  'newurl': self.url}
         if self.order:
@@ -269,7 +339,8 @@ class AdminPlugins(AdminPage):
             obj.enable()
             obj.save_enabled_state()
             msg = "Plugin %s enabled" % obj.name
-        return self.root_with_msg(msg, ADMIN_STATUS_OK)
+        return self.root_with_msg(msg, ADMIN_STATUS_OK,
+                                  changed={obj.name: 'enabled'})
     enable.public_function = True
 
     @admin_protect
@@ -283,7 +354,8 @@ class AdminPlugins(AdminPage):
             obj.disable()
             obj.save_enabled_state()
             msg = "Plugin %s disabled" % obj.name
-        return self.root_with_msg(msg, ADMIN_STATUS_OK)
+        return self.root_with_msg(msg, ADMIN_STATUS_OK,
+                                  changed={obj.name: 'disabled'})
     disable.public_function = True
 
 
@@ -324,5 +396,5 @@ class Admin(AdminPage):
         cherrypy.response.headers.update({'Content-Type': 'image/svg+xml'})
         urls = self.get_menu_urls()
         # pylint: disable=star-args
-        return self._template('admin/ipsilon-scheme.svg', **urls)
+        return str(self._template('admin/ipsilon-scheme.svg', **urls))
     scheme.public_function = True