plate/telodendria
1
0
Fork 0
forked from lda/telodendria
Code Pull requests Activity Actions

Allow encoding user-provided strings.

Browse source
This commit is contained in:
Jordan Bancino 2023-03-08 20:31:49 +00:00
parent 50e599f1cd
commit efdf168085
2 changed files with 159 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO.txt
View file

@ -30,7 +30,7 @@ Milestone: v0.3.0
[~] Simple command line tool for working with JSON
[x] Pretty-print Json
[x] Query fields for use in shell scripts.
[ ] Encode user-provided JSON strings
[x] Encode user-provided JSON strings
[ ] json man page
[ ] Move configuration to database

97
tools/src/json.c
View file

@ -30,22 +30,18 @@
#include <Memory.h>
#include <Json.h>
int
main(int argc, char **argv)
#define FLAG_ENCODE (1 << 0)
#define FLAG_SELECT (1 << 1)
static void
usage(char *prog)
{
HashMap *json;
fprintf(stderr, "Usage: %s [-s query|-e str]\n", prog);
}
json = JsonDecode(stdin);
if (!json)
{
fprintf(stderr, "Malformed JSON.\n");
return 1;
}
if (argc > 1)
{
char *select = argv[1];
static void
query(char *select, HashMap * json)
{
char *key;
JsonValue *val = JsonValueObject(json);
@ -93,7 +89,7 @@ main(int argc, char **argv)
}
else if (JsonValueType(val) == JSON_STRING && strcmp(keyName + 1, "decode") == 0)
{
printf("%s", JsonValueAsString(val));
printf("%s\n", JsonValueAsString(val));
val = NULL;
break;
}
@ -117,7 +113,8 @@ main(int argc, char **argv)
{
size_t i;
sscanf(keyName + 1, "%lu", &i);
if (sscanf(keyName + 1, "%lu", &i) == 1)
{
JsonValueFree(ArrayDelete(JsonValueAsArray(val), i));
}
else
@ -125,6 +122,12 @@ main(int argc, char **argv)
val = NULL;
break;
}
}
else
{
val = NULL;
break;
}
func = 1;
}
@ -158,14 +161,68 @@ main(int argc, char **argv)
if (val)
{
JsonEncodeValue(val, stdout, JSON_PRETTY);
}
printf("\n");
}
else
}
static void
encode(char *str)
{
JsonValue *val = JsonValueString(str);
JsonEncodeValue(val, stdout, JSON_DEFAULT);
JsonValueFree(val);
printf("\n");
}
int
main(int argc, char **argv)
{
HashMap *json;
int flag = 0;
int ch;
char *input;
while ((ch = getopt(argc, argv, "s:e:")) != -1)
{
switch (ch)
{
case 's':
flag = FLAG_SELECT;
input = optarg;
break;
case 'e':
flag = FLAG_ENCODE;
input = optarg;
break;
default:
usage(argv[0]);
return 1;
}
}
if (flag != FLAG_ENCODE)
{
json = JsonDecode(stdin);
if (!json)
{
fprintf(stderr, "Malformed JSON.\n");
return 1;
}
}
switch (flag)
{
case FLAG_SELECT:
query(input, json);
break;
case FLAG_ENCODE:
encode(input);
break;
default:
JsonEncode(json, stdout, JSON_PRETTY);
JsonFree(json);
break;
}
MemoryFreeAll();