Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrote trunc middle/right to use for loop

Browse Source
pull/22/head
Christo Kotze 7 years ago
parent 0acdc4e032
commit 38d7e60ae3
1 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File

88
powerlevel9k.zsh-theme
Unescape Escape View File

@ -723,52 +723,44 @@ set_default POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD false
# * $1 Alignment: string - left|right # * $1 Alignment: string - left|right
# * $2 Index: integer # * $2 Index: integer
prompt_dir() { prompt_dir() {
local current_dir="$(print -P '%~')" local current_path="$(print -P '%~')"
local paths local paths directory test_dir test_dir_length trunc_path threshhold
[[ current_dir != "/" ]] && paths=(${(s:/:)current_dir}) # only split if not root folder (( ${#current_path} > 1 )) && paths=(${(s:/:)current_path}) || paths=() # only split if not root/home folder
local cur_path cur_short_path directory dir_length cur_dir
if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then
set_default POWERLEVEL9K_SHORTEN_DELIMITER "\u2026" set_default POWERLEVEL9K_SHORTEN_DELIMITER "\u2026"
local delim=$(echo -n $POWERLEVEL9K_SHORTEN_DELIMITER) # convert delimiter from unicode to literal character if required local delim=$(echo -n $POWERLEVEL9K_SHORTEN_DELIMITER) # convert delimiter from unicode to literal character
case "$POWERLEVEL9K_SHORTEN_STRATEGY" in case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
truncate_middle) truncate_middle)
if [[ $current_dir != "/" ]]; then # root is an exception and won't have paths if (( ${#paths} > 0 )); then # root is an exception and won't have paths
[[ $current_dir == '~'* ]] && cur_short_path='' || cur_short_path='/' # if we are in the $HOME folder, we don't need starting /
local last_pos
local max_length=$(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH * 2 )) # has to be double the length for beginning / end count local max_length=$(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH * 2 )) # has to be double the length for beginning / end count
for directory in ${paths[@]} # go through all the paths local last_pos
do for (( i=1; i<${#paths}; i++ )); do
cur_dir=$directory test_dir=$paths[$i]
dir_length=${#cur_dir} test_dir_length=${#test_dir}
if (( $dir_length > $max_length )) && [[ $cur_dir != $paths[${#paths}] ]]; then # only shorten if long enough and not last path if (( $test_dir_length > $max_length )); then # only shorten if long enough
last_pos=$(( $dir_length - $POWERLEVEL9K_SHORTEN_DIR_LENGTH )) last_pos=$(( $dir_length - $POWERLEVEL9K_SHORTEN_DIR_LENGTH ))
cur_dir=${cur_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$delim${cur_dir:$last_pos:$dir_length} trunc_path+="${test_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$delim${test_dir:$last_pos:$test_dir_length}/"
else
trunc_path+="${test_dir}/"
fi fi
cur_short_path+="$cur_dir/"
done done
current_path="${cur_short_path: : -1}" # remove trailing slash current_path=$trunc_path${current_path:t}
else
current_path="/"
fi fi
;; ;;
truncate_from_right) truncate_from_right)
if [[ $current_dir != "/" ]]; then # root is an exception and won't have paths if (( ${#paths} > 0 )); then # root is an exception and won't have paths
[[ $current_dir == '~'* ]] && cur_short_path='' || cur_short_path='/' # if we are in the $HOME folder, we don't need starting / for (( i=1; i<${#paths}; i++ )); do
for directory in ${paths[@]} test_dir="$paths[$i]"
do test_dir_length=${#test_dir}
cur_dir=$directory threshhold=$(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH + ${#delim} ))
dir_length=${#cur_dir} if (( $test_dir_length > $threshhold )); then # only shorten if long enough
local threshhold=$(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH + ${#delim} )) trunc_path+="${test_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$delim/"
if (( $dir_length > $threshhold )) && [[ $dir_length != $POWERLEVEL9K_SHORTEN_DIR_LENGTH && $cur_dir != $paths[${#paths}] ]]; then # only shorten if long enough and not last path else
cur_dir=${cur_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$delim trunc_path+="${test_dir}/"
fi fi
cur_short_path+="$cur_dir/"
done done
current_path="${cur_short_path: : -1}" # remove trailing slash current_path=$trunc_path${current_path:t}
else
current_path="/"
fi fi
;; ;;
truncate_with_package_name) truncate_with_package_name)
@ -851,22 +843,24 @@ prompt_dir() {
truncate_to_unique) truncate_to_unique)
# for each parent path component find the shortest unique beginning # for each parent path component find the shortest unique beginning
# characters sequence. Source: https://stackoverflow.com/a/45336078 # characters sequence. Source: https://stackoverflow.com/a/45336078
cur_path='/' if (( ${#paths} > 0 )); then # root is an exception and won't have paths
cur_short_path='/' local matching
for directory in ${paths[@]} local cur_path='/'
do [[ $current_path != "~"* ]] && trunc_path='/' || trunc_path=''
cur_dir='' for directory in ${paths[@]}; do
for (( i=0; i<${#directory}; i++ )); do test_dir=''
cur_dir+="${directory:$i:1}" for (( i=0; i<${#directory}; i++ )); do
matching=("$cur_path"/"$cur_dir"*/) test_dir+="${directory:$i:1}"
if [[ ${#matching[@]} -eq 1 ]]; then matching=("$cur_path"/"$test_dir"*/)
break if [[ ${#matching[@]} -eq 1 ]]; then
fi break
fi
done
trunc_path+="$test_dir/"
cur_path+="$directory/"
done done
cur_short_path+="$cur_dir/" current_path="${trunc_path: : -1}"
cur_path+="$directory/" fi
done
current_path="${cur_short_path: : -1}"
;; ;;
*) *)
current_path="$(print -P "%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c")" current_path="$(print -P "%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c")"

Write Preview
Loading…
Cancel
Save