added comment support to charfile, beutification

[charsel.git] / charsel

diff --git a/charsel b/charsel
index 24f342f36f22578fa1077e8716e1f581efbd9578..a8b5e66c5771848ae71e6dcd4fda322a19afd076 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -3,48 +3,86 @@
 # Merge both global and local charfiles
 CHARDIR=~/.cache/charsel
 
-if [[ ! "$(ls -A $CHARDIR)" || ! -d $CHARDIR ]]; then
+if [[ ! -d $CHARDIR ]]
+then
   mkdir $CHARDIR/
-  cp -R /usr/share/charsel/* $CHARDIR/
-  cp -R ~/.local/share/charsel/* $CHARDIR/
+elif [[ ! "$(ls -A $CHARDIR)" ]]
+then
+  cp -rf /usr/share/charsel/- $CHARDIR/
+  cp -rf $HOME/.local/share/charsel/- $CHARDIR/
 fi
 
-# Check if user provided an input
-if [ $1 = "list" ]; then
+# Check for user inputs
+if [[ $1 == "list" \
+  || $1 == "-l" \
+  || $1 == "--list" ]]
+then
   echo "The following charfiles are installed"
   ls $CHARDIR/charfiles
-  exit
-elif [[ $1 = "help" || $1 = "-h" || $1 = "--help" || $# -ne 1 ]]; then
+  exit 0
+elif [[ $1 == "help" \
+  || $1 == "-h" \
+  || $1 == "--help" \
+  || $# -ne 1 ]]
+then
   cat /usr/share/doc/charsel/README.md
-  exit
-else
-
-# Clear screen
-clear
+  exit 0
+fi
 
 # Define charfile path
 CHARFILE=$CHARDIR/charfiles/$1
 
+if [[ ! -f $CHARFILE ]]
+then
+  echo "Please enter a valid charfile. You can list installed charfiles with \`charsel list\`"
+  exit 1
+fi
+
 # Define length of shortcut
-LENGTH=$(cat $CHARFILE | cut -f 1 -d ',' -s | wc -L | cut -b 1)
+LENGTH=$(cat $CHARFILE \
+  | cut -f 1 -d ',' -s \
+  | wc -L \
+  | cut -b 1)
+
+# Clear screen
+clear
 
 # Main program
 while :
 do
-  # Put charfile into table, showing only the shortcuts below the divider in the charfile
-  cat $CHARFILE | grep -A 100 - | tail -n +2 | column -t  --output-separator ' | ' --separator ','
+  # Format output
+  echo "*---------*---------------*"
+  echo "| CHARSEL | " $1
+  echo "*---------*---------------*"
+  echo ""
+
+  cat $CHARFILE \
+    | sed -e '/^[ \t]*#/d' \
+    | grep -A 100 - \
+    | tail -n +2 \
+    | column -t -N input,output --output-separator ' | ' --separator ','
 
-  # Automatically enter input
-  read -N $LENGTH INPUT
+  echo ""
+  echo "*-------------------------*"
+  echo "| previous shorcode:" $INPUT
+  echo "| previous output:  " $OUTPUT
+  echo "*-------------------------*"
   
-  # Navigate to the right characther
-  LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE | grep -n $INPUT | cut -d : -f 1)
-  OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
-  # Clear screen
-  clear
+  # User input
+  read -p "| input shortcode:   " -N $LENGTH INPUT
+
+  # This can definately be simplifed, but it works fine
+  LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE \
+    | grep -wn $INPUT \
+    | cut -d : -f 1)
+  OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE \
+    | head -$LINENUMBER \
+    | tail +$LINENUMBER)
 
   # Copy output to clipboard
   echo $OUTPUT | xclip -selection clipboard
-done
 
-fi
+  # Clear screen
+  clear
+
+done