X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=sh%2Fjshn.sh;h=a324c54e7a46fb8f4b324408fb09f15e7d55d9c4;hp=7f922c4f41a3a62f0ebcef421b4bcf6e62a8c59c;hb=dcbc14a70169c52dcf76573a6a00268c9359860e;hpb=94ff2a0abb2938dc84cc46e513f0d039cacbe40a

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 7f922c4..a324c54 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -1,85 +1,188 @@
 # functions for parsing and generating json
 
-jshn_append() {
-	local var="$1"
+_json_get_var() {
+	# dest=$1
+	# var=$2
+	eval "$1=\"\$${JSON_PREFIX}$2\""
+}
+
+_json_set_var() {
+	# var=$1
+	local ___val="$2"
+	eval "${JSON_PREFIX}$1=\"\$___val\""
+}
+
+__jshn_raw_append() {
+	# var=$1
 	local value="$2"
 	local sep="${3:- }"
 
-	eval "export -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+	eval "export -- \"$1=\${$1:+\${$1}\${value:+\$sep}}\$value\""
 }
 
-json_init() {
-	[ -n "$JSON_UNSET" ] && eval "unset $JSON_UNSET"
-	export -- JSON_SEQ=0 JSON_STACK= JSON_CUR="JSON_VAR" JSON_UNSET="" KEYS_JSON_VAR= TYPE_JSON_VAR=
+_jshn_append() {
+	# var=$1
+	# value=$2
+	# sep=$3
+	local __old_val
+
+	_json_get_var __old_val "$1"
+	_json_set_var "$1" "${__old_val:+$__old_val${3:- }}$2"
+}
+
+_json_export() {
+	# var=$1
+	# value=$2
+	export -- "${JSON_PREFIX}$1=$2"
 }
 
-json_add_generic() {
-	local type="$1"
+_json_add_key() {
+	# var=$1
+	# value=$2
+	_jshn_append "KEYS_$1" "$2"
+}
+
+_get_var() {
+	# var=$1
+	# value=$2
+	eval "$1=\"\$$2\""
+}
+
+_set_var() {
+	# var=$1
+	local __val="$2"
+	eval "$1=\"\$__val\""
+}
+
+_json_inc() {
+	# var=$1
+	# dest=$2
+	local _seq
+
+	_json_get_var _seq "$1"
+	_seq="$((${_seq:-0} + 1))"
+	_json_set_var "$1" "$_seq"
+	[ -n "$2" ] && _set_var "$2" "$_seq"
+}
+
+_json_add_generic() {
+	# type=$1
 	local var="$2"
-	local val="$3"
-	local cur="${4:-$JSON_CUR}"
+	# value=$3
+	local cur="$4"
+
+	[ -n "$cur" ] || _json_get_var cur JSON_CUR
 
 	if [ "${cur%%[0-9]*}" = "JSON_ARRAY" ]; then
-		eval "local aseq=\"\${SEQ_$cur}\""
-		var=$(( ${aseq:-0} + 1 ))
-		export -- "SEQ_$cur=$var"
+		_json_inc "SEQ_$cur" var
 	else
-		local name="$(echo -n "$var" | tr -C '[a-zA-Z0-9_]' _)"
-		[[ "$name" == "$var" ]] || export -- "NAME_${cur}_${name}=$var"
+		local name="${var//[^a-zA-Z0-9_]/_}"
+		[[ "$name" == "$var" ]] || _json_export "NAME_${cur}_${name}" "$var"
 		var="$name"
 	fi
 
-	export -- "${cur}_$var=$val"
-	export -- "TYPE_${cur}_$var=$type"
-	jshn_append JSON_UNSET "${cur}_$var TYPE_${cur}_$var"
-	jshn_append "KEYS_${cur}" "$var"
+	local cur_var=
+	_json_export "${cur}_$var" "$3"
+	_json_export "TYPE_${cur}_$var" "$1"
+	_jshn_append "JSON_UNSET" "${cur}_$var"
+	_json_add_key "$cur" "$var"
+}
+
+_json_add_table() {
+	# name=$1
+	# type=$2
+	# itype=$3
+	local cur new_cur seq
+
+	_json_get_var cur JSON_CUR
+	_json_inc JSON_SEQ seq
+
+	local table="JSON_$3$seq"
+	_json_set_var "UP_$table" "$cur"
+	_json_export "KEYS_$table" ""
+	[ "$itype" = "ARRAY" ] && _json_set_var "SEQ_$table" ""
+	_json_set_var JSON_CUR "$table"
+	_jshn_append "JSON_UNSET" "$table"
+
+	_json_get_var new_cur JSON_CUR
+	_json_add_generic "$2" "$1" "$new_cur" "$cur"
 }
 
-json_add_table() {
-	local TYPE="$1"
-	JSON_SEQ=$(($JSON_SEQ + 1))
-	jshn_append JSON_STACK "$JSON_CUR"
-	local table="JSON_$TYPE$JSON_SEQ"
-	export -- "UP_$table=$JSON_CUR"
-	export -- "KEYS_$table="
-	jshn_append JSON_UNSET "KEYS_$table UP_$table"
-	[ "$TYPE" = "ARRAY" ] && jshn_append JSON_UNSET "SEQ_$table"
-	JSON_CUR="$table"
+_json_close_table() {
+	local _s_cur _s_new
+
+	_json_get_var _s_cur JSON_CUR
+	_json_get_var _s_new "UP_$_s_cur"
+	_json_set_var JSON_CUR "$_s_new"
+}
+
+json_set_namespace() {
+	local _new="$1"
+	local _old="$2"
+
+	[ -n "$_old" ] && _set_var "$_old" "$JSON_PREFIX"
+	JSON_PREFIX="$_new"
+}
+
+json_cleanup() {
+	local unset
+
+	_json_get_var unset JSON_UNSET
+	for tmp in $unset JSON_VAR; do
+		unset \
+			${JSON_PREFIX}UP_$tmp \
+			${JSON_PREFIX}KEYS_$tmp \
+			${JSON_PREFIX}SEQ_$tmp \
+			${JSON_PREFIX}TYPE_$tmp \
+			${JSON_PREFIX}NAME_$tmp \
+			${JSON_PREFIX}$tmp
+	done
+
+	unset \
+		${JSON_PREFIX}JSON_SEQ \
+		${JSON_PREFIX}JSON_CUR \
+		${JSON_PREFIX}JSON_UNSET
+}
+
+json_init() {
+	json_cleanup
+	export -- \
+		${JSON_PREFIX}JSON_SEQ=0 \
+		${JSON_PREFIX}JSON_CUR="JSON_VAR" \
+		${JSON_PREFIX}KEYS_JSON_VAR= \
+		${JSON_PREFIX}TYPE_JSON_VAR=
 }
 
 json_add_object() {
-	local cur="$JSON_CUR"
-	json_add_table TABLE
-	json_add_generic object "$1" "$JSON_CUR" "$cur"
+	_json_add_table "$1" object TABLE
 }
 
 json_close_object() {
-	local oldstack="$JSON_STACK"
-	JSON_CUR="${JSON_STACK##* }"
-	JSON_STACK="${JSON_STACK% *}"
-	[[ "$oldstack" == "$JSON_STACK" ]] && JSON_STACK=
+	_json_close_table
 }
 
 json_add_array() {
-	local cur="$JSON_CUR"
-	json_add_table ARRAY
-	json_add_generic array "$1" "$JSON_CUR" "$cur"
+	_json_add_table "$1" array ARRAY 
 }
 
 json_close_array() {
-	json_close_object
+	_json_close_table
 }
 
 json_add_string() {
-	json_add_generic string "$1" "$2"
+	_json_add_generic string "$1" "$2"
 }
 
 json_add_int() {
-	json_add_generic int "$1" "$2"
+	_json_add_generic int "$1" "$2"
 }
 
 json_add_boolean() {
-	json_add_generic boolean "$1" "$2"
+	_json_add_generic boolean "$1" "$2"
+}
+
+json_add_double() {
+	_json_add_generic double "$1" "$2"
 }
 
 # functions read access to json variables
@@ -89,19 +192,60 @@ json_load() {
 }
 
 json_dump() {
-	jshn "$@" -w
+	jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w 
 }
 
 json_get_type() {
-	local dest="$1"
-	local var="$2"
-	eval "export -- \"$dest=\${TYPE_${JSON_CUR}_$var}\""
+	local __dest="$1"
+	local __cur
+
+	_json_get_var __cur JSON_CUR
+	local __var="${JSON_PREFIX}TYPE_${__cur}_${2//[^a-zA-Z0-9_]/_}"
+	eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
+}
+
+json_get_keys() {
+	local __dest="$1"
+	local _tbl_cur
+
+	if [ -n "$2" ]; then
+		json_get_var _tbl_cur "$2"
+	else
+		_json_get_var _tbl_cur JSON_CUR
+	fi
+	local __var="${JSON_PREFIX}KEYS_${_tbl_cur}"
+	eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
+}
+
+json_get_values() {
+	local _v_dest="$1"
+	local _v_keys _v_val _select=
+
+	unset "$_v_dest"
+	[ -n "$2" ] && {
+		json_select "$2"
+		_select=1
+	}
+
+	json_get_keys _v_keys
+	set -- $_v_keys
+	while [ "$#" -gt 0 ]; do
+		json_get_var _v_val "$1"
+		__jshn_raw_append "$_v_dest" "$_v_val"
+		shift
+	done
+	[ -n "$_select" ] && json_select ..
+
+	return 0
 }
 
 json_get_var() {
-	local dest="$1"
-	local var="$(echo -n "$2" | tr -C '[a-zA-Z0-9_]' _)"
-	eval "export -- \"$dest=\${${JSON_CUR}_$var}\""
+	local __dest="$1"
+	local __cur
+
+	_json_get_var __cur JSON_CUR
+	local __var="${JSON_PREFIX}${__cur}_${2//[^a-zA-Z0-9_]/_}"
+	eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
 }
 
 json_get_vars() {
@@ -114,22 +258,34 @@ json_get_vars() {
 json_select() {
 	local target="$1"
 	local type
+	local cur
 
 	[ -z "$1" ] && {
-		JSON_CUR="JSON_VAR"
-		return
+		_json_set_var JSON_CUR "JSON_VAR"
+		return 0
 	}
 	[[ "$1" == ".." ]] && {
-		eval "JSON_CUR=\"\${UP_$JSON_CUR}\""
-		return;
+		_json_get_var cur JSON_CUR
+		_json_get_var cur "UP_$cur"
+		_json_set_var JSON_CUR "$cur"
+		return 0
 	}
 	json_get_type type "$target"
 	case "$type" in
 		object|array)
-			json_get_var JSON_CUR "$target"
+			json_get_var cur "$target"
+			_json_set_var JSON_CUR "$cur"
 		;;
 		*)
 			echo "WARNING: Variable '$target' does not exist or is not an array/object"
+			return 1
 		;;
 	esac
 }
+
+json_is_a() {
+	local type
+
+	json_get_type type "$1"
+	[ "$type" = "$2" ]
+}