From a23c315905c126667f13091989ca2879b5337582 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Sun, 4 Aug 2024 17:19:08 -0400 Subject: Hello lua --- src/read_cfg.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index f757d6b..fa8a424 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -1,4 +1,6 @@ #include +#include +#include #include #include #include @@ -43,12 +45,31 @@ bool cfg_interp(char *path){ int i=0; int j; + // check if file path exists fp = fopen(path, "r"); if(fp == NULL){ printf("Error: Invalid Configuration Path \"%s\"\n", path); return false; } + fclose(fp); + + // load lua configuration + lua_State *L = luaL_newstate(); + int config_load_status = luaL_dofile(L, path); + if(config_load_status != 0) { + printf("Error: could not load configuration \"%s\"\nis there a syntax error?\n", path); + return false; + } + + // demo + lua_getglobal(L, "Message"); + const char *message = lua_tostring(L, -1); + printf("message: %s\n", message); + + lua_close(L); + return true; + /* --- Old code --- */ //build the options array char **options = malloc(sizeof(char *) * OPTION_CNT); options[0] = "add"; -- cgit From a18a8b783d71859e01c550b0acf6e0cefbef0d9f Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Wed, 7 Aug 2024 22:34:44 -0400 Subject: Working demo for loading groups and entries from lua config --- src/read_cfg.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index fa8a424..940630b 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -55,16 +55,51 @@ bool cfg_interp(char *path){ // load lua configuration lua_State *L = luaL_newstate(); - int config_load_status = luaL_dofile(L, path); + int config_load_status = luaL_loadfile(L, path); if(config_load_status != 0) { printf("Error: could not load configuration \"%s\"\nis there a syntax error?\n", path); return false; } + // set up base configuration variables + // TODO set helper variables and functions (e.g., so that Groups table doesn't need to be manually created in the user's config) + //lua_newtable(L); + //lua_setglobal(L, "Groups"); + lua_pcall(L, 0, 0, 0); + // demo - lua_getglobal(L, "Message"); - const char *message = lua_tostring(L, -1); - printf("message: %s\n", message); + lua_getglobal(L, "Groups"); + i = lua_gettop(L); + // add each group + const char *group_name; + lua_pushnil(L); + while(lua_next(L, i)) { + // the key is index -2, value is -1 + if(lua_type(L, -2) != LUA_TSTRING) continue; // skip if invalid key + group_name = lua_tostring(L, -2); + group_add(group_name, NULL); + // add each entry + if(lua_type(L, -1) != LUA_TTABLE) continue; // skip if invalid value + lua_pushstring(L, "Entries"); + lua_gettable(L, -2); + j = lua_gettop(L); + lua_pushnil(L); + while(lua_next(L, j)) { + if(lua_type(L, -1) != LUA_TSTRING) continue; // skip if invalid value + handle_fname(lua_tostring(L, -1), group_name, false, true, NULL, -1); + lua_pop(L, 1); + } + lua_pop(L, 2); + } + + //lua_getfield(L, -1, "Pictures"); + //lua_getfield(L, -1, "Entries"); + //lua_rawgeti(L, -1, 1); + //printf("message: %d\n", (int)lua_tonumber(L, -1)); + //lua_rawgeti(L, -2, 2); + //printf("message: %d\n", (int)lua_tonumber(L, -1)); + //lua_rawgeti(L, -3, 3); + //printf("message: %d\n", (int)lua_tonumber(L, -1)); lua_close(L); return true; @@ -89,6 +124,7 @@ bool cfg_interp(char *path){ //Read each line of "config" while(fgets(buffer, BUF_LEN, fp)){ + printf("%d\n", i); i++; check_line(buffer, options, i); } -- cgit From 9e999c82f830f48ebabc72338ef721154acd116a Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Wed, 7 Aug 2024 22:59:45 -0400 Subject: Small improvement towards setting launchers, but the current group class makes this a headache --- src/read_cfg.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index 940630b..549393b 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -78,8 +78,16 @@ bool cfg_interp(char *path){ if(lua_type(L, -2) != LUA_TSTRING) continue; // skip if invalid key group_name = lua_tostring(L, -2); group_add(group_name, NULL); - // add each entry + // check for a launcher if(lua_type(L, -1) != LUA_TTABLE) continue; // skip if invalid value + lua_pushstring(L, "Launcher"); + lua_gettable(L, -2); + if(lua_type(L, -1) == LUA_TSTRING) { + // FIXME the groups '''API''' I built might need some improvements in order for this to not be a headache + //set_gprog(GROUP *g, lua_tostring(L, -1)) + } + lua_pop(L, 1); + // add each entry lua_pushstring(L, "Entries"); lua_gettable(L, -2); j = lua_gettop(L); -- cgit From 85596300cc45d73bd3335d8c802b7c590fb1e1d2 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Thu, 8 Aug 2024 21:24:54 -0400 Subject: Allow standard library in config --- src/read_cfg.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index 549393b..a931a11 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -55,9 +56,11 @@ bool cfg_interp(char *path){ // load lua configuration lua_State *L = luaL_newstate(); - int config_load_status = luaL_loadfile(L, path); + luaL_openlibs(L); // allow for standard library to be used + int config_load_status = luaL_dofile(L, path); if(config_load_status != 0) { - printf("Error: could not load configuration \"%s\"\nis there a syntax error?\n", path); + printf("Error: could not load configuration \"%s\"\n", path); + lua_error(L); return false; } @@ -65,11 +68,15 @@ bool cfg_interp(char *path){ // TODO set helper variables and functions (e.g., so that Groups table doesn't need to be manually created in the user's config) //lua_newtable(L); //lua_setglobal(L, "Groups"); - lua_pcall(L, 0, 0, 0); + //lua_pcall(L, 0, 0, 0); // demo lua_getglobal(L, "Groups"); i = lua_gettop(L); + if(lua_type(L, i) != LUA_TTABLE) { + printf("Error in config: 'Groups' should be Table, is actually %s\n", lua_typename(L, lua_type(L, i))); + return 1; + } // add each group const char *group_name; lua_pushnil(L); -- cgit From 4e68f637300c0e360d49f8f672d0675d42da0d1f Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Sun, 11 Aug 2024 17:49:28 -0400 Subject: (Currently broken) reimplementation of group and entry --- src/read_cfg.c | 551 +++++++-------------------------------------------------- 1 file changed, 68 insertions(+), 483 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index a931a11..b9ac8bc 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -22,9 +22,11 @@ #define OPTION_CNT 14 //private -void check_line(char *buffer, char **options, int ln); -int check_option(char *arg, char **options); -char *autoAlias(char *path); +//void check_line(char *buffer, char **options, int ln); +//int check_option(char *arg, char **options); +int key_count(lua_State *L, int table_stack_index); // counts the number of keys in a table +void add_groups(lua_State *L, int table_stack_index, GROUP ***g); +void add_entries(lua_State *L, int table_stack_index, GROUP *g); //turn on or off sorting (A-Z); On by default bool sort = true; @@ -36,21 +38,20 @@ bool hr = false; bool fold_case = true; //return false if invalid path -bool cfg_interp(char *path){ +GROUP **cfg_interp(char *path, int *group_count){ FILE *fp; char buffer[BUF_LEN]; GROUP **g; - ENTRY **e; - int count; - int e_count; - int i=0; + const char *group_name; + //ENTRY **e; + int i; int j; // check if file path exists fp = fopen(path, "r"); if(fp == NULL){ printf("Error: Invalid Configuration Path \"%s\"\n", path); - return false; + return NULL; } fclose(fp); @@ -61,7 +62,7 @@ bool cfg_interp(char *path){ if(config_load_status != 0) { printf("Error: could not load configuration \"%s\"\n", path); lua_error(L); - return false; + exit(1); } // set up base configuration variables @@ -75,95 +76,17 @@ bool cfg_interp(char *path){ i = lua_gettop(L); if(lua_type(L, i) != LUA_TTABLE) { printf("Error in config: 'Groups' should be Table, is actually %s\n", lua_typename(L, lua_type(L, i))); - return 1; - } - // add each group - const char *group_name; - lua_pushnil(L); - while(lua_next(L, i)) { - // the key is index -2, value is -1 - if(lua_type(L, -2) != LUA_TSTRING) continue; // skip if invalid key - group_name = lua_tostring(L, -2); - group_add(group_name, NULL); - // check for a launcher - if(lua_type(L, -1) != LUA_TTABLE) continue; // skip if invalid value - lua_pushstring(L, "Launcher"); - lua_gettable(L, -2); - if(lua_type(L, -1) == LUA_TSTRING) { - // FIXME the groups '''API''' I built might need some improvements in order for this to not be a headache - //set_gprog(GROUP *g, lua_tostring(L, -1)) - } - lua_pop(L, 1); - // add each entry - lua_pushstring(L, "Entries"); - lua_gettable(L, -2); - j = lua_gettop(L); - lua_pushnil(L); - while(lua_next(L, j)) { - if(lua_type(L, -1) != LUA_TSTRING) continue; // skip if invalid value - handle_fname(lua_tostring(L, -1), group_name, false, true, NULL, -1); - lua_pop(L, 1); - } - lua_pop(L, 2); + exit(1); } - //lua_getfield(L, -1, "Pictures"); - //lua_getfield(L, -1, "Entries"); - //lua_rawgeti(L, -1, 1); - //printf("message: %d\n", (int)lua_tonumber(L, -1)); - //lua_rawgeti(L, -2, 2); - //printf("message: %d\n", (int)lua_tonumber(L, -1)); - //lua_rawgeti(L, -3, 3); - //printf("message: %d\n", (int)lua_tonumber(L, -1)); + // create the group array + *group_count = key_count(L, i); + g = malloc(sizeof(GROUP *) * (*group_count)); + // add each group (which also adds each entry to each group) + add_groups(L, i, &g); lua_close(L); - return true; - - /* --- Old code --- */ - //build the options array - char **options = malloc(sizeof(char *) * OPTION_CNT); - options[0] = "add"; - options[1] = "addF"; - options[2] = "addGroup"; - options[3] = "addName"; - options[4] = "addNameF"; - options[5] = "addR"; - options[6] = "autoAlias"; - options[7] = "foldCase"; - options[8] = "hide"; - options[9] = "hideFile"; - options[10] = "setFlags"; - options[11] = "setLauncher"; - options[12] = "setLauncherRaw"; - options[13] = "sort"; - - //Read each line of "config" - while(fgets(buffer, BUF_LEN, fp)){ - printf("%d\n", i); - i++; - check_line(buffer, options, i); - } - - //cleanup - free(options); - - /* - //DEBUG: test to see if the list was added to properly - g = get_groups(); - count = get_gcount(); - for(i = 0; i < count; i++){ - printf("Looking at group %s\n", get_gname(g[i])); - e_count = get_ecount(g[i]); - e = get_entries(get_ghead(g[i]), e_count); - for(j = 0; j < e_count; j++){ - printf("\t%s\n", get_ename(e[j])); - } - } - //END DEBUG - */ - - fclose(fp); - return true; + return g; } bool get_sort(){ @@ -179,409 +102,71 @@ void refer_to_doc(){ return; } -void addme(char *path, char *group, bool force, char *name){ - ENTRY *new; - char auto_name[BUF_LEN]; - - //check if a name was given as argument - if(name != NULL){ - //strip quotes from the name - name = strip_quotes(name); - new = create_entry(name, path, force); - } - - //check if autoAlias is on. If it is, go to the autoAlias function - else if(hr){ - strcpy(auto_name, autoAlias(path)); - new = create_entry(auto_name, path, force); - } - - else new = create_entry(path, path, force); - if(new != NULL) group_add(group, new); - - return; -} - -int search_ch(char *str, char c){ - int i = 0; - - while(str[i] != '\0'){ - if(str[i] == c) return i; - i++; - } - - return -1; -} - -int search_last_ch(char *str, char c){ - int i = 0; - int last_i = -1; +int key_count(lua_State *L, int table_stack_index) { + int output = 0; - while(str[i] != '\0'){ - if(str[i] == c) last_i = i; - i++; + lua_pushnil(L); + while(lua_next(L, table_stack_index)) { + // uses 'key' (at index -2) and 'value' (at index -1) + if(lua_type(L, -2) == LUA_TSTRING) ++output; + lua_pop(L, 1); } - return last_i; + return output; } -//return 0 if match, 1 if not -//TODO only supports one wildcard per entry -int wild_cmp(char *wild, char *literal){ +void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { + const char *group_name; + int entry_table_stack_index; int i; - - while(*wild != '\0'){ - //traverse until wildcard - if(*wild != '*'){ - if(*wild != *literal) return 1; - wild++; - literal++; - } - - //found wildcard, find the end of both names and comapre from the back - else{ - i = 0; - wild++; - while(*wild != '\0'){ - i++; - wild++; - } - while(*literal != '\0'){ - literal++; - } - - while(i > 0){ - wild--; - literal--; - if(*wild != *literal) return 1; - i--; - } - - return 0; - } - } - - return 0; -} - - -char *strip_quotes(char *str){ - char *stripped_str = malloc(sizeof(char) * BUF_LEN); - - if(str[0] == '"'){ - stripped_str = &str[1]; - stripped_str[strlen(stripped_str) - 1] = '\0'; - return stripped_str; - } - - return str; -} - -void error_mes(int ln, char *message){ - - assert(message != NULL); - - printf("Configuration File Error:\nOn line %d: %s\n\n", ln, message); - - return; -} - -//TODO add support for "addR" recursive adding (still needs work...) -//TODO add support for "alias" option -//TODO add support for "hide" option -void check_line(char *buffer, char **options, int ln){ - char *delims = " \t\n"; - char *tok = strtok(buffer, delims); - char args[MAX_ARGS][BUF_LEN]; - GROUP **g; - ENTRY **e; - char *tok_p; - char *arg_p; - int g_count; - int e_count; - int search_res; - int i, j; - char *error_p; //helper for complex error messages - - //ensure line is not blank or commented out - if(tok != NULL && tok[0] != '#' && tok[0] != '\0'){ - //initialize args to 0 - for(i = 0; i < MAX_ARGS; i++){ - args[i][0] = '\0'; - } - - i = 0; - //record all arguments in the line - while(tok != NULL){ - if(i >= MAX_ARGS){ - error_mes(ln, "Too many arguments"); - return; - } - strcpy(args[i], tok); - //handle if an argument has spaces and is wrapped in quotes - if(tok[0] == '"'){ - arg_p = &args[i][0]; - tok_p = &tok[1]; - - while(*tok_p != '"'){ - switch(*tok_p){ - - - case '\0': - tok = strtok(NULL, delims); - tok_p = &tok[0]; - *arg_p = ' '; - arg_p++; - break; - case '\\': - tok_p++; - - default: - *arg_p = *tok_p; - tok_p++; - arg_p++; - - } + lua_pushnil(L); + i = 0; + while(lua_next(L, table_stack_index)) { + // uses 'key' (at index -2) and 'value' (at index -1) + // looking at Groups.TABLE_NAME + if(lua_type(L, -2) == LUA_TSTRING && lua_type(L, -1) == LUA_TTABLE) { + group_name = lua_tostring(L, -2); + if(group_name != NULL) { + // push the Entries table on the stack (to get entry information) + lua_pushstring(L, "Entries"); + // get table Groups.TABLE_NAME.Entries + lua_gettable(L, -2); + entry_table_stack_index = lua_gettop(L); + // check that 'Entries' is a table + if(lua_type(L, entry_table_stack_index) != LUA_TTABLE) { + printf("Error in config: 'Entries' should be Table, is actually %s\n", lua_typename(L, lua_type(L, entry_table_stack_index))); + exit(1); } - - *arg_p = '\0'; - + (*g)[i] = create_group(group_name, key_count(L, entry_table_stack_index)); + // add entries to this group + add_entries(L, entry_table_stack_index, (*g)[i]); } - - tok = strtok(NULL, delims); - i++; - } - - //optimally check which option was specified - search_res = check_option(args[0], options); - - switch(search_res){ - - case 0: //add - //add entry(ies) to a group: first arg is the file(s), second arg is the group to add to - //TODO add sorting functionality - handle_fname(args[1], args[2], 0, 0, NULL, ln); - break; - - case 1: //addF - //force add entry to a group: first arg is the file(s), second arg is the group to add to - handle_fname(args[1], args[2], 0, 1, NULL, ln); - break; - - case 2: //addGroup - //create a new group - group_add(strip_quotes(args[1]), NULL); - break; - - case 3: //addName - //add entry to a group: first arg is the name, second arg is the file, and third arg is the group to add to - handle_fname(args[2], args[3], 0, 0, args[1], ln); - break; - - case 4: //addNameF - //same as addName, but with force on - handle_fname(args[2], args[3], 0, 1, args[1], ln); - break; - - case 5: //addR - //recursively add: that is, also search directories in the given path - //NOTE: experimental - handle_fname(args[1], args[2], 1, 0, NULL, ln); - break; - - case 6: //autoAlias - if(!(strcmp(args[1], "on"))) hr = true; - else if(!(strcmp(args[1], "off"))) hr = false; - break; - - case 7: //foldCase (case insensitive) - if(!(strcmp(args[1], "on"))) fold_case = true; - else if(!(strcmp(args[1], "off"))) fold_case = false; - break; - - //TODO consider having this call handle_fname instead so that '*' can be used - case 8: //hide - case 9: //hideFile - //args[2] is referring to a group - g = get_groups(); - g_count = get_gcount(); - - //look for matching existing group - for(i = 0; i < g_count; i++){ - if(!(strcmp(get_gname(g[i]), args[2]))) break; - } - - if(i < g_count){ - e_count = get_ecount(g[i]); - e = get_entries(get_ghead(g[i]), e_count); - - for(j = 0; j < e_count; j++){ - if(!strcmp((search_res == 8 ? get_ename(e[j]) : get_epath(e[j])), strip_quotes(args[1]))) break; - } - - if(j < e_count){ - set_hide(e[j], true); - set_ecount(g[i], get_ecount(g[i])-1); - } - else{ - error_p = malloc(sizeof(char) * 1024); - sprintf(error_p, "Entry \"%s\" does not exist", args[1]); - error_mes(ln, error_p); - free(error_p); - } - } - - else{ - error_p = malloc(sizeof(char) * 1024); - sprintf(error_p, "Group \"%s\" does not exist", args[2]); - error_mes(ln, error_p); - free(error_p); - } - break; - - case 10: //setFlags - //args[1] is referring to a group - g = get_groups(); - g_count = get_gcount(); - - //look for matching existing group - for(i = 0; i < g_count; i++){ - if(!(strcmp(get_gname(g[i]), args[1]))) break; - } - - //set a group's launcher flags (like ./program -f file for fullscreen) - //assert that a matching group was found - if(i < g_count) set_gflags(g[i], strip_quotes(args[2])); - else{ - error_p = malloc(sizeof(char) * 1024); - sprintf(error_p, "Group \"%s\" does not exist", args[1]); - error_mes(ln, error_p); - free(error_p); - } - break; - - case 11: //setLauncher - case 12: //setLauncherRaw - //args[1] is referring to a group - g = get_groups(); - g_count = get_gcount(); - - //look for matching existing group - for(i = 0; i < g_count; i++){ - if(!(strcmp(get_gname(g[i]), args[1]))) break; - } - - //set a group's launcher (this requires pulling down the existing groups and finding the one that args[1] mentions) - //assert that a matching group was found - if(i < g_count){ - set_gprog(g[i], strip_quotes(args[2])); - if(search_res == 12) set_gquotes(g[i], false); //FIXME don't forget to change this line if adding more options!!! - } - else{ - error_p = malloc(sizeof(char) * 1024); - sprintf(error_p, "Group \"%s\" does not exist", args[1]); - error_mes(ln, error_p); - free(error_p); - } - break; - - case 13: //sort - if(!(strcmp(args[1], "on"))) sort = true; - else if(!(strcmp(args[1], "off"))) sort = false; - break; - - default: - error_p = malloc(sizeof(char) * 1024); - sprintf(error_p, "Unknown config option \"%s\"", args[0]); - error_mes(ln, error_p); - free(error_p); - } - - } - - return; -} - -int check_option(char *arg, char **options){ - int min = 0; - int max = OPTION_CNT-1; - int hover; - int comp_res; - - while(max - min > 1){ - hover = min + (max-min)/2; - comp_res = strcmp(arg, options[hover]); - - if(comp_res > 0) min = hover; - else if(comp_res < 0) max = hover; - else return hover; + lua_pop(L, 1); + ++i; } - - if(max == OPTION_CNT-1 && strcmp(arg, options[max]) == 0) return max; - else if(min == 0 && strcmp(arg, options[min]) == 0) return min; - - return -1; } +void add_entries(lua_State *L, int table_stack_index, GROUP *g) { + const char *entry_name; + int i; -char *autoAlias(char *path){ - char *hr_name = malloc(sizeof(char) * BUF_LEN); - char *p = hr_name; - char *rpath; //necessary so as not to touch the actual path - char *last_dot = NULL; //used to trim the file extension (if there is one) - bool stop = false; //stop when you don't want to add a series of chars to the output - - //get to the relative path name - rpath = strrchr(path, sep); - if(rpath == NULL) rpath = path; - else rpath++; - - while(*rpath != '\0'){ - switch(*rpath){ - case '(': - stop = true; - break; - - case ')': - stop = false; - break; - - case '-': - case '_': - if(*(p-1) != ' ' && !stop){ - *p = ' '; - *p++; - } - break; - - case ' ': - if(*(p-1) != ' ' && !stop){ - *p = *rpath; - *p++; - } - break; - - case '.': - last_dot = p; - - default: - if(!stop){ - *p = *rpath; - *p++; - } + lua_pushnil(L); + i = 0; + while(lua_next(L, table_stack_index)) { + // uses 'key' (at index -2) and 'value' (at index -1) + // looking at Groups.TABLE_NAME.Entries[i] + if(lua_type(L, -1) == LUA_TSTRING) { + entry_name = lua_tostring(L, -1); + if(entry_name != NULL) { + set_gentry(g, i, create_entry(entry_name, entry_name, true)); + } } - *rpath++; + lua_pop(L, 1); + ++i; } - - //close the name - if(last_dot != NULL) *last_dot = '\0'; - else if(*path == '"') *(p-1) = '\0'; //close early to avoid including closing quote - else *p = '\0'; - return hr_name; + // one last pop to pop the key off + lua_pop(L, 1); } - - - -- cgit From b5dd0df1808429a3c0ed1f86256962512b8273f5 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Tue, 13 Aug 2024 21:06:03 -0400 Subject: Working implementation for lua config --- src/read_cfg.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 11 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index b9ac8bc..97a76ff 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -24,9 +24,11 @@ //private //void check_line(char *buffer, char **options, int ln); //int check_option(char *arg, char **options); -int key_count(lua_State *L, int table_stack_index); // counts the number of keys in a table +int get_group_count(lua_State *L, int table_stack_index); // counts the number of valid groups +int get_entry_count(lua_State *L, int table_stack_index); // counts the number of valid entries for a group void add_groups(lua_State *L, int table_stack_index, GROUP ***g); void add_entries(lua_State *L, int table_stack_index, GROUP *g); +void stack_debug(lua_State *L); //turn on or off sorting (A-Z); On by default bool sort = true; @@ -80,7 +82,7 @@ GROUP **cfg_interp(char *path, int *group_count){ } // create the group array - *group_count = key_count(L, i); + *group_count = get_group_count(L, i); g = malloc(sizeof(GROUP *) * (*group_count)); // add each group (which also adds each entry to each group) @@ -102,22 +104,51 @@ void refer_to_doc(){ return; } -int key_count(lua_State *L, int table_stack_index) { +int get_group_count(lua_State *L, int table_stack_index) { int output = 0; + int entry_table_stack_index; + const char *group_name; lua_pushnil(L); while(lua_next(L, table_stack_index)) { // uses 'key' (at index -2) and 'value' (at index -1) - if(lua_type(L, -2) == LUA_TSTRING) ++output; - lua_pop(L, 1); + if(lua_type(L, -2) == LUA_TSTRING && lua_type(L, -1) == LUA_TTABLE) { + // check validity of this group + group_name = lua_tostring(L, -2); + if(group_name != NULL) { + // check that the Entries table for this group is not empty + lua_pushstring(L, "Entries"); + lua_gettable(L, -2); + entry_table_stack_index = lua_gettop(L); + if(lua_type(L, entry_table_stack_index) == LUA_TTABLE + && get_entry_count(L, entry_table_stack_index) > 0) + ++output; + } + } + // pop the top of the stack down to the key of the group + lua_pop(L, lua_gettop(L)-table_stack_index-1); } return output; } +int get_entry_count(lua_State *L, int table_stack_index) { + int i = 1; + int output = 0; + + do { + lua_rawgeti(L, table_stack_index, i); + if(lua_type(L, -1) == LUA_TSTRING) ++output; + ++i; + } while(lua_type(L, -1) != LUA_TNIL); + + return output; +} + void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { const char *group_name; int entry_table_stack_index; + int entry_count; int i; lua_pushnil(L); @@ -130,20 +161,31 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { if(group_name != NULL) { // push the Entries table on the stack (to get entry information) lua_pushstring(L, "Entries"); + // get table Groups.TABLE_NAME.Entries lua_gettable(L, -2); entry_table_stack_index = lua_gettop(L); + // check that 'Entries' is a table if(lua_type(L, entry_table_stack_index) != LUA_TTABLE) { printf("Error in config: 'Entries' should be Table, is actually %s\n", lua_typename(L, lua_type(L, entry_table_stack_index))); exit(1); } - (*g)[i] = create_group(group_name, key_count(L, entry_table_stack_index)); - // add entries to this group - add_entries(L, entry_table_stack_index, (*g)[i]); + + entry_count = get_entry_count(L, entry_table_stack_index); + // check that the group has at least 1 entry + if(entry_count <= 0) + printf("Skipping empty group '%s'\n", group_name); + + else { + (*g)[i] = create_group(group_name, entry_count); + // add entries to this group + add_entries(L, entry_table_stack_index, (*g)[i]); + } } } - lua_pop(L, 1); + // pop the top of the stack down to the key of the group + lua_pop(L, lua_gettop(L)-table_stack_index-1); ++i; } } @@ -166,7 +208,13 @@ void add_entries(lua_State *L, int table_stack_index, GROUP *g) { lua_pop(L, 1); ++i; } +} - // one last pop to pop the key off - lua_pop(L, 1); +void stack_debug(lua_State *L) { + int i; + + printf("DEBUGGING STACK:\n"); + for(i = 1; i <= lua_gettop(L); ++i) { + printf("\t%d - %s\n", i, lua_typename(L, lua_type(L, i))); + } } -- cgit From 243853cd1692c56cae8642dd6bb35c3c75ff54f7 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Wed, 14 Aug 2024 16:32:54 -0400 Subject: Working support for setting launcher --- src/read_cfg.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index 97a76ff..d9491bb 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -147,7 +147,8 @@ int get_entry_count(lua_State *L, int table_stack_index) { void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { const char *group_name; - int entry_table_stack_index; + int group_table_index; // index of Groups.TABLE_NAME + int entry_table_stack_index; // index of Groups.TABLE_NAME.Entries int entry_count; int i; @@ -158,12 +159,13 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { // looking at Groups.TABLE_NAME if(lua_type(L, -2) == LUA_TSTRING && lua_type(L, -1) == LUA_TTABLE) { group_name = lua_tostring(L, -2); + group_table_index = lua_gettop(L); if(group_name != NULL) { // push the Entries table on the stack (to get entry information) lua_pushstring(L, "Entries"); // get table Groups.TABLE_NAME.Entries - lua_gettable(L, -2); + lua_gettable(L, group_table_index); entry_table_stack_index = lua_gettop(L); // check that 'Entries' is a table @@ -182,6 +184,14 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { // add entries to this group add_entries(L, entry_table_stack_index, (*g)[i]); } + + // set the launcher, if applicable + lua_pushstring(L, "Launcher"); + lua_gettable(L, group_table_index); + printf("Found launcher: %s\n", lua_tostring(L, -1)); + if(lua_type(L, -1) == LUA_TSTRING) { + set_gprog((*g)[i], lua_tostring(L, -1)); + } } } // pop the top of the stack down to the key of the group -- cgit From 9adae33d5ffa4a72771266ba127f9ccc9b4b5221 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Wed, 14 Aug 2024 16:51:06 -0400 Subject: Working support for setting launcher flags --- src/read_cfg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index d9491bb..05146aa 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -188,10 +188,16 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { // set the launcher, if applicable lua_pushstring(L, "Launcher"); lua_gettable(L, group_table_index); - printf("Found launcher: %s\n", lua_tostring(L, -1)); if(lua_type(L, -1) == LUA_TSTRING) { set_gprog((*g)[i], lua_tostring(L, -1)); } + + // set the launcher flags, if applicable + lua_pushstring(L, "Flags"); + lua_gettable(L, group_table_index); + if(lua_type(L, -1) == LUA_TSTRING) { + set_gflags((*g)[i], lua_tostring(L, -1)); + } } } // pop the top of the stack down to the key of the group -- cgit From 002e6c5aac88cc931b838884f9ad21348f2f5641 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Fri, 16 Aug 2024 16:39:39 -0400 Subject: Fix potential group allocation index incrementation issue --- src/read_cfg.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index 05146aa..a6c20a7 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -83,10 +83,13 @@ GROUP **cfg_interp(char *path, int *group_count){ // create the group array *group_count = get_group_count(L, i); - g = malloc(sizeof(GROUP *) * (*group_count)); + if(*group_count <= 0) g = NULL; + else { + g = malloc(sizeof(GROUP *) * (*group_count)); - // add each group (which also adds each entry to each group) - add_groups(L, i, &g); + // add each group (which also adds each entry to each group) + add_groups(L, i, &g); + } lua_close(L); return g; } @@ -170,7 +173,7 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { // check that 'Entries' is a table if(lua_type(L, entry_table_stack_index) != LUA_TTABLE) { - printf("Error in config: 'Entries' should be Table, is actually %s\n", lua_typename(L, lua_type(L, entry_table_stack_index))); + printf("Error in config: in group '%s': 'Entries' should be Table, is actually %s\n", group_name, lua_typename(L, lua_type(L, entry_table_stack_index))); exit(1); } @@ -183,26 +186,27 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { (*g)[i] = create_group(group_name, entry_count); // add entries to this group add_entries(L, entry_table_stack_index, (*g)[i]); - } - // set the launcher, if applicable - lua_pushstring(L, "Launcher"); - lua_gettable(L, group_table_index); - if(lua_type(L, -1) == LUA_TSTRING) { - set_gprog((*g)[i], lua_tostring(L, -1)); - } - - // set the launcher flags, if applicable - lua_pushstring(L, "Flags"); - lua_gettable(L, group_table_index); - if(lua_type(L, -1) == LUA_TSTRING) { - set_gflags((*g)[i], lua_tostring(L, -1)); + // set the launcher, if applicable + lua_pushstring(L, "Launcher"); + lua_gettable(L, group_table_index); + if(lua_type(L, -1) == LUA_TSTRING) { + set_gprog((*g)[i], lua_tostring(L, -1)); + } + + // set the launcher flags, if applicable + lua_pushstring(L, "Flags"); + lua_gettable(L, group_table_index); + if(lua_type(L, -1) == LUA_TSTRING) { + set_gflags((*g)[i], lua_tostring(L, -1)); + } + + ++i; } } } // pop the top of the stack down to the key of the group lua_pop(L, lua_gettop(L)-table_stack_index-1); - ++i; } } -- cgit From 9c330fafe8ce65acbb0980d3e51af3696135099d Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Fri, 16 Aug 2024 17:22:37 -0400 Subject: Sorting working for entries --- src/read_cfg.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index a6c20a7..b084b2c 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -24,6 +24,7 @@ //private //void check_line(char *buffer, char **options, int ln); //int check_option(char *arg, char **options); +void get_settings(lua_State *L, int table_stack_index); // gets settings from Settings global variable int get_group_count(lua_State *L, int table_stack_index); // counts the number of valid groups int get_entry_count(lua_State *L, int table_stack_index); // counts the number of valid entries for a group void add_groups(lua_State *L, int table_stack_index, GROUP ***g); @@ -31,6 +32,7 @@ void add_entries(lua_State *L, int table_stack_index, GROUP *g); void stack_debug(lua_State *L); //turn on or off sorting (A-Z); On by default +// TODO allow specifying whether to sort groups or entries (or both, or none) bool sort = true; //set to true to automatically try to create a human readable name for an entry @@ -73,7 +75,15 @@ GROUP **cfg_interp(char *path, int *group_count){ //lua_setglobal(L, "Groups"); //lua_pcall(L, 0, 0, 0); - // demo + // open Settings table + lua_getglobal(L, "Settings"); + i = lua_gettop(L); + if(lua_type(L, i) == LUA_TTABLE) { + // parse settings + get_settings(L, i); + } + + // open Groups table lua_getglobal(L, "Groups"); i = lua_gettop(L); if(lua_type(L, i) != LUA_TTABLE) { @@ -107,6 +117,34 @@ void refer_to_doc(){ return; } +void get_settings(lua_State *L, int table_stack_index) { + bool *setting_vars[] = { + &hr, + &fold_case, + &sort + }; + + char *setting_strings[] = { + "autoAlias", + "foldCase", + "sort" + }; + + int count = 3; + int i; + + // looking at table Settings + + // check if autoAlias is set + for(i = 0; i < count; ++i) { + lua_pushstring(L, setting_strings[i]); + lua_gettable(L, table_stack_index); + if(lua_type(L, -1) == LUA_TBOOLEAN) { + *(setting_vars[i]) = lua_toboolean(L, -1); + } + } +} + int get_group_count(lua_State *L, int table_stack_index) { int output = 0; int entry_table_stack_index; @@ -155,6 +193,11 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { int entry_count; int i; + // sort the groups, if necessary + //if(sort) { + // luaL_dostring(L, "table.sort(Groups)"); + //} + lua_pushnil(L); i = 0; while(lua_next(L, table_stack_index)) { @@ -184,6 +227,13 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { else { (*g)[i] = create_group(group_name, entry_count); + + // sort the entries if necessary + if(sort) { + lua_pushfstring(L, "table.sort(Groups['%s'].Entries)", group_name); + luaL_dostring(L, lua_tostring(L, -1)); + } + // add entries to this group add_entries(L, entry_table_stack_index, (*g)[i]); -- cgit From 70a15daa4367e072268f4302a68b6f73f6acf6c5 Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Fri, 16 Aug 2024 18:43:36 -0400 Subject: Support for sorting entries --- src/read_cfg.c | 108 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 48 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index b084b2c..f29fe88 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -31,7 +31,7 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g); void add_entries(lua_State *L, int table_stack_index, GROUP *g); void stack_debug(lua_State *L); -//turn on or off sorting (A-Z); On by default +//turn on or off sorting for entries (A-Z); On by default // TODO allow specifying whether to sort groups or entries (or both, or none) bool sort = true; @@ -82,6 +82,7 @@ GROUP **cfg_interp(char *path, int *group_count){ // parse settings get_settings(L, i); } + lua_pop(L, lua_gettop(L)); // open Groups table lua_getglobal(L, "Groups"); @@ -93,7 +94,10 @@ GROUP **cfg_interp(char *path, int *group_count){ // create the group array *group_count = get_group_count(L, i); - if(*group_count <= 0) g = NULL; + if(*group_count <= 0) { + printf("Error: No Groups!\n"); + g = NULL; + } else { g = malloc(sizeof(GROUP *) * (*group_count)); @@ -146,30 +150,34 @@ void get_settings(lua_State *L, int table_stack_index) { } int get_group_count(lua_State *L, int table_stack_index) { + int i = 1; int output = 0; + int group_table_stack_index; int entry_table_stack_index; const char *group_name; - lua_pushnil(L); - while(lua_next(L, table_stack_index)) { - // uses 'key' (at index -2) and 'value' (at index -1) - if(lua_type(L, -2) == LUA_TSTRING && lua_type(L, -1) == LUA_TTABLE) { + do { + lua_rawgeti(L, table_stack_index, i); + group_table_stack_index = lua_gettop(L); + if(lua_type(L, group_table_stack_index) == LUA_TTABLE) { // check validity of this group - group_name = lua_tostring(L, -2); + lua_pushstring(L, "name"); + lua_gettable(L, group_table_stack_index); + group_name = lua_tostring(L, -1); if(group_name != NULL) { // check that the Entries table for this group is not empty lua_pushstring(L, "Entries"); - lua_gettable(L, -2); + lua_gettable(L, group_table_stack_index); entry_table_stack_index = lua_gettop(L); if(lua_type(L, entry_table_stack_index) == LUA_TTABLE && get_entry_count(L, entry_table_stack_index) > 0) ++output; } } - // pop the top of the stack down to the key of the group - lua_pop(L, lua_gettop(L)-table_stack_index-1); - } + ++i; + } while(lua_type(L, group_table_stack_index) != LUA_TNIL); + lua_pop(L, lua_gettop(L)-table_stack_index-1); return output; } @@ -183,35 +191,38 @@ int get_entry_count(lua_State *L, int table_stack_index) { ++i; } while(lua_type(L, -1) != LUA_TNIL); + lua_pop(L, lua_gettop(L)-table_stack_index-1); return output; } void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { const char *group_name; - int group_table_index; // index of Groups.TABLE_NAME + int group_table_stack_index; // index of Groups.TABLE_NAME int entry_table_stack_index; // index of Groups.TABLE_NAME.Entries int entry_count; - int i; + char sort_cmd_lua[BUF_LEN]; // used to store the lua call to table.sort + int i = 1; // index in lua table + int count = 0; // index in C struct // sort the groups, if necessary - //if(sort) { - // luaL_dostring(L, "table.sort(Groups)"); - //} - - lua_pushnil(L); - i = 0; - while(lua_next(L, table_stack_index)) { - // uses 'key' (at index -2) and 'value' (at index -1) - // looking at Groups.TABLE_NAME - if(lua_type(L, -2) == LUA_TSTRING && lua_type(L, -1) == LUA_TTABLE) { - group_name = lua_tostring(L, -2); - group_table_index = lua_gettop(L); + if(sort) { + luaL_dostring(L, "table.sort(Groups)"); + } + + do { + lua_rawgeti(L, table_stack_index, i); + group_table_stack_index = lua_gettop(L); + if(lua_type(L, group_table_stack_index) == LUA_TTABLE) { + // check validity of this group + lua_pushstring(L, "name"); + lua_gettable(L, group_table_stack_index); + group_name = lua_tostring(L, -1); if(group_name != NULL) { // push the Entries table on the stack (to get entry information) lua_pushstring(L, "Entries"); - // get table Groups.TABLE_NAME.Entries - lua_gettable(L, group_table_index); + // get table Groups[i].Entries + lua_gettable(L, group_table_stack_index); entry_table_stack_index = lua_gettop(L); // check that 'Entries' is a table @@ -226,58 +237,59 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { printf("Skipping empty group '%s'\n", group_name); else { - (*g)[i] = create_group(group_name, entry_count); + (*g)[count] = create_group(group_name, entry_count); // sort the entries if necessary if(sort) { - lua_pushfstring(L, "table.sort(Groups['%s'].Entries)", group_name); - luaL_dostring(L, lua_tostring(L, -1)); + sprintf(sort_cmd_lua, "table.sort(Groups[%d].Entries)", i); + luaL_dostring(L, sort_cmd_lua); } // add entries to this group - add_entries(L, entry_table_stack_index, (*g)[i]); + add_entries(L, entry_table_stack_index, (*g)[count]); // set the launcher, if applicable lua_pushstring(L, "Launcher"); - lua_gettable(L, group_table_index); + lua_gettable(L, group_table_stack_index); if(lua_type(L, -1) == LUA_TSTRING) { - set_gprog((*g)[i], lua_tostring(L, -1)); + set_gprog((*g)[count], lua_tostring(L, -1)); } // set the launcher flags, if applicable lua_pushstring(L, "Flags"); - lua_gettable(L, group_table_index); + lua_gettable(L, group_table_stack_index); if(lua_type(L, -1) == LUA_TSTRING) { - set_gflags((*g)[i], lua_tostring(L, -1)); + set_gflags((*g)[count], lua_tostring(L, -1)); } - ++i; + ++count; } } } - // pop the top of the stack down to the key of the group - lua_pop(L, lua_gettop(L)-table_stack_index-1); - } + ++i; + } while(lua_type(L, group_table_stack_index) != LUA_TNIL); + + lua_pop(L, lua_gettop(L)-table_stack_index-1); } void add_entries(lua_State *L, int table_stack_index, GROUP *g) { const char *entry_name; - int i; + int i = 1; // index in lua table + int count = 0; // index in C struct - lua_pushnil(L); - i = 0; - while(lua_next(L, table_stack_index)) { - // uses 'key' (at index -2) and 'value' (at index -1) - // looking at Groups.TABLE_NAME.Entries[i] + do { + lua_rawgeti(L, table_stack_index, i); if(lua_type(L, -1) == LUA_TSTRING) { entry_name = lua_tostring(L, -1); if(entry_name != NULL) { - set_gentry(g, i, create_entry(entry_name, entry_name, true)); + set_gentry(g, count, create_entry(entry_name, entry_name, true)); + ++count; } } - lua_pop(L, 1); ++i; - } + } while(lua_type(L, -1) != LUA_TNIL); + + lua_pop(L, lua_gettop(L)-table_stack_index-1); } void stack_debug(lua_State *L) { -- cgit From 996d3097cfa00363f16ff972b6da347b65ead23f Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Sat, 17 Aug 2024 14:50:07 -0400 Subject: Remove foldcase and hr options --- src/read_cfg.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index f29fe88..3b8d24a 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -35,12 +35,6 @@ void stack_debug(lua_State *L); // TODO allow specifying whether to sort groups or entries (or both, or none) bool sort = true; -//set to true to automatically try to create a human readable name for an entry -bool hr = false; - -//turn foldCase (insensitive case searching) on or off; On by default -bool fold_case = true; - //return false if invalid path GROUP **cfg_interp(char *path, int *group_count){ FILE *fp; @@ -108,14 +102,6 @@ GROUP **cfg_interp(char *path, int *group_count){ return g; } -bool get_sort(){ - return sort; -} - -bool get_case_sensitivity(){ - return fold_case; -} - void refer_to_doc(){ printf("Refer to documentation on how to create terminal-media-launcher config file\n"); return; @@ -123,18 +109,14 @@ void refer_to_doc(){ void get_settings(lua_State *L, int table_stack_index) { bool *setting_vars[] = { - &hr, - &fold_case, &sort }; char *setting_strings[] = { - "autoAlias", - "foldCase", "sort" }; - int count = 3; + int count = 1; int i; // looking at table Settings -- cgit From ca77091d63b3600b7a3829db8ae24c765c65440d Mon Sep 17 00:00:00 2001 From: Louie Shprung Date: Mon, 19 Aug 2024 20:44:56 -0400 Subject: Ability to set entry attributes --- src/read_cfg.c | 291 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 207 insertions(+), 84 deletions(-) (limited to 'src/read_cfg.c') diff --git a/src/read_cfg.c b/src/read_cfg.c index 3b8d24a..6c334ac 100644 --- a/src/read_cfg.c +++ b/src/read_cfg.c @@ -24,12 +24,13 @@ //private //void check_line(char *buffer, char **options, int ln); //int check_option(char *arg, char **options); -void get_settings(lua_State *L, int table_stack_index); // gets settings from Settings global variable -int get_group_count(lua_State *L, int table_stack_index); // counts the number of valid groups -int get_entry_count(lua_State *L, int table_stack_index); // counts the number of valid entries for a group -void add_groups(lua_State *L, int table_stack_index, GROUP ***g); -void add_entries(lua_State *L, int table_stack_index, GROUP *g); +void get_settings(lua_State *L); // gets settings from Settings global variable +int get_group_count(lua_State *L); // counts the number of valid groups +int get_entry_count(lua_State *L); // counts the number of valid entries for a group +void add_groups(lua_State *L, GROUP ***g); +void add_entries(lua_State *L, GROUP *g); void stack_debug(lua_State *L); +void table_debug(lua_State *L, int print_depth); //turn on or off sorting for entries (A-Z); On by default // TODO allow specifying whether to sort groups or entries (or both, or none) @@ -55,6 +56,7 @@ GROUP **cfg_interp(char *path, int *group_count){ // load lua configuration lua_State *L = luaL_newstate(); + // new lua stack luaL_openlibs(L); // allow for standard library to be used int config_load_status = luaL_dofile(L, path); if(config_load_status != 0) { @@ -71,23 +73,24 @@ GROUP **cfg_interp(char *path, int *group_count){ // open Settings table lua_getglobal(L, "Settings"); - i = lua_gettop(L); - if(lua_type(L, i) == LUA_TTABLE) { + // stack now contains: -1 => Settings + if(lua_type(L, -1) == LUA_TTABLE) { // parse settings - get_settings(L, i); + get_settings(L); } - lua_pop(L, lua_gettop(L)); + lua_pop(L, 1); + // empty stack // open Groups table lua_getglobal(L, "Groups"); - i = lua_gettop(L); - if(lua_type(L, i) != LUA_TTABLE) { - printf("Error in config: 'Groups' should be Table, is actually %s\n", lua_typename(L, lua_type(L, i))); + // stack now contains: -1 => Groups + if(lua_type(L, -1) != LUA_TTABLE) { + printf("Error in config: 'Groups' should be Table, is actually %s\n", lua_typename(L, lua_type(L, -1))); exit(1); } // create the group array - *group_count = get_group_count(L, i); + *group_count = get_group_count(L); if(*group_count <= 0) { printf("Error: No Groups!\n"); g = NULL; @@ -96,7 +99,7 @@ GROUP **cfg_interp(char *path, int *group_count){ g = malloc(sizeof(GROUP *) * (*group_count)); // add each group (which also adds each entry to each group) - add_groups(L, i, &g); + add_groups(L, &g); } lua_close(L); return g; @@ -107,7 +110,9 @@ void refer_to_doc(){ return; } -void get_settings(lua_State *L, int table_stack_index) { +void get_settings(lua_State *L) { + // stack now contains: -1 => table + bool *setting_vars[] = { &sort }; @@ -124,60 +129,87 @@ void get_settings(lua_State *L, int table_stack_index) { // check if autoAlias is set for(i = 0; i < count; ++i) { lua_pushstring(L, setting_strings[i]); - lua_gettable(L, table_stack_index); + // stack now contains: -1 => setting_string; -2 => table + lua_gettable(L, -2); + // stack now contains: -1 => string_value; -2 => table if(lua_type(L, -1) == LUA_TBOOLEAN) { *(setting_vars[i]) = lua_toboolean(L, -1); } + lua_pop(L, 1); + // stack now contains: -1 => table } } -int get_group_count(lua_State *L, int table_stack_index) { - int i = 1; +int get_group_count(lua_State *L) { int output = 0; - int group_table_stack_index; - int entry_table_stack_index; - const char *group_name; - do { - lua_rawgeti(L, table_stack_index, i); - group_table_stack_index = lua_gettop(L); - if(lua_type(L, group_table_stack_index) == LUA_TTABLE) { - // check validity of this group + // stack now contains: -1 => table + lua_pushnil(L); + // stack now contains: -1 => nil; -2 => table + while (lua_next(L, -2)) { + // stack now contains: -1 => value; -2 => key; -3 => table + // copy the key so that lua_tostring does not modify the original + lua_pushvalue(L, -2); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + if(lua_type(L, -1) == LUA_TNUMBER && lua_type(L, -2) == LUA_TTABLE) { lua_pushstring(L, "name"); - lua_gettable(L, group_table_stack_index); - group_name = lua_tostring(L, -1); - if(group_name != NULL) { + // stack now contains: -1 => "name"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => name; -2 => key; -3 => value; -4 => key; -5 => table + if(lua_type(L, -1) == LUA_TSTRING) { // check that the Entries table for this group is not empty lua_pushstring(L, "Entries"); - lua_gettable(L, group_table_stack_index); - entry_table_stack_index = lua_gettop(L); - if(lua_type(L, entry_table_stack_index) == LUA_TTABLE - && get_entry_count(L, entry_table_stack_index) > 0) + // stack now contains: -1 => "Entries"; -2 => name; -3 => key; -4 => value; -5 => key; -6 => table + lua_gettable(L, -4); + // stack now contains: -1 => Entries; -2 => name; -3 => key; -4 => value; -5 => key; -6 => table + if(lua_type(L, -1) == LUA_TTABLE && get_entry_count(L) > 0) ++output; + lua_pop(L, 1); + // stack now contains: -1 => name; -2 => key; -3 => value; -4 => key; -5 => table } + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table } - ++i; - } while(lua_type(L, group_table_stack_index) != LUA_TNIL); + lua_pop(L, 2); + // stack now contains: -1 => key; -2 => table + } + // stack now contains: -1 => table (when lua_next returns 0 it pops the key + // but does not push anything.) - lua_pop(L, lua_gettop(L)-table_stack_index-1); return output; } -int get_entry_count(lua_State *L, int table_stack_index) { - int i = 1; +int get_entry_count(lua_State *L) { int output = 0; - do { - lua_rawgeti(L, table_stack_index, i); - if(lua_type(L, -1) == LUA_TSTRING) ++output; - ++i; - } while(lua_type(L, -1) != LUA_TNIL); + // stack now contains: -1 => table + lua_pushnil(L); + // stack now contains: -1 => nil; -2 => table + while (lua_next(L, -2)) { + // stack now contains: -1 => value; -2 => key; -3 => table + // copy the key so that lua_tostring does not modify the original + lua_pushvalue(L, -2); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + if(lua_type(L, -1) == LUA_TNUMBER && lua_type(L, -2) == LUA_TTABLE) { + // check that the entry has a valid name + lua_pushstring(L, "name"); + // stack now contains: -1 => "name"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => name; -2 => key; -3 => value; -4 => key; -5 => table + if(lua_type(L, -1) == LUA_TSTRING) ++output; + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + } + lua_pop(L, 2); + // stack now contains: -1 => key; -2 => table + } + // stack now contains: -1 => table (when lua_next returns 0 it pops the key + // but does not push anything.) - lua_pop(L, lua_gettop(L)-table_stack_index-1); return output; } -void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { +void add_groups(lua_State *L, GROUP ***g) { const char *group_name; int group_table_stack_index; // index of Groups.TABLE_NAME int entry_table_stack_index; // index of Groups.TABLE_NAME.Entries @@ -186,92 +218,136 @@ void add_groups(lua_State *L, int table_stack_index, GROUP ***g) { int i = 1; // index in lua table int count = 0; // index in C struct - // sort the groups, if necessary - if(sort) { - luaL_dostring(L, "table.sort(Groups)"); - } - - do { - lua_rawgeti(L, table_stack_index, i); - group_table_stack_index = lua_gettop(L); - if(lua_type(L, group_table_stack_index) == LUA_TTABLE) { - // check validity of this group + // stack now contains: -1 => table + lua_pushnil(L); + // stack now contains: -1 => nil; -2 => table + while (lua_next(L, -2)) { + // stack now contains: -1 => value; -2 => key; -3 => table + // copy the key so that lua_tostring does not modify the original + lua_pushvalue(L, -2); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + if(lua_type(L, -1) == LUA_TNUMBER && lua_type(L, -2) == LUA_TTABLE) { lua_pushstring(L, "name"); - lua_gettable(L, group_table_stack_index); + // stack now contains: -1 => "name"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => name; -2 => key; -3 => value; -4 => key; -5 => table group_name = lua_tostring(L, -1); + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table if(group_name != NULL) { // push the Entries table on the stack (to get entry information) lua_pushstring(L, "Entries"); - - // get table Groups[i].Entries - lua_gettable(L, group_table_stack_index); - entry_table_stack_index = lua_gettop(L); - - // check that 'Entries' is a table - if(lua_type(L, entry_table_stack_index) != LUA_TTABLE) { - printf("Error in config: in group '%s': 'Entries' should be Table, is actually %s\n", group_name, lua_typename(L, lua_type(L, entry_table_stack_index))); + // stack now contains: -1 => "Entries"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => Entries; -2 => key; -3 => value; -4 => key; -5 => table + if(lua_type(L, -1) != LUA_TTABLE) { + printf("Error in config: in group '%s': 'Entries' should be Table, is actually %s\n", group_name, lua_typename(L, lua_type(L, -1))); exit(1); } - entry_count = get_entry_count(L, entry_table_stack_index); + entry_count = get_entry_count(L); + // check that the group has at least 1 entry - if(entry_count <= 0) + if(entry_count <= 0) { printf("Skipping empty group '%s'\n", group_name); - + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + } else { (*g)[count] = create_group(group_name, entry_count); // sort the entries if necessary if(sort) { - sprintf(sort_cmd_lua, "table.sort(Groups[%d].Entries)", i); + sprintf(sort_cmd_lua, "table.sort(Groups[%d].Entries, function(a, b) return a.name < b.name end)", i); luaL_dostring(L, sort_cmd_lua); } // add entries to this group - add_entries(L, entry_table_stack_index, (*g)[count]); + add_entries(L, (*g)[count]); + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table // set the launcher, if applicable lua_pushstring(L, "Launcher"); - lua_gettable(L, group_table_stack_index); + // stack now contains: -1 => "Launcher"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => Launcher; -2 => key; -3 => value; -4 => key; -5 => table if(lua_type(L, -1) == LUA_TSTRING) { set_gprog((*g)[count], lua_tostring(L, -1)); } + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table // set the launcher flags, if applicable lua_pushstring(L, "Flags"); - lua_gettable(L, group_table_stack_index); + // stack now contains: -1 => "Flags"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => Flags; -2 => key; -3 => value; -4 => key; -5 => table if(lua_type(L, -1) == LUA_TSTRING) { set_gflags((*g)[count], lua_tostring(L, -1)); } + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table ++count; } } } + lua_pop(L, 2); + // stack now contains: -1 => key; -2 => table ++i; - } while(lua_type(L, group_table_stack_index) != LUA_TNIL); - - lua_pop(L, lua_gettop(L)-table_stack_index-1); + } + // stack now contains: -1 => table (when lua_next returns 0 it pops the key + // but does not push anything.) + // Pop table + lua_pop(L, 1); + // Stack is now the same as it was on entry to this function } -void add_entries(lua_State *L, int table_stack_index, GROUP *g) { +void add_entries(lua_State *L, GROUP *g) { const char *entry_name; + const char *entry_path; + int entry_table_stack_index; int i = 1; // index in lua table int count = 0; // index in C struct - do { - lua_rawgeti(L, table_stack_index, i); - if(lua_type(L, -1) == LUA_TSTRING) { + // stack now contains: -1 => table + lua_pushnil(L); + // stack now contains: -1 => nil; -2 => table + while (lua_next(L, -2)) { + // stack now contains: -1 => value; -2 => key; -3 => table + // copy the key so that lua_tostring does not modify the original + lua_pushvalue(L, -2); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + if(lua_type(L, -1) == LUA_TNUMBER && lua_type(L, -2) == LUA_TTABLE) { + // check that the entry has a valid name + lua_pushstring(L, "name"); + // stack now contains: -1 => "name"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => name; -2 => key; -3 => value; -4 => key; -5 => table entry_name = lua_tostring(L, -1); + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + if(entry_name != NULL) { - set_gentry(g, count, create_entry(entry_name, entry_name, true)); + // get this entry's path, if applicable + lua_pushstring(L, "path"); + // stack now contains: -1 => "path"; -2 => key; -3 => value; -4 => key; -5 => table + lua_gettable(L, -3); + // stack now contains: -1 => path; -2 => key; -3 => value; -4 => key; -5 => table + if(lua_type(L, -1) == LUA_TSTRING) entry_path = lua_tostring(L, -1); + else entry_path = entry_name; + lua_pop(L, 1); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + + set_gentry(g, count, create_entry(entry_name, entry_path, true)); ++count; } } - ++i; - } while(lua_type(L, -1) != LUA_TNIL); - - lua_pop(L, lua_gettop(L)-table_stack_index-1); + lua_pop(L, 2); + // stack now contains: -1 => key; -2 => table + } + // stack now contains: -1 => table (when lua_next returns 0 it pops the key } void stack_debug(lua_State *L) { @@ -279,6 +355,53 @@ void stack_debug(lua_State *L) { printf("DEBUGGING STACK:\n"); for(i = 1; i <= lua_gettop(L); ++i) { - printf("\t%d - %s\n", i, lua_typename(L, lua_type(L, i))); + printf("\t%d - %s", i, lua_typename(L, lua_type(L, i))); + + switch(lua_type(L, i)) { + case LUA_TSTRING: + printf(" - %s\n", lua_tostring(L, i)); + break; + + //case LUA_TTABLE: + // printf("\n"); + // table_debug(L, 2); + // break; + + default: + printf("\n"); + } + } +} + +// FIXME WIP debugging function +void table_debug(lua_State *L, int print_depth) { + int i; + + // stack now contains: -1 => table + lua_pushnil(L); + // stack now contains: -1 => nil; -2 => table + while (lua_next(L, -2)) { + // stack now contains: -1 => value; -2 => key; -3 => table + // copy the key so that lua_tostring does not modify the original + lua_pushvalue(L, -2); + // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table + const char *key = lua_tostring(L, -1); + const char *value = lua_typename(L, lua_type(L, -2)); + for(i = 0; i < print_depth; ++i) { + printf("\t"); + } + printf("%s => %s", key, value); + if(lua_type(L, -2) == LUA_TSTRING) { + printf(" - %s", lua_tostring(L, -2)); + } + printf("\n"); + // pop value + copy of key, leaving original key + lua_pop(L, 2); + // stack now contains: -1 => key; -2 => table } + // stack now contains: -1 => table (when lua_next returns 0 it pops the key + // but does not push anything.) + // Pop table + lua_pop(L, 1); + // Stack is now the same as it was on entry to this function } -- cgit