load the saved history by default to make things easier for the lua binding

[project/uci.git] / lua / uci.c

diff --git a/lua/uci.c b/lua/uci.c
index ca6f1ad..a73661d 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -36,17 +36,35 @@
 static struct uci_context *ctx = NULL;
 
 static struct uci_package *
-find_package(const char *name)
+find_package(lua_State *L, const char *name, bool autoload)
 {
        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 (autoload) {
+               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;
 }
 
@@ -107,7 +125,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, false);
        if (p) {
                uci_unload(ctx, p);
                lua_pushboolean(L, 1);
@@ -156,7 +174,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, true);
        if (!p)
                goto done;
 
@@ -211,7 +229,7 @@ uci_lua_get_any(lua_State *L, bool all)
                goto error;
        }
 
-       p = find_package(package);
+       p = find_package(L, package, true);
        if (!p) {
                err = UCI_ERR_NOTFOUND;
                goto error;
@@ -282,7 +300,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, true);
                if (!p)
                        break;
 
@@ -297,6 +315,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, true);
+       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 +410,7 @@ uci_lua_set(lua_State *L)
                goto error;
        }
 
-       p = find_package(package);
+       p = find_package(L, package, true);
        if (!p) {
                err = UCI_ERR_NOTFOUND;
                goto error;
@@ -392,6 +461,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");
@@ -474,6 +545,7 @@ 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 },
        { "foreach", uci_lua_foreach },
@@ -490,5 +562,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;
 }