From 6259b8ccc3b0e18c0ff5dc8989cf785b5055a71e Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Tue, 26 Dec 2023 11:54:58 -0800
Subject: [PATCH] Clean up, disable by default

---
 functions/_tide_item_jobs.fish                | 4 ++--
 functions/fish_prompt.fish                    | 8 ++++----
 functions/tide/configure/configs/classic.fish | 2 +-
 functions/tide/configure/configs/lean.fish    | 2 +-
 functions/tide/configure/configs/rainbow.fish | 2 +-
 tests/_tide_item_jobs.test.fish               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/functions/_tide_item_jobs.fish b/functions/_tide_item_jobs.fish
index 29762fb..2a02118 100644
--- a/functions/_tide_item_jobs.fish
+++ b/functions/_tide_item_jobs.fish
@@ -1,7 +1,7 @@
 function _tide_item_jobs
-    if test $_tide_jobs -gt $tide_jobs_threshold
+    set -q _tide_jobs && if test $_tide_jobs -ge $tide_jobs_number_threshold
         _tide_print_item jobs $tide_jobs_icon' ' $_tide_jobs
-    else if test $_tide_jobs -gt 0
+    else
         _tide_print_item jobs $tide_jobs_icon
     end
 end
diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index ed650de..1e4d584 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -38,7 +38,7 @@ if contains newline $_tide_left_items # two line prompt initialization
         eval "
 function fish_prompt
     _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
-        set -lx _tide_jobs (count (jobs))
+        jobs -q && jobs -p | count | read -lx _tide_jobs
         $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
 set _tide_parent_dirs \$_tide_parent_dirs
 PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" &
@@ -66,7 +66,7 @@ end"
         eval "
 function fish_prompt
     _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
-        set -lx _tide_jobs (count (jobs))
+        jobs -q && jobs -p | count | read -lx _tide_jobs
         $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
 set _tide_parent_dirs \$_tide_parent_dirs
 PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" &
@@ -98,7 +98,7 @@ else # one line prompt initialization
 function fish_prompt
     set -lx _tide_status \$status
     _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
-        set -lx _tide_jobs (count (jobs))
+        jobs -q && jobs -p | count | read -lx _tide_jobs
         $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
 set _tide_parent_dirs \$_tide_parent_dirs
 PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" &
@@ -125,7 +125,7 @@ end"
         eval "
 function fish_prompt
     _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint
-        set -lx _tide_jobs (count (jobs))
+        jobs -q && jobs -p | count | read -lx _tide_jobs
         $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus
 set _tide_parent_dirs \$_tide_parent_dirs
 PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" &
diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish
index d2bb8dc..8973cbc 100644
--- a/functions/tide/configure/configs/classic.fish
+++ b/functions/tide/configure/configs/classic.fish
@@ -46,7 +46,7 @@ tide_java_bg_color 444444
 tide_java_color ED8B00
 tide_jobs_bg_color 444444
 tide_jobs_color $_tide_color_dark_green
-tide_jobs_threshold 1
+tide_jobs_number_threshold 1000
 tide_kubectl_bg_color 444444
 tide_kubectl_color 326CE5
 tide_left_prompt_frame_enabled true
diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish
index c41a297..a958a17 100644
--- a/functions/tide/configure/configs/lean.fish
+++ b/functions/tide/configure/configs/lean.fish
@@ -46,7 +46,7 @@ tide_java_bg_color normal
 tide_java_color ED8B00
 tide_jobs_bg_color normal
 tide_jobs_color $_tide_color_dark_green
-tide_jobs_threshold 1
+tide_jobs_number_threshold 1000
 tide_kubectl_bg_color normal
 tide_kubectl_color 326CE5
 tide_left_prompt_frame_enabled false
diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish
index 6932192..60c1592 100644
--- a/functions/tide/configure/configs/rainbow.fish
+++ b/functions/tide/configure/configs/rainbow.fish
@@ -46,7 +46,7 @@ tide_java_bg_color ED8B00
 tide_java_color 000000
 tide_jobs_bg_color 444444
 tide_jobs_color 4E9A06
-tide_jobs_threshold 1
+tide_jobs_number_threshold 1000
 tide_kubectl_bg_color 326CE5
 tide_kubectl_color 000000
 tide_left_prompt_frame_enabled true
diff --git a/tests/_tide_item_jobs.test.fish b/tests/_tide_item_jobs.test.fish
index 89cd53d..2dca381 100644
--- a/tests/_tide_item_jobs.test.fish
+++ b/tests/_tide_item_jobs.test.fish
@@ -5,7 +5,7 @@ set _tide_jobs 0
 _tide_decolor (_tide_item_jobs) # CHECK:
 
 set -lx tide_jobs_icon 
-set -lx tide_jobs_threshold 1
+set -lx tide_jobs_number_threshold 1000
 set _tide_jobs 1
 _tide_decolor (_tide_item_jobs) # CHECK: 