Allow for configuring truncate size

matchai · Feb 6, 2018 · 5a6b489 · 5a6b489
1 parent 96a0f60
commit 5a6b489
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/functions/__sf_section_dir.fish b/functions/__sf_section_dir.fish
@@ -11,7 +11,7 @@ function __sf_section_dir
 	__sf_util_set_default SPACEFISH_DIR_SHOW true
 	# __sf_util_set_default SPACEFISH_DIR_PREFIX "in "
 	__sf_util_set_default SPACEFISH_DIR_SUFFIX $SPACEFISH_PROMPT_DEFAULT_SUFFIX
-	# __sf_util_set_default SPACEFISH_DIR_TRUNC 3
+	__sf_util_set_default SPACEFISH_DIR_TRUNC 3
 	__sf_util_set_default SPACEFISH_DIR_TRUNC_REPO true
 	__sf_util_set_default SPACEFISH_DIR_COLOR (set_color --bold cyan)
 
@@ -32,8 +32,7 @@ function __sf_section_dir
 	else
 	set -l realhome ~
 		set -l tmp (string replace -r '^'"$realhome"'($|/)' '~$1' $PWD)
-		# TODO: Use $SPACEFISH_DIR_TRUNC to change truncation length
-		set dir (string replace -r '^.+/(.+/.+/.+)' '$1' $tmp)
+		set dir (__sf_util_truncate_dir $tmp $SPACEFISH_DIR_TRUNC)
 	end
 
 	echo -e -n -s \

diff --git a/functions/__sf_util_truncate_dir.fish b/functions/__sf_util_truncate_dir.fish
@@ -0,0 +1,13 @@
+function __sf_util_truncate_dir -d "Truncate a directory path" -a path truncate_to
+    if test $truncate_to -eq 0
+        echo $path
+    else
+        set -l folders (string split / $path)
+
+        if test (count $folders) -le $truncate_to
+            echo $path
+        else
+            echo (string join / $folders[(math 0 - $truncate_to)..-1])
+        end
+    end        
+end