github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 05:14:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

listing scripts refactoring + new format

Browse source
This commit is contained in:
Serghey Rodin 2016-06-09 16:26:54 +03:00
commit 6e0ef668bb
60 changed files with 3695 additions and 1991 deletions
Download patch file Download diff file Expand all files Collapse all files

107
bin/v-list-user-notifications
View file

@ -16,50 +16,69 @@ format=${2-shell}
# Includes
source $VESTA/func/main.sh
# Json function
json_list_notifications() {
echo '{'
fileds_count=$(echo $fields| wc -w )
while read line; do
eval $line
if [ -n "$data" ]; then
echo -e ' },'
# JSON list function
json_list() {
IFS=$'\n'
i=1
objects=$(grep NID $USER_DATA/notifications.conf |wc -l)
echo "{"
while read str; do
eval $str
TOPIC=$(echo "$TOPIC" |sed -e "s/%quote%/'/g")
NOTICE=$(echo "$NOTICE" |sed -e "s/%quote%/'/g")
echo -n ' "'$NID'": {
"TOPIC": "'$TOPIC'",
"NOTICE": "'$NOTICE'",
"TYPE": "'$TYPE'",
"ACK": "'$ACK'",
"TPL": "'$TPL'",
"TIME": "'$TIME'",
"DATE": "'$DATE'"
}'
if [ "$i" -lt "$objects" ]; then
echo ','
else
echo
fi
i=1
IFS=' '
for field in $fields; do
eval value=\"$field\"
value=$(echo "$value"|sed -e 's/"/\\"/g' -e "s/%quote%/'/g")
if [ $i -eq 1 ]; then
(( ++i))
echo -e "\t\"$value\": {"
else
if [ $i -lt $fileds_count ]; then
(( ++i))
echo -e "\t\t\"${field//$/}\": \"${value//,/, }\","
else
echo -e "\t\t\"${field//$/}\": \"${value//,/, }\""
data=1
fi
fi
done
done < $conf
if [ -n "$data" ]; then
echo -e ' }'
fi
echo -e '}'
((i++))
done < <(cat $USER_DATA/notifications.conf)
echo '}'
}
# Shell function
shell_list_notifications() {
while read line ; do
eval $line
# SHELL list function
shell_list() {
IFS=$'\n'
while read str; do
eval $str
echo "$TOPIC" |sed -e "s/%quote%/'/g"
echo "$NOTICE" |sed -e "s/%quote%/'/g"
echo "$DATE $TIME"
echo "--"
echo
done < $conf
done < <(cat $USER_DATA/notifications.conf)
}
# PLAIN list function
plain_list() {
IFS=$'\n'
while read str; do
eval $str
TOPIC=$(echo "$TOPIC" |sed -e "s/%quote%/'/g")
NOTICE=$(echo "$NOTICE" |sed -e "s/%quote%/'/g")
echo -e "$NID\t$TOPIC\t$NOTICE\t$TIME\t$DATE"
done < <(cat $USER_DATA/notifications.conf)
}
# CSV list function
csv_list() {
IFS=$'\n'
echo "NID,TOPIC,NOTICE,TIME,DATE"
while read str; do
eval $str
TOPIC=$(echo "$TOPIC" |sed -e "s/%quote%/'/g")
NOTICE=$(echo "$NOTICE" |sed -e "s/%quote%/'/g")
echo "$NID,\"$TOPIC\",\"$NOTICE\",$TIME,$DATE"
done < <(cat $USER_DATA/notifications.conf)
}
@ -69,7 +88,7 @@ shell_list_notifications() {
# Checking args
check_args '1' "$#" 'USER [FORMAT]'
validate_format 'user'
is_format_valid 'user'
is_object_valid 'user' 'USER' "$user"
@ -77,16 +96,12 @@ is_object_valid 'user' 'USER' "$user"
# Action #
#----------------------------------------------------------#
# Defining fileds to select
conf=$USER_DATA/notifications.conf
fields='$NID $TOPIC $NOTICE $TYPE $ACK $TIME $DATE'
# Listing favourites
# Listing data
case $format in
json) json_list_notifications ;;
plain) shell_list_notifications ;;
shell) shell_list_notifications ;;
*) check_args '1' '0' 'USER [FORMAT]'
json) json_list ;;
plain) plain_list ;;
csv) csv_list ;;
shell) shell_list ;;
esac