1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
|
From 73fbbd5f83f15672aa7e48d77f245dc7ca166f17 Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick.staples@gmail.com>
Date: Mon, 23 Jan 2017 17:46:40 -0800
Forwareded: no
Subject: [PATCH] Add -E tag:name:value syntax to get a value from name/value
pairs
---
jshon.1 | 13 ++++++++
jshon.c | 79 +++++++++++++++++++++++++++++++++++++++++++-
jshon_zsh_completion | 1 +
3 files changed, 92 insertions(+), 1 deletion(-)
--- a/jshon.1
+++ b/jshon.1
@@ -55,6 +55,19 @@ in the middle of them.
.Pp
\& jshon \-e c -> {"d":4,"e":5}
.Pp
+.It Cm -E nametag:namevalue:valuetag
+(Extract) returns json value from a name/value pair. Only works on object.
+.br
+\& Given:
+.br
+\& [{ tagname: color, tagvalue: red },
+.br
+\& { tagname: texture, tagvalue: squishy },
+.br
+\& { tagname: height, tagvalue: 10ft }]
+.br
+\& jshon -a -E tagname:height:tagvalue -> 10ft
+.Pp
.It Cm -a
(across) maps the remaining actions across the selected element. Only works on objects and arrays. Multiple
.Nm \-a
--- a/jshon.c
+++ b/jshon.c
@@ -31,6 +31,7 @@
-l(ength) -> only works on str, dict, list
-k(eys) -> only works on dict
-e(xtract) index -> only works on dict, list
+ -E(xtract name/values) nametag:namevalue:valuetag -> only works on dict
-s(tring) value -> adds json escapes
-n(onstring) value -> creates true/false/null/array/object/int/float
-u(nstring) -> removes json escapes, display value
@@ -64,6 +65,12 @@
-L(abel)
add jsonpipe/style/prefix/labels\t to pretty-printed json
+ -E tag:value:value is for extracting name/value pairs. Given:
+ [{ tagname: color, tagvalue: red },
+ { tagname: texture, tagvalue: squishy },
+ { tagname: height, tagvalue: 10ft }]
+ jshon -a -E tagname:height:tagvalue -> 10ft
+
color?
loadf for stdin?
*/
@@ -766,6 +773,69 @@ json_t* extract(json_t* json, char* key)
json_err("has no elements to extract", json);
return json_null();
}
+json_t* extract_name_value(json_t* json, char* key)
+// extra value from a name/value pair
+{
+ json_t* tempname;
+ json_t* tempvalue;
+ const char* tempstrval;
+ char *nametag, *nameval;
+ char *valuetag;
+
+ // OutputKey:NetworkStackName:OutputValue
+ nametag=strtok(key,":");
+ nameval=strtok(NULL,":");
+ valuetag=strtok(NULL,":");
+ if ((nametag==NULL) || (nameval==NULL) || (valuetag==NULL)) {
+ arg_err("parse error: expecting 'tag:val:tag' arg %i, \"%s\"");
+ return json_null();
+ }
+
+ switch (json_typeof(json))
+ {
+ case JSON_OBJECT:
+ // Do we have a nametag with the proper nameval?
+ tempname = json_object_get(json, nametag);
+ if (tempname == NULL)
+ return json_null();
+ if (json_typeof(tempname) != JSON_STRING)
+ return json_null();
+ tempstrval = json_string_value(tempname);
+ if (tempstrval == NULL)
+ return json_null();
+
+ if (strcmp(nameval, tempstrval) != 0)
+ return json_null();
+
+ // Now do we have the valuetag?
+ tempvalue = json_object_get(json, valuetag);
+ if (tempvalue == NULL)
+ return json_null();
+ if (json_typeof(tempvalue) != JSON_STRING)
+ return json_null();
+ tempstrval = json_string_value(tempvalue);
+ if (tempstrval == NULL)
+ return json_null();
+
+ printf("%s\n", tempstrval);
+ return tempvalue;
+ //if (temp == NULL)
+ //{break;}
+ //return temp;
+ return json_null();
+ case JSON_ARRAY:
+ case JSON_STRING:
+ case JSON_INTEGER:
+ case JSON_REAL:
+ case JSON_TRUE:
+ case JSON_FALSE:
+ case JSON_NULL:
+ default:
+ break;
+ }
+ json_err("has no elements to extract", json);
+ return json_null();
+}
json_t* delete(json_t* json, char* key)
// no error checking
@@ -853,7 +923,7 @@ void debug_map()
}
int main (int argc, char *argv[])
-#define ALL_OPTIONS "PSQVCI0tlkupajF:e:s:n:d:i:"
+#define ALL_OPTIONS "PSQVCI0tlkupajF:e:E:s:n:d:i:"
{
char* content = "";
char* arg1 = "";
@@ -912,6 +982,7 @@ int main (int argc, char *argv[])
case 'u':
case 'p':
case 'e':
+ case 'E':
case 'j':
case 's':
case 'n':
@@ -1028,6 +1099,12 @@ int main (int argc, char *argv[])
PUSH(extract(maybe_deep(json), arg1));
output = 1;
break;
+ case 'E': // extract
+ arg1 = (char*) strdup(optarg);
+ json = PEEK;
+ PUSH(extract_name_value(maybe_deep(json), arg1));
+ output = 0;
+ break;
case 'j': // json literal
printf("%s%c", smart_dumps(PEEK, dumps_compact), delim);
output = 0;
--- a/jshon_zsh_completion
+++ b/jshon_zsh_completion
@@ -18,6 +18,7 @@ _jshon_opts_operations=(
_jshon_opts_index=(
-e'[returns json value at index]'
+ -E'[returns json value at tag:name:value]'
-i'[insert item into array at index]'
-d'[removes item in array or object]'
)
|
