Merge branch 'config'

1 files changed, 17 insertions, 6 deletions

diff --git a/gist b/gist
index 6077ebb..0b5dee4 100755
--- a/gist
+++ b/gist
@@ -48,7 +48,6 @@
 # Since now a gist is a local cloned repo
 # It is your business to do git commit and git push
 
-# TODO user friendly config file
 # TODO change gist from public to private or reverse versa
 # TODO feature to exclude tag-value or grep-string
 # TODO Save HEADER with wget and httpie
@@ -63,6 +62,7 @@ CONFIG=~/.config/gist.conf; mkdir -p ~/.config
 per_page=100
 
 INDEX_FORMAT=('index' 'public' 'gist_id' 'tags_string' 'blob_code' 'file_array' 'file_num' 'comment_num' 'author' 'created_at' 'updated_at' 'description')
+VALID_CONFIGS=('user=' 'token=' 'folder=' 'auto_sync=true|false' 'action=' 'EDITOR=' 'protocol=https|ssh' 'show_untagged=true|false')
 TAG_CHAR='-_[:alnum:]'
 if [[ ! -t 0 ]]; then
   INPUT=$(cat)
@@ -150,11 +150,10 @@ _process_json() {
 _configure() {
   [[ $# == 0 ]] && (${EDITOR:-vi} "$CONFIG") && return 0
 
-  local valid_keys='user|token|folder|auto_sync|EDITOR|action|protocol|show_untagged'
-  local key=$1; local value="$2"
+  local key=$1; local value="$2"; local keys=${VALID_CONFIGS[@]%=*}
 
-  [[ ! $key =~ ^($valid_keys)$ ]] \
-  && echo "Not a valid key for configuration, use <$valid_keys> instead." \
+  [[ ! " ${keys} " =~ " ${key} " ]] \
+  && echo "Not a valid key for configuration, use <${keys// /|}> instead." \
   && return 1
 
   case $key in
@@ -203,8 +202,20 @@ _ask_token() {
 
 # Check configuration is fine with user setting
 _validate_config() {
-  # shellcheck source=/dev/null
   source "$CONFIG" 2> /dev/null
+  sed -i -Ee '/^(user|token)=/!d' "$CONFIG"
+  for pair in "${VALID_CONFIGS[@]}"; do
+    key=${pair%=*}; [[ $key =~ ^(user|token)$ ]] && continue
+    value="${!key}"
+    values=${pair#*=}
+    if [[ -n $value && $value =~ ($values) ]]; then
+      echo -n $key="'$value'"
+    else
+      echo -n ${pair%|*}
+    fi
+    echo -e "${values:+\t\t# Valid: $values}"
+  done >>"$CONFIG" && source "$CONFIG"
+
   [[ $1 =~ ^(c|config|h|help|u|user|update|version) ]] && return 0
   if [[ -z $user ]]; then
     echo 'Hi fellow! To access your gists, I need your Github username'