Merge pull request #186 from b4b4r07/babarot/log-logic

Update log structure logic

Author: b4b4r07

conf.d/enhancd.fish

@@ -22,7 +22,7 @@ function __enhancd_install --on-event enhancd_install
 
     set -Ux ENHANCD_COMPLETION_KEYBIND "^I"
 
-    set -Ux _ENHANCD_VERSION "2.3.0"
+    set -Ux _ENHANCD_VERSION "2.3.1"
 
     # Set the filters if empty
     set -Ux ENHANCD_FILTER "fzy:fzf:peco:percol:sk:zf:gof:selecta"

functions/_enhancd_filepath_walk.fish

@@ -1,8 +1,7 @@
 function _enhancd_filepath_walk
-    if not set -q argv[1]
-        set argv[1] $PWD
-    end
+    set -a dirs ($PWD _enhancd_filepath_get_parent_dirs)
 
-    command find "$argv[1]" -maxdepth 1 -type d \
-        | _enhancd_command_grep -v "\/\."
+    for dir in $dirs
+        command find "$dir" -maxdepth 1 -type d -name '\.*' -prune -o -type d -print
+    end
 end

functions/_enhancd_history_exists.fish

@@ -0,0 +1,9 @@
+function _enhancd_history_exists
+    if not set -q argv[1]
+        return 1
+    else
+        set dir $argv[1]
+    end
+
+    _enhancd_history_open | _enhancd_command_grep "$dir" ^/dev/null >/dev/null
+end

functions/_enhancd_history_update.fish

@@ -1,7 +1,6 @@
 function _enhancd_history_update
     function sub
-        _enhancd_filepath_get_parent_dirs | _enhancd_filter_reverse
-        _enhancd_filepath_walk
+        _enhancd_history_exists; or _enhancd_filepath_walk
         _enhancd_history_open
         echo "$HOME"
     end
@@ -10,4 +9,4 @@ function _enhancd_history_update
         | _enhancd_filter_unique \
         | _enhancd_filter_reverse
     _enhancd_filepath_current_dir
-end
+end

init.sh

@@ -17,7 +17,7 @@ export ENHANCD_COMPLETION_DEFAULT
 export ENHANCD_COMPLETION_KEYBIND="${ENHANCD_COMPLETION_KEYBIND:-^I}"
 export ENHANCD_COMPLETION_BEHAVIOR="${ENHANCD_COMPLETION_BEHAVIOR:-default}"
 
-export _ENHANCD_VERSION="2.3.0"
+export _ENHANCD_VERSION="2.3.1"
 
 if [[ -n ${BASH_VERSION} ]]; then
   # BASH

src/cd.sh

@@ -23,36 +23,42 @@ __enhancd::cd()
       "${ENHANCD_HYPHEN_ARG}")
         # If a hyphen is passed as the argument,
         # searchs from the last 10 directory items in the log
-        args+=( "$(__enhancd::sources::mru "${2}" | __enhancd::filter::interactive)" )
+        args+=( "$(__enhancd::sources::mru | __enhancd::filter::interactive)" )
         code=${?}
+        break
         ;;
       "-")
         # When $ENHANCD_HYPHEN_ARG is configured,
         # this behaves like `cd -`
         args+=( "${OLDPWD}" )
+        break
         ;;
       "${ENHANCD_DOT_ARG}")
         # If a double-dot is passed as the argument,
         # it behaves like a zsh-bd plugin
         # In short, you can jump back to a specific directory,
         # without doing `cd ../../..`
-        args+=( "$(__enhancd::sources::parent_dirs "${2}" | __enhancd::filter::interactive)" )
+        args+=( "$(__enhancd::sources::parent_dirs | __enhancd::filter::interactive)" )
         code=${?}
+        break
         ;;
       "..")
         # When $ENHANCD_DOT_ARG is configured,
         # ".." is passed to builtin cd
         args+=( ".." )
+        break
         ;;
       "${ENHANCD_HOME_ARG}")
         args+=( "$(__enhancd::sources::home | __enhancd::filter::interactive)" )
         code=${?}
+        break
         ;;
       --)
         opts+=( "${1}" )
         shift
         args+=( "$(__enhancd::sources::history "${1}" | __enhancd::filter::interactive)" )
         code=${?}
+        break
         ;;
       -* | --*)
         if __enhancd::helper::is_default_flag "${1}"; then

src/filepath.sh

@@ -1,17 +1,26 @@
 # Currently this is not used
 __enhancd::filepath::split()
 {
-  __enhancd::command::awk -f "$ENHANCD_ROOT/functions/enhancd/lib/split.awk" -v arg="${1:-$PWD}"
+  __enhancd::command::awk -f "${ENHANCD_ROOT}/functions/enhancd/lib/split.awk" -v arg="${1:-$PWD}"
 }
 
 __enhancd::filepath::get_parent_dirs()
 {
-  __enhancd::command::awk -f "$ENHANCD_ROOT/functions/enhancd/lib/step_by_step.awk" -v dir="${1:-$PWD}"
+  __enhancd::command::awk -f "${ENHANCD_ROOT}/functions/enhancd/lib/step_by_step.awk" -v dir="${1:-$PWD}"
 }
 
 __enhancd::filepath::walk()
 {
-  command find "${1:-$PWD}" -maxdepth 1 -type d -name '\.*' -prune -o -type d -print
+  local -a dirs
+
+  # __enhancd::filepath::get_parent_dirs does not return $PWD itself
+  # so add it to array expressly
+  dirs=( "${PWD}" $(__enhancd::filepath::get_parent_dirs "${1:-${PWD}}") )
+
+  for dir in "${dirs[@]}"
+  do
+    command find "${dir}" -maxdepth 1 -type d -name '\.*' -prune -o -type d -print
+  done
 }
 
 __enhancd::filepath::current_dir()

src/history.sh

@@ -7,6 +7,16 @@ __enhancd::history::open()
   return 1
 }
 
+__enhancd::history::exists()
+{
+  local dir="${1}"
+  if [[ -z ${dir} ]]; then
+    return 1
+  fi
+
+  __enhancd::history::open | __enhancd::command::grep "${dir}" &>/dev/null
+}
+
 __enhancd::history::list()
 {
   __enhancd::history::open \
@@ -20,8 +30,7 @@ __enhancd::history::list()
 __enhancd::history::update()
 {
   {
-    __enhancd::filepath::get_parent_dirs | __enhancd::filter::reverse
-    __enhancd::filepath::walk
+    __enhancd::history::exists "${PWD}" || __enhancd::filepath::walk
     __enhancd::history::open
     echo "${HOME}"
   } | __enhancd::filter::reverse  | __enhancd::filter::unique  | __enhancd::filter::reverse