listing scripts refactoring + new format

bin/v-list-user-package

@@ -17,43 +17,73 @@ format=${2-shell}
 # Includes
 source $VESTA/func/main.sh
 
-# Json function
-json_list_package() {
-    i=1
-    fileds_count=$(echo "$fields" | wc -w)
-    pkg_data=$(cat $VESTA/data/packages/$PACKAGE.pkg)
+# JSON list function
+json_list() {
     echo '{'
-    eval $pkg_data
-    for field in $fields; do
-        eval value=$field
-        if [ $i -eq 1 ]; then
-            echo -e "\t\"$value\": {"
-        else
-            if [ $fileds_count -eq $i ]; then
-                echo -e "\t\t\"${field//$/}\": \"${value//,/, }\""
-            else
-                echo -e "\t\t\"${field//$/}\": \"${value//,/, }\","
-            fi
-        fi
-    (( ++i))
-    done
-    if [ -n "$value" ]; then
-        echo -e '        }'
-    fi
-    echo -e '}'
+    echo '    "'$PACKAGE'": {
+        "WEB_TEMPLATE": "'$WEB_TEMPLATE'",
+        "PROXY_TEMPLATE": "'$PROXY_TEMPLATE'",
+        "DNS_TEMPLATE": "'$DNS_TEMPLATE'",
+        "WEB_DOMAINS": "'$WEB_DOMAINS'",
+        "WEB_ALIASES": "'$WEB_ALIASES'",
+        "DNS_DOMAINS": "'$DNS_DOMAINS'",
+        "DNS_RECORDS": "'$DNS_RECORDS'",
+        "MAIL_DOMAINS": "'$MAIL_DOMAINS'",
+        "MAIL_ACCOUNTS": "'$MAIL_ACCOUNTS'",
+        "DATABASES": "'$DATABASES'",
+        "CRON_JOBS": "'$CRON_JOBS'",
+        "DISK_QUOTA": "'$DISK_QUOTA'",
+        "BANDWIDTH": "'$BANDWIDTH'",
+        "NS": "'$NS'",
+        "SHELL": "'$SHELL'",
+        "BACKUPS": "'$BACKUPS'",
+        "TIME": "'$TIME'",
+        "DATE": "'$DATE'"
+    }'
+    echo '}'
 }
 
-# Shell function
-shell_list_package() {
-    line=$(cat $VESTA/data/packages/$PACKAGE.pkg)
-    eval $line
-    for field in $fields; do
-        eval key="$field"
-        if [ -z "$key" ]; then
-            key='NULL'
-        fi
-        echo "${field//$/}: $key "
-    done
+# SHELL list function
+shell_list() {
+    echo "PACKAGE:        $PACKAGE"
+    echo "WEB TEMPLATE:   $WEB_TEMPLATE"
+    echo "PROXY TEMPLATE: $PROXY_TEMPLATE"
+    echo "DNS TEMPLATE:   $DNS_TEMPLATE"
+    echo "WEB DOMAINS:    $WEB_DOMAINS"
+    echo "WEB ALIASES:    $WEB_ALIASES"
+    echo "DNS DOMAINS:    $DNS_DOMAINS"
+    echo "DNS RECORDS:    $DNS_RECORDS"
+    echo "MAIL DOMAINS:   $MAIL_DOMAINS"
+    echo "MAIL ACCOUNTS:  $MAIL_ACCOUNTS"
+    echo "DATABASES:      $DATABASES"
+    echo "CRON JOBS:      $CRON_JOBS"
+    echo "DISK QUOTA:     $DISK_QUOTA"
+    echo "BANDWIDTH:      $BANDWIDTH"
+    echo "NS:             $NS"
+    echo "SHELL:          $SHELL"
+    echo "BACKUPS:        $BACKUPS"
+    echo "TIME:           $TIME"
+    echo "DATE:           $DATE"
+}
+
+# PLAIN list function
+plain_list() {
+    echo -ne "$PACKAGE\t$WEB_TEMPLATE\t$PROXY_TEMPLATE\t$DNS_TEMPLATE\t"
+    echo -ne "$WEB_DOMAINS\t$WEB_ALIASES\t$DNS_DOMAINS\t$DNS_RECORDS\t"
+    echo -ne "$MAIL_DOMAINS\t$MAIL_ACCOUNTS\t$DATABASES\t$CRON_JOBS\t"
+    echo -e "$DISK_QUOTA\t$BANDWIDTH\t$NS\t$SHELL\t$BACKUPS\t$TIME\t$DATE"
+}
+
+# CSV list function
+csv_list() {
+    echo -n "PACKAGE,WEB_TEMPLATE,PROXY_TEMPLATE,DNS_TEMPLATE,"
+    echo -n "WEB_DOMAINS,WEB_ALIASES,DNS_DOMAINS,DNS_RECORDS,"
+    echo -n "MAIL_DOMAINS,MAIL_ACCOUNTS,DATABASES,CRON_JOBS,"
+    echo "DISK_QUOTA,BANDWIDTH,NS,SHELL,BACKUPS,TIME,DATE"
+    echo -n "$PACKAGE,$WEB_TEMPLATE,$PROXY_TEMPLATE,$DNS_TEMPLATE,"
+    echo -n "$WEB_DOMAINS,$WEB_ALIASES,$DNS_DOMAINS,$DNS_RECORDS,"
+    echo -n "$MAIL_DOMAINS,$MAIL_ACCOUNTS,$DATABASES,$CRON_JOBS,"
+    echo "$DISK_QUOTA,$BANDWIDTH,\"$NS\",$SHELL,$BACKUPS,$TIME,$DATE"
 }
 
 
@@ -63,7 +93,7 @@ shell_list_package() {
 
 # Checking args
 check_args '1' "$#" 'PACKAGE [FORMAT]'
-validate_format 'package'
+is_format_valid 'package'
 is_package_valid
 
 
@@ -71,18 +101,15 @@ is_package_valid
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Defining fileds to select
-fields='$PACKAGE $WEB_TEMPLATE $PROXY_TEMPLATE $DNS_TEMPLATE $WEB_DOMAINS
-    $WEB_ALIASES $DNS_DOMAINS $DNS_RECORDS $MAIL_DOMAINS $MAIL_ACCOUNTS
-    $DATABASES $CRON_JOBS $DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $TIME
-    $DATE'
+# Parsing package
+source $VESTA/data/packages/$PACKAGE.pkg
 
-# Listing ip
-case $format in 
-    json)   json_list_package ;;
-    plain)  shell_list_package ;;
-    shell)  shell_list_package | column -t ;;
-    *)      check_args '1' '0' 'IP [FORMAT]'
+# Listing data
+case $format in
+    json)   json_list ;;
+    plain)  plain_list ;;
+    csv)    csv_list ;;
+    shell)  shell_list ;;
 esac