X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=lua%2Fuci.c;h=e3a133491930192973673e07a35789e910b698f0;hb=1879c8f32327177f5c0ca02c9bf9923c55d9b8b0;hp=ca6f1ad8e98b3ce8985b347d535815da41b61389;hpb=e080da8799d1e7aa57a4fc44574361f3e9dbd822;p=project%2Fuci.git

diff --git a/lua/uci.c b/lua/uci.c
index ca6f1ad..e3a1334 100644
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -34,19 +34,44 @@
 #endif
 
 static struct uci_context *ctx = NULL;
+enum autoload {
+	AUTOLOAD_OFF = 0,
+	AUTOLOAD_ON = 1,
+	AUTOLOAD_FORCE = 2
+};
 
 static struct uci_package *
-find_package(const char *name)
+find_package(lua_State *L, const char *name, enum autoload al)
 {
 	struct uci_package *p = NULL;
 	struct uci_element *e;
+
 	uci_foreach_element(&ctx->root, e) {
 		if (strcmp(e->name, name) != 0)
 			continue;
 
 		p = uci_to_package(e);
-		break;
+		goto done;
 	}
+
+	if (al == AUTOLOAD_FORCE)
+		uci_load(ctx, name, &p);
+	else if (al) {
+		do {
+			lua_getfield(L, LUA_GLOBALSINDEX, "uci");
+			lua_getfield(L, -1, "autoload");
+			if (!lua_isboolean(L, -1))
+				break;
+
+			if (!lua_toboolean(L, -1))
+				break;
+
+			uci_load(ctx, name, &p);
+		} while (0);
+		lua_pop(L, 2);
+	}
+
+done:
 	return p;
 }
 
@@ -69,20 +94,15 @@ static void uci_push_section(lua_State *L, struct uci_section *s)
 
 	lua_newtable(L);
 	lua_pushstring(L, s->type);
-	lua_setfield(L, -2, "type");
+	lua_setfield(L, -2, ".type");
 	lua_pushstring(L, s->e.name);
-	lua_setfield(L, -2, "name");
-
-	lua_newtable(L);
-	lua_pushvalue(L, -1);
-	lua_setfield(L, -3, "options");
+	lua_setfield(L, -2, ".name");
 
 	uci_foreach_element(&s->options, e) {
 		struct uci_option *o = uci_to_option(e);
 		lua_pushstring(L, o->value);
 		lua_setfield(L, -2, o->e.name);
 	}
-	lua_pop(L, 1);
 }
 
 static void uci_push_package(lua_State *L, struct uci_package *p)
@@ -93,9 +113,8 @@ static void uci_push_package(lua_State *L, struct uci_package *p)
 	lua_newtable(L);
 	uci_foreach_element(&p->sections, e) {
 		i++;
-		luaL_setn(L, -1, i);
 		uci_push_section(L, uci_to_section(e));
-		lua_rawseti(L, -2, i);
+		lua_setfield(L, -2, e->name);
 	}
 }
 
@@ -107,7 +126,7 @@ uci_lua_unload(lua_State *L)
 
 	luaL_checkstring(L, 1);
 	s = lua_tostring(L, -1);
-	p = find_package(s);
+	p = find_package(L, s, AUTOLOAD_OFF);
 	if (p) {
 		uci_unload(ctx, p);
 		lua_pushboolean(L, 1);
@@ -156,7 +175,7 @@ uci_lua_foreach(lua_State *L)
 	if (!lua_isfunction(L, 3) || !package)
 		luaL_error(L, "Invalid argument");
 
-	p = find_package(package);
+	p = find_package(L, package, AUTOLOAD_ON);
 	if (!p)
 		goto done;
 
@@ -211,7 +230,7 @@ uci_lua_get_any(lua_State *L, bool all)
 		goto error;
 	}
 
-	p = find_package(package);
+	p = find_package(L, package, AUTOLOAD_ON);
 	if (!p) {
 		err = UCI_ERR_NOTFOUND;
 		goto error;
@@ -282,7 +301,7 @@ uci_lua_add(lua_State *L)
 	do {
 		package = luaL_checkstring(L, 1);
 		type = luaL_checkstring(L, 2);
-		p = find_package(package);
+		p = find_package(L, package, AUTOLOAD_ON);
 		if (!p)
 			break;
 
@@ -297,6 +316,57 @@ uci_lua_add(lua_State *L)
 }
 
 static int
+uci_lua_delete(lua_State *L)
+{
+	const char *package = NULL;
+	const char *section = NULL;
+	const char *option = NULL;
+	struct uci_package *p;
+	const char *s;
+	int err = UCI_ERR_MEM;
+	int nargs;
+
+	nargs = lua_gettop(L);
+	s = luaL_checkstring(L, 1);
+	switch(nargs) {
+	case 1:
+		/* Format: uci.delete("p.s[.o]") */
+		s = strdup(s);
+		if (!s)
+			goto error;
+
+		if ((err = uci_parse_tuple(ctx, (char *) s, (char **) &package, (char **) &section, (char **) &option, NULL)))
+			goto error;
+		break;
+	case 3:
+		/* Format: uci.delete("p", "s", "o") */
+		option = luaL_checkstring(L, 3);
+		/* fall through */
+	case 2:
+		/* Format: uci.delete("p", "s") */
+		section = luaL_checkstring(L, 2);
+		package = s;
+		break;
+	default:
+		err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	p = find_package(L, package, AUTOLOAD_ON);
+	if (!p) {
+		err = UCI_ERR_NOTFOUND;
+		goto error;
+	}
+	err = uci_delete(ctx, p, section, option);
+
+error:
+	if (err)
+		uci_lua_perror(L, "uci.set");
+	lua_pushboolean(L, (err == 0));
+	return 1;
+}
+
+static int
 uci_lua_set(lua_State *L)
 {
 	struct uci_package *p;
@@ -341,7 +411,7 @@ uci_lua_set(lua_State *L)
 		goto error;
 	}
 
-	p = find_package(package);
+	p = find_package(L, package, AUTOLOAD_ON);
 	if (!p) {
 		err = UCI_ERR_NOTFOUND;
 		goto error;
@@ -392,6 +462,8 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
 		s = lua_tostring(L, -1);
 		lua_pop(L, 1);
 		break;
+	case 0:
+		break;
 	default:
 		err:
 		luaL_error(L, "Invalid argument count");
@@ -443,6 +515,99 @@ uci_lua_revert(lua_State *L)
 	return uci_lua_package_cmd(L, CMD_REVERT);
 }
 
+static void
+uci_lua_add_change(lua_State *L, struct uci_element *e)
+{
+	struct uci_history *h;
+	const char *name;
+
+	h = uci_to_history(e);
+	if (!h->section)
+		return;
+
+	lua_getfield(L, -1, h->section);
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 1);
+		lua_newtable(L);
+		lua_pushvalue(L, -1); /* copy for setfield */
+		lua_setfield(L, -3, h->section);
+	}
+
+	name = (h->e.name ? h->e.name : ".type");
+	if (h->value)
+		lua_pushstring(L, h->value);
+	else
+		lua_pushstring(L, "");
+	lua_setfield(L, -2, name);
+	lua_pop(L, 1);
+}
+
+static void
+uci_lua_changes_pkg(lua_State *L, const char *package)
+{
+	struct uci_package *p = NULL;
+	struct uci_element *e;
+	bool autoload = false;
+
+	p = find_package(L, package, AUTOLOAD_OFF);
+	if (!p) {
+		autoload = true;
+		p = find_package(L, package, AUTOLOAD_FORCE);
+		if (!p)
+			return;
+	}
+
+	if (uci_list_empty(&p->history) && uci_list_empty(&p->saved_history))
+		goto done;
+
+	lua_newtable(L);
+	uci_foreach_element(&p->saved_history, e) {
+		uci_lua_add_change(L, e);
+	}
+	uci_foreach_element(&p->history, e) {
+		uci_lua_add_change(L, e);
+	}
+	lua_setfield(L, -2, p->e.name);
+
+done:
+	if (autoload)
+		uci_unload(ctx, p);
+}
+
+static int
+uci_lua_changes(lua_State *L)
+{
+	const char *package = NULL;
+	char **config = NULL;
+	int nargs;
+	int i;
+
+	nargs = lua_gettop(L);
+	switch(nargs) {
+	case 1:
+		package = luaL_checkstring(L, 1);
+	case 0:
+		break;
+	default:
+		luaL_error(L, "invalid argument count");
+	}
+
+	lua_newtable(L);
+	if (package) {
+		uci_lua_changes_pkg(L, package);
+	} else {
+		if (uci_list_configs(ctx, &config) != 0)
+			goto done;
+
+		for(i = 0; config[i] != NULL; i++) {
+			uci_lua_changes_pkg(L, config[i]);
+		}
+	}
+
+done:
+	return 1;
+}
+
 static int
 uci_lua_set_confdir(lua_State *L)
 {
@@ -474,8 +639,10 @@ static const luaL_Reg uci[] = {
 	{ "add", uci_lua_add },
 	{ "set", uci_lua_set },
 	{ "save", uci_lua_save },
+	{ "delete", uci_lua_delete },
 	{ "commit", uci_lua_commit },
 	{ "revert", uci_lua_revert },
+	{ "changes", uci_lua_changes },
 	{ "foreach", uci_lua_foreach },
 	{ "set_confdir", uci_lua_set_confdir },
 	{ "set_savedir", uci_lua_set_savedir },
@@ -490,5 +657,12 @@ luaopen_uci(lua_State *L)
 	if (!ctx)
 		luaL_error(L, "Cannot allocate UCI context\n");
 	luaL_register(L, MODNAME, uci);
+
+	/* enable autoload by default */
+	lua_getfield(L, LUA_GLOBALSINDEX, "uci");
+	lua_pushboolean(L, 1);
+	lua_setfield(L, -2, "autoload");
+	lua_pop(L, 1);
+
 	return 0;
 }