PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-03-03 16:05:20 -05:00
Code Releases Activity

Read json file chuncked, and from stdin

Browse source
This commit is contained in:
Qball Cow 2014-01-29 18:44:09 +01:00
parent e2d2f35713
commit 167429bae0
2 changed files with 63 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Test/json/fail/empty.json Normal file
View file

@ -0,0 +1 @@
{ "prompt" : "mpd " , "run-in-terminal" : false , "commands" : { }}

80
source/json-dialog.c
View file

@ -86,9 +86,34 @@ typedef struct pmenu {
char **commands; char **commands;
} pmenu; } pmenu;
static struct json_object * read_json_file_descr(FILE *fd)
{
struct json_object *jo = NULL;
enum json_tokener_error err;
struct json_tokener *tok = json_tokener_new();
char buffer[64];
ssize_t len = 0;
while( (len = fread(buffer, 1, 64, fd)) > 0) {
jo = json_tokener_parse_ex(tok, buffer, len);
if((err = json_tokener_get_error(tok)) != json_tokener_continue)
{
if(err != json_tokener_success) {
fprintf(stderr, "Error parsing json file: %s\n", json_tokener_error_desc(err));
jo = NULL;
}
break;
}
}
// Get reference before we destroy the tokener.
if(jo) json_object_get(jo);
json_tokener_free(tok);
return jo;
}
static pmenu *get_json ( ) static pmenu *get_json ( )
{ {
pmenu *retv = allocate_clear(sizeof(*retv));
#ifdef TIMING #ifdef TIMING
struct timespec start, stop; struct timespec start, stop;
@ -97,21 +122,33 @@ static pmenu *get_json ( )
struct json_object *jo = NULL; struct json_object *jo = NULL;
if(json_input_file != NULL) { if(json_input_file != NULL) {
jo = json_object_from_file(json_input_file); if (json_input_file[0] == '-' && json_input_file[1] == '\0') {
jo = read_json_file_descr(stdin);
}
else
{
FILE *fd = fopen(json_input_file, "r");
if(fd == NULL) {
fprintf(stderr, "Failed to open file: %s: %s\n",
json_input_file, strerror(errno));
return NULL;
}
jo = read_json_file_descr(fd);
fclose(fd);
}
} }
if(jo && json_object_get_type(jo) != json_type_object) {
fprintf(stderr, "Json file has invalid root type.\n");
json_object_put(jo);
jo = NULL;
}
// Create error and exit. // Create error and exit.
if(jo == NULL) { if(jo == NULL ) {
retv->entries= realloc( retv->entries, ( retv->num_entries+2 )*sizeof( char* ) ); return NULL;
retv->entries[retv->num_entries] = strdup( "Failed to parse json input file" );
retv->entries[retv->num_entries+1] = NULL;
retv->commands= realloc( retv->commands, ( retv->num_entries+2 )*sizeof( char* ) );
retv->commands[retv->num_entries] = strdup( "" );
retv->commands[retv->num_entries+1] = NULL;
retv->num_entries++;
return retv;
} }
pmenu *retv = allocate_clear(sizeof(*retv));
struct json_object *jo2; struct json_object *jo2;
if(json_object_object_get_ex(jo, "prompt", &jo2)) { if(json_object_object_get_ex(jo, "prompt", &jo2)) {
@ -174,15 +211,20 @@ SwitcherMode json_switcher_dialog ( char **input )
return retv; return retv;
} }
int shift=0; if(list->num_entries > 0) {
int n = menu( list->entries, input, list->prompt, NULL, &shift,token_match, NULL );
if ( n == -2 ) { int shift=0;
retv = JSON_DIALOG; int n = menu( list->entries, input, list->prompt, NULL, &shift,token_match, NULL );
} else if ( n >=0 && list->commands[n] != NULL ) {
exec_json( list->commands[n], list->execute_in_term); if ( n == -2 ) {
retv = JSON_DIALOG;
} else if ( n >=0 && list->commands[n] != NULL ) {
exec_json( list->commands[n], list->execute_in_term);
}
} else {
fprintf(stderr, "No commands found in json file\n");
} }
for ( unsigned int i=0; i < list->num_entries; i++ ) { for ( unsigned int i=0; i < list->num_entries; i++ ) {
free( list->entries[i] ); free( list->entries[i] );
free( list->commands[i] ); free( list->commands[i] );