.bin/tmux-projectinator

@@ -5,73 +5,61 @@ set -o emacs
 bind '"\e": "\C-W\c-d"'
 
 OPEN_MODE="new_pane"
-CACHE_FILE=~/.cache/project_list
-
-# Close tmux popup if any and quit
-exit_script () {
-  tmux display-popup -C
-
-  exit $1
-}
 
 debug () {
-  if [ "$VERBOSE" = true ]; then
+    if [ "$VERBOSE" = true ]; then
-    echo $1
+        echo $1
-  fi
+    fi
 }
 
 spinner() {
   local s="⣾⣽⣻⢿⡿⣟⣯⣷"
   local -i i=0
   while :; do
-    printf "%s\\r" "${s:$((i++%8)):1}" >&2
+    printf "%s\\r" "${s:$((i++%4)):1}" >&2
     sleep .1
   done
 
 }
 
 open_local () {
-  # To avoid using pre-entered string in current buffer
+    # To avoid using pre-entered string in current buffer
-  tmux send-keys C-c
+    tmux send-keys C-c
-  tmux send-keys "cd $PROJECT_PATH" Enter
+    tmux send-keys "cd $PROJECT_PATH" Enter
 
-  exit_script 0
+    # Close tmux popup if any
+    tmux display-popup -C
 }
 
 open_new_pane () {
-  tmux has-session -t $SESSION_NAME 2>/dev/null
+    tmux has-session -t $SESSION_NAME 2>/dev/null
-  if [ $? != 0 ]; then
+    if [ $? != 0 ]; then
-    debug "Session $SESSION_NAME missing, creating it."
+        debug "Session $SESSION_NAME missing, creating it."
-    tmux new-session -s $SESSION_NAME -d -n $PROJECT_NAME -c $PROJECT_PATH
+        tmux new-session -s $SESSION_NAME -d -n $PROJECT_NAME -c $PROJECT_PATH
-  fi
+    fi
 
-  tmux has-session -t $SESSION_NAME:$PROJECT_NAME 2>/dev/null
+    tmux has-session -t $SESSION_NAME:$PROJECT_NAME 2>/dev/null
-  if [ $? != 0 ]; then
+    if [ $? != 0 ]; then
-    debug "Window $PROJECT_NAME in $SESSION_NAME not found, creating it."
+        debug "Window $PROJECT_NAME in $SESSION_NAME not found, creating it."
-    tmux new-window -t $SESSION_NAME -n $PROJECT_NAME -d -c $PROJECT_PATH
+        tmux new-window -t $SESSION_NAME -n $PROJECT_NAME -d -c $PROJECT_PATH
-  fi
+    fi
 
-  tmux switch-client -t $SESSION_NAME:$PROJECT_NAME
+    tmux switch-client -t $SESSION_NAME:$PROJECT_NAME
 
-  exit_script 0
+    # Close tmux popup if any
-}
+    tmux display-popup -C
-
-update_project_list_cache() {
-  PROJECT_LIST_UPDATE=$(find ~/* -name .git -type d -not -path "~/.*" -prune 2>/dev/null | sed 's/\/.git/\n/g' | sed "s/$(echo $HOME | sed 's/\//\\\//g')//" | cut -d'/' -f2-)
-
-  echo $PROJECT_LIST_UPDATE > $CACHE_FILE
 }
 
 while getopts "lv" option; do
-  debug "Reading option $option"
+    debug "Reading option $option"
-  case $option in
+    case $option in
-    l)
+        l)
-      OPEN_MODE="local"
+            OPEN_MODE="local"
-      ;;
+            ;;
-    v)
+        v)
-      VERBOSE=true
+            VERBOSE=true
-      ;;
+            ;;
-  esac
+    esac
 done
 
 declare -A CUSTOM_SESSIONS
@@ -80,28 +68,15 @@ CUSTOM_SESSIONS[Projects]=Halia
 spinner &
 spinner_pid=$!
 
-if [ ! -f "$CACHE_FILE" ]; then
+PROJECT_LIST=$(find ~/* -name .git -type d -not -path "~/.*" -prune 2>/dev/null)
-  debug "Start synchronous project list cache update"
-  update_project_list_cache
-else
-  debug "Start asynchronous project list cache update"
-  update_project_list_cache &
-fi
-
-PROJECT_LIST=$(cat $CACHE_FILE)
 
 kill $spinner_pid
 
-SELECTED=$(echo $PROJECT_LIST | tr ' ' '\n' | fzf)
+SELECTED=$(echo $PROJECT_LIST | sed 's/\/.git/\n/g' | sed "s/$(echo $HOME | sed 's/\//\\\//g')//" | cut -d'/' -f2- | fzf)
 
 debug "Selected $SELECTED"
 
-# Quit if nothing has been selected
+PROJECT_PATH=$(echo $PROJECT_LIST | sed 's/\/.git/\n/g' | grep "${SELECTED}$")
-if [ ! $SELECTED ]; then
-  exit_script 1
-fi
-
-PROJECT_PATH=$(realpath ~/${SELECTED})
 PROJECT_ROOT=$(echo $SELECTED | cut -d '/' -f1)
 PROJECT_NAME=$(echo $SELECTED | rev | cut -d '/' -f1 | rev)
 
@@ -111,10 +86,10 @@ debug "Project path is $PROJECT_PATH"
 debug "Opening in $OPEN_MODE"
 
 case $OPEN_MODE in
-  "new_pane")
+    "new_pane")
-    open_new_pane
+        open_new_pane
-    ;;
+        ;;
-  "local")
+    "local")
-    open_local
+        open_local
-    ;;
+        ;;
 esac