X-Git-Url: https://git.armaanb.net/?p=charsel.git;a=blobdiff_plain;f=charsel;h=6e687e681f7c54bfe9d6915e34b6f4f456249765;hp=0934f5e7b18032a2dfdcd2a315acd5a66db7c1c8;hb=5a438f89bca0f0d143ece98d3aa149d97a354702;hpb=ff6d9004a8d4c5b745a11aa4304bd6fa52379c19

diff --git a/charsel b/charsel
index 0934f5e..6e687e6 100755
--- a/charsel
+++ b/charsel
@@ -1,80 +1,215 @@
 #!/usr/bin/env bash
 
-# Merge both global and local charfiles
-CHARDIR=~/.cache/charsel
+#######################################################################
 
-if [[ ! -d $CHARDIR ]]
+# (C) Copyright Armaan Bhojwani, 2020
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+########################################################################
+
+VERSION=2.0.1
+
+# Define argument functions
+function usage() {
+  echo "Usage: /usr/bin/charsel [OPTION]... [CHARFILE]...
+A simple terminal character selector
+  -h              show this message
+  -l              show installed charfiles
+  -d              show readme
+  -v              print version
+  -c              check charfile validity
+      --all       include hidden shortcodes
+
+Exit status:
+  0    okay,
+  1    charfile does not exist,
+  2    charfile syntax error,
+  3    usage error/invalid option,
+  4    other error"
+}
+
+CHARDIR=$HOME/.cache/charsel
+function list() {
+  echo "The following charfiles are installed:"
+  ls $CHARDIR/charfiles
+}
+
+function readme() {
+  cat /usr/share/doc/charsel/README.md
+}
+
+function missing_charfile() {
+  echo "The selected charfile is missing or invalid"
+  list
+  exit 1
+}
+
+# Merge global and local charfiles
+if [[ -d $CHARDIR ]]
 then
-  mkdir $CHARDIR/
-elif [[ ! "$(ls -A $CHARDIR)" ]]
+  rm -rf $CHARDIR/*
+else
+  mkdir $CHARDIR
+fi
+
+LOCALCHARDIR=$HOME/.local/share/charsel/charfiles
+if [[ ! -d $LOCALCHARDIR ]]
 then
-  cp -rf /usr/share/charsel/- $CHARDIR/
-  cp -rf ~/.local/share/charsel/- $CHARDIR/
+  mkdir -p $LOCALCHARDIR
 fi
 
-# Check for user inputs
-if [[ $1 == "list" ]]
+localdirfiles=($LOCALCHARDIR/*)
+if [[ ! -z "${#localdirfiles[*]}" ]]
 then
-  echo "The following charfiles are installed"
-  ls $CHARDIR/charfiles
-  exit 0
-elif [[ $1 == "help" \
-  || $1 == "-h" \
-  || $1 == "--help" \
-  || $# -ne 1 ]]
+  cp -rf $LOCALCHARDIR/../* $CHARDIR
+fi
+
+globaldirfiles=($/usr/share/charfiles/)
+if [[ ! -z "${#globaldirfiles[*]}" ]]
 then
-  cat /usr/share/doc/charsel/README.md
-  exit 0
+  cp -rf /usr/share/charsel/* $CHARDIR
 fi
 
-# Define charfile path
-CHARFILE=$CHARDIR/charfiles/$1
+# Check if charfile exists
+CHARFILE="$CHARDIR/charfiles/$2"
+function existence() {
+  if [[ ! -f $CHARFILE ]]
+  then
+    missing_charfile
+  fi
+}
+
+# VERY basic syntax check
+function validity() {
+  if [[ $(grep , $CHARFILE && grep - $CHARFILE) ]]
+  then
+    echo "valid charfile"
+  else
+    existence
+    echo "invalid charfile"
+    exit 2
+  fi
+}
+
+# Look for arguments
+while getopts ":lchdv" arg
+do
+  case ${arg} in
+    h)
+      usage
+      exit 0
+      ;;
+    l)
+      list
+      exit 0
+      ;;
+    d)
+      readme
+      exit 0
+      ;;
+    v)
+      echo "charsel" $VERSION
+      exit 0
+      ;;
+    c)
+      validity
+      exit 0
+      ;;
+    ?)
+      echo "Invalid option"
+      usage
+      exit 3
+      ;;
+    :)
+      break
+      ;;
+  esac
+done
+shift $((OPTIND-1))
 
-if [[ ! -f $CHARFILE ]]
+# Redefine charfile and check file validity
+CHARFILE="$CHARDIR/charfiles/$1"
+existence
+validity
+
+# Dependency check
+if [[ -x xclip ]]
 then
-  echo "Please enter a valid charfile. You can list installed charfiles with \`charsel list\`"
-  exit 1
+  echo "Please install xclip."
+  exit 4
 fi
 
-# Define length of shortcut
+# Define length of shortcode
 LENGTH=$(cat $CHARFILE \
   | cut -f 1 -d ',' -s \
   | wc -L \
   | cut -b 1)
 
-# Clear screen
 clear
 
 # Main program
-while :
+while true
 do
-  # Format charfile into table, showing only the shortcuts below the divider in the charfile
-  cat $CHARFILE \
-    | grep -A 100 - \
-    | tail -n +2 \
-    | column -t -N input,output --output-separator ' | ' --separator ','
-
-  # Display previous
-  echo "--------------------------"
-  echo "previous shorcode:" $INPUT
-  echo "previous output:  " $OUTPUT
-  echo "--------------------------"
+  # Format output
+  echo "*---------*---------------*"
+  echo "| CHARSEL |" $1
+  echo "*---------*---------------*"
+  echo ""
+
+  if [[ $2 == "--all" ]]
+  then
+    cat $CHARFILE | sed -e '/^[ \t]*#/d' | tail -n +2 \
+      | column -t -N input,output --output-separator ' | ' --separator ','
+  else
+    cat $CHARFILE | sed -e '/^[ \t]*#/d' | grep -A 100 - | tail -n +2 \
+      | column -t -N input,output --output-separator ' | ' --separator ','
+  fi
+
+  echo ""
+  echo "*-------------------------*"
+  echo "| previous shorcode:" $INPUT
+  echo "| previous output:  " $OUTPUT
+  echo "*-------------------------*"
 
   # User input
-  read -p "input shortcode:   " -N $LENGTH INPUT
+  read -p "| input shortcode:   " -N $LENGTH INPUT
+
+  if [[ $INPUT == ";"* ]] # Semicolon exits
+  then
+    clear
+    exit 0
+  elif [[ $INPUT == " "* ]]  # Spaces dont count
+  then
+    OUTPUT=""
+    clear
+  else
+    # Finds line number of shortcode
+    LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE | grep -wn $INPUT | cut -d : -f 1)
 
-  # 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)
+    # Outputs character selected above
+    OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
 
-  # Copy output to clipboard
-  echo $OUTPUT | xclip -selection clipboard
+    # Check to see if the shortcode actually exists
+    if [[ $(cut -f 1 -d ',' -s $CHARFILE | grep -wnc $INPUT) == "0" ]]
+    then
+      OUTPUT=""
+    fi
 
-  # Clear screen
-  clear
+    # Copy output to clipboard
+    echo $OUTPUT | xclip -selection clipboard
 
+    clear
+  fi
 done