too zealous - ecore_config needs to come back

SVN revision: 26840

legacy/ecore/Makefile.am

@@ -23,6 +23,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN ecore.c.in gendoc ecore.supp ecore.m4
 	     debian/changelog.in \
 	     debian/control \
 	     debian/copyright \
+	     debian/ecore0-bin.install \
 	     debian/libecore0-con.install \
 	     debian/libecore0-config.install \
 	     debian/libecore0-dbus.install \

legacy/ecore/configure.in

@@ -1254,6 +1254,7 @@ AC_OUTPUT([
 Makefile
 ecore.pc
 src/Makefile
+src/bin/Makefile
 src/lib/Makefile
 src/lib/ecore/Makefile
 src/lib/ecore_job/Makefile

legacy/ecore/debian/control

@@ -189,3 +189,18 @@ Description: Ecore headers, static libraries and documentation
  applications.
  This package contains headers, static libraries and documentation for
  the Ecore library.
+
+Package: ecore0-bin
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libecore0-config (= ${Source-Version})
+Provides: ecore-bin
+Conflicts: ecore-test
+Description: Tools that support Ecore.
+ This is the core event abstraction layer and X abstraction layer that makes
+ doing selections, Xdnd, general X stuff, and event loops, timeouts and idle
+ handlers fast, optimized, and convenient. It's a separate library so anyone
+ can make use of the work put into Ecore to make this job easy for
+ applications.
+ This package includes:
+  - ecore_config: allows creation/editing of ecore_config databases

legacy/ecore/debian/ecore0-bin.install

@@ -0,0 +1 @@
+debian/tmp/usr/bin/ecore_config

legacy/ecore/ecore.spec.in

@@ -60,6 +60,14 @@ Requires: ecore-con, ecore-config, ecore-dbus, ecore-desktop, ecore-evas, ecore-
 %description devel
 Ecore development files
 
+%package bin
+Summary: Tools that support Ecore
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description bin
+Tools that support Ecore
+
 %package con
 Summary: Ecore Connection Library
 Group: Development/Libraries
@@ -193,6 +201,10 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 %{_includedir}/*.h
 
+%files bin
+%defattr(-, root, root)
+%{_bindir}/ecore_config
+
 %files con
 %defattr(-, root, root)
 %{_libdir}/libecore_con.so.*

legacy/ecore/src/Makefile.am

@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib
+SUBDIRS = lib bin

legacy/ecore/src/bin/.cvsignore

@@ -0,0 +1,10 @@
+.deps
+.libs
+Makefile
+Makefile.in
+ecore_config
+ecore_evas_test
+ecore_test
+ecore_dbus_test
+ecore_dbus_hal_test
+ecore_dbus_receiver_test

legacy/ecore/src/bin/Makefile.am

@@ -0,0 +1,30 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+if BUILD_ECORE_CONFIG
+ECORE_CONFIG_LIB = $(top_builddir)/src/lib/ecore_config/libecore_config.la
+else
+ECORE_CONFIG_LIB =
+endif
+
+INCLUDES = \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_config \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_config \
+@EET_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
+
+bin_PROGRAMS = \
+ecore_config
+
+ecore_config_SOURCES = \
+ecore_config.c
+
+ecore_config_LDADD = \
+$(ECORE_CONFIG_LIB)
+
+ecore_config_DEPENDENCIES = \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(ECORE_CONFIG_LIB)

legacy/ecore/src/bin/ecore_config.c

@@ -0,0 +1,336 @@
+#include "config.h"
+#include "Ecore.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef BUILD_ECORE_CONFIG
+#include <unistd.h>
+#include <getopt.h>
+#include <Eet.h>
+#include "Ecore_Config.h"
+#include "Ecore_Data.h"
+#include "ecore_config_private.h"
+
+// strcmp for paths - for sorting folders before files
+int
+pathcmp(const char *s1, const char *s2)
+{
+   char *s1d, *s2d;
+
+   // strip common part of paths
+   while(*s1 && *s2 && *s1 == *s2)
+     {
+	s1++;
+	s2++;
+     }
+
+   // handle /foo/bar/baz <> /foo/bar_baz properly
+   if (*s1 == '/' && *s2 != '/') return -1;
+   if (*s1 != '/' && *s2 == '/') return  1;
+
+   // skip leading /
+   if (*s1 == '/') s1++;
+   if (*s2 == '/') s2++;
+
+   // order folders before files
+   s1d = strchr(s1, '/');
+   s2d = strchr(s2, '/');
+   if (s1d != NULL && s2d == NULL) return -1;
+   if (s1d == NULL && s2d != NULL) return  1;
+
+   return strcmp(s1, s2);
+}
+
+int
+del(const char *key)
+{
+   Ecore_Config_Prop *e;
+   e = ecore_config_get(key);
+   if(e == NULL) return -1;
+
+   ecore_config_dst(e);
+   return 0;
+}
+
+int
+get(const char *key)
+{
+   Ecore_Config_Prop *e;
+   char *temp = NULL;
+
+   if (!(e = ecore_config_get(key)))
+     {
+	fprintf(stderr, "No such property\n");
+	return -1;
+     }
+     
+   printf("%-10s", ecore_config_type_get(e));
+
+   switch (e->type)
+     {
+	case ECORE_CONFIG_NIL:
+	   printf("\n");
+	   break;
+	case ECORE_CONFIG_INT:
+	   printf("%ld\n", ecore_config_int_get(key));
+	   break;
+	case ECORE_CONFIG_BLN:
+	   printf("%d\n",  ecore_config_boolean_get(key));
+	   break;
+	case ECORE_CONFIG_FLT:
+	   printf("%lf\n", ecore_config_float_get(key));
+	   break;
+	case ECORE_CONFIG_STR:
+	   temp = ecore_config_string_get(key);
+	   break;
+	case ECORE_CONFIG_RGB:
+	   temp = ecore_config_argbstr_get(key);
+	   break;
+	case ECORE_CONFIG_THM:
+	   temp = ecore_config_theme_get(key);
+	   break;
+	default:
+	   fprintf(stderr, "Property has unrecognized type");
+	   return -1;
+     }
+   if(temp)
+     {
+	printf("\"%s\"\n", temp);
+	free(temp);
+     }
+   return 0;
+}
+
+int
+list(const char *file)
+{
+   char *key;
+
+   Eet_File *ef;
+   Ecore_Config_Prop *e;
+   Ecore_Sheap *keys;
+
+   // Get number of keys and create heap for sort
+   ef = eet_open(file, EET_FILE_MODE_READ);
+   if (!ef) return -1;
+
+   keys = ecore_sheap_new(ECORE_COMPARE_CB(pathcmp), eet_num_entries(ef));
+
+   eet_close(ef);
+
+   e = __ecore_config_bundle_local->data;
+
+   do
+     {
+	// don't show system settings
+	if( !(e->flags & ECORE_CONFIG_FLAG_SYSTEM) )
+	   ecore_sheap_insert(keys, e->key);
+     }
+   while((e = e->next));
+
+   while((key = ecore_sheap_extract(keys)))
+     {
+	printf("%-28s\t", key);
+	get(key);
+     }
+
+   ecore_sheap_destroy(keys);
+
+   return 0;
+}
+
+void
+usage_and_exit(const char *prog, int ret, const char *msg)
+{
+   if (msg) fprintf(stderr, "%s\n\n", msg);
+   fprintf(stderr, "Usage: %s <options> <command>\n", prog);
+   fprintf(stderr, "Modify ecore_config files\n\n");
+   fprintf(stderr, "Options:\n");
+   fprintf(stderr, "  -c, --file=FILE config file\n");
+   fprintf(stderr, "  -k, --key=KEY   must be given for all commands except -a\n\n");
+   fprintf(stderr, "Commands:\n");
+   fprintf(stderr, "  -a, --list         get all keys\n");
+   fprintf(stderr, "  -g, --get          get key\n");
+   fprintf(stderr, "  -d, --del          delete key\n");
+   fprintf(stderr, "  -b, --bool=VALUE   set boolean\n");
+   fprintf(stderr, "  -f, --float=VALUE  set float\n");
+   fprintf(stderr, "  -i, --int=VALUE    set integer\n");
+   fprintf(stderr, "  -r, --rgb=VALUE    set RGBA\n");
+   fprintf(stderr, "  -s, --string=VALUE set string\n");
+   fprintf(stderr, "  -t, --theme=VALUE  set theme\n\n");
+   exit(ret);
+}
+
+int
+main(int argc, char * const argv[])
+{
+   char *prog, *file, *key;
+   void *value = (void *)NULL;
+   char cmd = 's';
+   int type = -1;
+   int ret = 0;
+   long i;
+   float f;
+   
+   file = key = prog = NULL;
+
+   prog = strdup(argv[0]);
+
+   if(argc < 4)
+     usage_and_exit(prog, 2, NULL);
+
+   while(1)
+     {
+	static struct option long_options[] = {
+	   {"file",   1, 0, 'c'},
+	   {"list",   0, 0, 'a'},
+	   {"get",    0, 0, 'g'},
+	   {"del",    0, 0, 'd'},
+	   {"bool",   1, 0, 'b'},
+	   {"float",  1, 0, 'f'},
+	   {"int",    1, 0, 'i'},
+	   {"rgb",    1, 0, 'r'},
+	   {"string", 1, 0, 's'},
+	   {"theme",  1, 0, 't'},
+	   {"key",    1, 0, 'k'},
+	   {0, 0, 0, 0}
+	};
+
+	ret = getopt_long(argc, argv, "c:agdb:f:i:r:s:t:k:", long_options, NULL);
+	if(ret == -1)
+	   break;
+
+	switch(ret)
+	   {
+	     case 'k':
+		key = strdup(optarg);
+		break;
+	     case 'n':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_NIL;
+		value = NULL;
+		break;
+	     case 'b':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_BLN;
+		i = atoi(optarg);
+		value = &i;
+		break;
+	     case 'i':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_INT;
+		i = atoi(optarg);
+		value = &i;
+		break;
+	     case 'f':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_FLT;
+		f = atof(optarg);
+		value = &f;
+		break;
+	     case 'r':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_RGB;
+		i = (long) strtoul( (*optarg == '#') ? (optarg + 1) : optarg, NULL, 16 );
+		value = &i;
+		break;
+	     case 's':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_STR;
+		value = strdup(optarg);
+		break;
+	     case 't':
+		if(value)
+		   usage_and_exit(prog, 2, "too many commands");
+		type = ECORE_CONFIG_THM;
+		value = strdup(optarg);
+		break;
+	     case 'c':
+		if(file)
+		   free(file);
+		file = strdup(optarg);
+		break;
+	     case '?':
+	     case ':':
+		return 1;
+	     default:
+		cmd = ret;
+		break;
+	   }
+     }
+
+   if(cmd == 's' && type == -1)
+     usage_and_exit(prog, 2, "You need to specify a command!");
+
+   if(cmd != 'a' && key == NULL)
+     usage_and_exit(prog, 2, "You need to specify key!");
+   
+   if(ecore_config_init("econfig") != ECORE_CONFIG_ERR_SUCC)
+     {
+	fprintf(stderr, "Couldn't init ecore_config!");
+	return 1;
+     }
+
+   // Load configuration from file
+   ecore_config_file_load(file);
+
+   ret = 0;
+
+   // Execute command
+   switch (cmd)
+     {
+	case 's':
+	   if (ecore_config_typed_set(key, value, type) != ECORE_CONFIG_ERR_SUCC)
+	     {
+		fprintf(stderr, "Set failed for %s", key);
+		ret = 1;
+	     } else {
+		ecore_config_file_save(file);
+	     }
+	     get(key); // display value after setting it
+	   break;
+	case 'd':
+	   if(del(key))
+	     {
+		fprintf(stderr, "Delete failed for %s", key);
+		ret = 1;
+	     } else {
+		ecore_config_file_save(file);
+	     }
+	   break;
+	case 'g':
+	   if (get(key)) ret = 1;
+	   break;
+	case 'a':
+	   if (list(file)) ret = 1;
+	   break;
+	default:
+	   printf("Unhandled command '%c'\n", cmd);
+     }
+
+   ecore_config_shutdown();
+
+   if(type == ECORE_CONFIG_STR || type == ECORE_CONFIG_THM)
+     free(value);
+
+   if(file)
+     free(file);
+
+   return ret;
+}
+#else
+int
+main(int argc, const char **argv)
+{
+   printf("Ecore_config module not compiled. This program is empty.\n");
+   return -1;
+}
+#endif