Added function ZakConfi::add_config.

diff --git a/.gitignore b/.gitignore
index bd44a4087e7bf7682bd4a198eaf43cd6970c0196..81eacfaad5df1f87b80710241814b1e595656d02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ Rules-quot
 *.exe
 tests/test
 tests/test_get_configs_list
+tests/test_add_config
 *.csv
 gtk-doc.m4
 *.gir

diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c
index 9d01540298d5218accae311f18df57d5dcb5c3fb..a7d72a6fd010d5d27e80f7759e9016ec4f950982 100644 (file)
--- a/plugins/db/plgdb.c
+++ b/plugins/db/plgdb.c
@@ -519,6 +519,37 @@ GNode
        return node;
 }
 
+static ZakConfiConfi
+*zak_confi_db_plugin_add_config (ZakConfiPluggable *pluggable, const gchar *name, const gchar *description)
+{
+       ZakConfiConfi *cc;
+
+       gchar *sql;
+       gint id;
+
+       ZakConfiDBPluginPrivate *priv = ZAK_CONFI_DB_PLUGIN_GET_PRIVATE (pluggable);
+
+       cc = NULL;
+
+       id = gdaex_get_new_id (priv->gdaex, "configs", "id", NULL);
+
+       sql = g_strdup_printf ("INSERT INTO configs"
+                                                  " VALUES (%d, '%s', '%s')",
+                                                  id,
+                                                  gdaex_strescape (name, NULL),
+                                                  gdaex_strescape (description, NULL));
+       if (gdaex_execute (priv->gdaex, sql) > 0)
+               {
+                       cc = g_new0 (ZakConfiConfi, 1);
+                       cc->name = g_strdup (name);
+                       cc->description = g_strdup (description);
+               }
+
+       g_free (sql);
+
+       return cc;
+}
+
 static ZakConfiKey
 *zak_confi_db_plugin_add_key (ZakConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value)
 {
@@ -899,6 +930,7 @@ zak_confi_pluggable_iface_init (ZakConfiPluggableInterface *iface)
        iface->path_get_value = zak_confi_db_plugin_path_get_value;
        iface->path_set_value = zak_confi_db_plugin_path_set_value;
        iface->get_tree = zak_confi_db_plugin_get_tree;
+       iface->add_config = zak_confi_db_plugin_add_config;
        iface->add_key = zak_confi_db_plugin_add_key;
        iface->key_set_key = zak_confi_db_plugin_key_set_key;
        iface->path_get_confi_key = zak_confi_db_plugin_path_get_confi_key;

diff --git a/plugins/file/plgfile.c b/plugins/file/plgfile.c
index 7382d802b6a04556462448a5491bd3ff00ab5b30..79c85107271d12aafd19854f9d6242ce74cedd4b 100644 (file)
--- a/plugins/file/plgfile.c
+++ b/plugins/file/plgfile.c
@@ -419,6 +419,12 @@ GNode
        return node;
 }
 
+static ZakConfiConfi
+*zak_confi_file_plugin_add_config (ZakConfiPluggable *pluggable, const gchar *name, const gchar *description)
+{
+       return NULL;
+}
+
 static ZakConfiKey
 *zak_confi_file_plugin_add_key (ZakConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value)
 {
@@ -588,6 +594,7 @@ zak_confi_pluggable_iface_init (ZakConfiPluggableInterface *iface)
        iface->path_get_value = zak_confi_file_plugin_path_get_value;
        iface->path_set_value = zak_confi_file_plugin_path_set_value;
        iface->get_tree = zak_confi_file_plugin_get_tree;
+       iface->add_config = zak_confi_file_plugin_add_config;
        iface->add_key = zak_confi_file_plugin_add_key;
        iface->key_set_key = zak_confi_file_plugin_key_set_key;
        iface->path_get_confi_key = zak_confi_file_plugin_path_get_confi_key;

diff --git a/src/confi.c b/src/confi.c
index 2d5ae6853b270f6e485545c3e9359ced7eebe53c..79072535e7e69919b39607cd7b74ce380bceeff8 100644 (file)
--- a/src/confi.c
+++ b/src/confi.c
@@ -254,16 +254,19 @@ PeasPluginInfo
  */
 GList
 *zak_confi_get_configs_list (const gchar *cnc_string,
-                         const gchar *filter)
+                                                        const gchar *filter)
 {
        ZakConfiPluggable *pluggable;
        GList *lst;
 
-       lst = NULL;
-
        pluggable = zak_confi_get_confi_pluggable_from_cnc_string (cnc_string);
 
-       if (pluggable != NULL)
+       if (pluggable == NULL)
+               {
+                       g_warning ("Not initialized.");
+                       lst = NULL;
+               }
+       else
                {
                        lst = zak_confi_pluggable_get_configs_list (pluggable, filter);
                }
@@ -271,6 +274,37 @@ GList
        return lst;
 }
 
+/**
+ * zak_confi_add_config:
+ * @cnc_string:
+ * @name:
+ * @description:
+ *
+ * Returns: a #ZakConfiConfi struct.
+ */
+ZakConfiConfi
+*zak_confi_add_config (const gchar *cnc_string,
+                                          const gchar *name,
+                                          const gchar *description)
+{
+       ZakConfiPluggable *pluggable;
+       ZakConfiConfi *cc;
+
+       pluggable = zak_confi_get_confi_pluggable_from_cnc_string (cnc_string);
+
+       if (pluggable == NULL)
+               {
+                       g_warning ("Not initialized.");
+                       cc = NULL;
+               }
+       else
+               {
+                       cc = zak_confi_pluggable_add_config (pluggable, name, description);
+               }
+
+       return cc;
+}
+
 /**
  * zak_confi_get_tree:
  * @confi: a #ZakConfi object.

diff --git a/src/confipluggable.c b/src/confipluggable.c
index beae829ce5232394e0e07e294ea991155c289ac6..bb6b64468b22be2ff2ecb0e9e2cfc3c58f92da6a 100644 (file)
--- a/src/confipluggable.c
+++ b/src/confipluggable.c
@@ -191,6 +191,27 @@ GNode
        return iface->get_tree (pluggable);
 }
 
+/**
+ * zak_confi_pluggable_add_confi:
+ * @pluggable: a #ZakConfiPluggable object.
+ * @name: the name of the config..
+ * @description: the config's description.
+ *
+ * Returns: a #ZakConfiConfi struct filled with data from the key just added.
+ */
+ZakConfiConfi
+*zak_confi_pluggable_add_config (ZakConfiPluggable *pluggable, const gchar *name, const gchar *description)
+{
+       ZakConfiPluggableInterface *iface;
+
+       g_return_val_if_fail (ZAK_CONFI_IS_PLUGGABLE (pluggable), FALSE);
+
+       iface = ZAK_CONFI_PLUGGABLE_GET_IFACE (pluggable);
+       g_return_val_if_fail (iface->add_config != NULL, FALSE);
+
+       return iface->add_config (pluggable, name, description);
+}
+
 /**
  * zak_confi_pluggable_add_key:
  * @pluggable: a #ZakConfiPluggable object.
@@ -198,7 +219,7 @@ GNode
  * @key: the key's name.
  * @value: the key's value.
  *
- * Returns: a #ZakConfigKey struct filled with data from the key just added.
+ * Returns: a #ZakConfiKey struct filled with data from the key just added.
  */
 ZakConfiKey
 *zak_confi_pluggable_add_key (ZakConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value)

diff --git a/src/confipluggable.h b/src/confipluggable.h
index 1b8fd1c62a3d33aa7dc4d8cf1050d5d994827f5e..5b133415daceeeafa8a2982fc299f2e37bcfb716 100644 (file)
--- a/src/confipluggable.h
+++ b/src/confipluggable.h
@@ -64,6 +64,9 @@ struct _ZakConfiPluggableInterface {
                                    const gchar *path,
                                    const gchar *value);
        GNode *(*get_tree) (ZakConfiPluggable *pluggable);
+       ZakConfiConfi *(*add_config) (ZakConfiPluggable *pluggable,
+                             const gchar *name,
+                             const gchar *description);
        ZakConfiKey *(*add_key) (ZakConfiPluggable *pluggable,
                              const gchar *parent,
                              const gchar *key,
@@ -92,6 +95,9 @@ gboolean zak_confi_pluggable_path_set_value (ZakConfiPluggable *pluggable,
                                const gchar *path,
                                const gchar *value);
 GNode *zak_confi_pluggable_get_tree (ZakConfiPluggable *pluggable);
+ZakConfiConfi *zak_confi_pluggable_add_config (ZakConfiPluggable *pluggable,
+                                   const gchar *name,
+                                   const gchar *description);
 ZakConfiKey *zak_confi_pluggable_add_key (ZakConfiPluggable *pluggable,
                                    const gchar *parent,
                                    const gchar *key,

diff --git a/src/libzakconfi.h b/src/libzakconfi.h
index fb167e9565e5ee050a7224766eba4bc4cc8c79e8..0e7e97c82e0c956fef259793860bebe5a18d0cf8 100644 (file)
--- a/src/libzakconfi.h
+++ b/src/libzakconfi.h
@@ -58,7 +58,11 @@ ZakConfi *zak_confi_new (const gchar *cnc_string);
 PeasPluginInfo *zak_confi_get_plugin_info (ZakConfi *confi);
 
 GList *zak_confi_get_configs_list (const gchar *cnc_string,
-                               const gchar *filter);
+                                                                  const gchar *filter);
+
+ZakConfiConfi *zak_confi_add_config (const gchar *cnc_string,
+                                                                        const gchar *name,
+                                                                        const gchar *description);
 
 GNode *zak_confi_get_tree (ZakConfi *confi);
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0f2cbdc5c3aafc5b11482c9a6311c4dc13c17cdb..69ca77d7c34bdd65147f17eefb3d038d22eda3d7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,7 @@ LIBS = $(LIBCONFI_LIBS) \
 LDADD = $(top_builddir)/src/libzakconfi.la
 
 noinst_PROGRAMS = test \
+                  test_add_config \
                   test_get_configs_list
 
 EXTRA_DIST = gir.py

diff --git a/tests/test_add_config.c b/tests/test_add_config.c
new file mode 100644 (file)
index 0000000..1778064
--- /dev/null
+++ b/tests/test_add_config.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005-2016 Andrea Zagli <azagli@libero.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <glib/gprintf.h>
+#include <libpeas/peas.h>
+
+#include "libzakconfi.h"
+
+int
+main (int argc, char **argv)
+{
+       PeasEngine *engine;
+       PeasPluginInfo *ppinfo;
+
+       if (argc < 4)
+               {
+                       g_error ("Usage: test_add_config <connection string> <config name> <config description>");
+                       return 0;
+               }
+
+       engine = peas_engine_get_default ();
+       peas_engine_add_search_path (engine, "./plugins", NULL);
+
+       if (zak_confi_add_config (argv[1], argv[2], argv[3]) == NULL)
+               {
+                       g_warning ("Config %s not created.", argv[1]);
+               }
+
+       return 0;
+}