From 945d99cc1481ae52a8d3ce0a40be53675add6b91 Mon Sep 17 00:00:00 2001
From: Caleb Heuer <ch@raiguard.me>
Date: Fri, 9 Feb 2024 21:24:18 -0700
Subject: Change state files when the active git branch is changed

---
 harpoon.kak | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/harpoon.kak b/harpoon.kak
index b239da4..4b2388a 100644
--- a/harpoon.kak
+++ b/harpoon.kak
@@ -86,15 +86,9 @@ hook global BufCreate \*harpoon\* %{
 
 # State saving - save by PWD and git branch, if any
 
-declare-option str harpoon_state_file %sh{
-  git_branch=$(git -C "${kak_buffile%/*}" rev-parse --abbrev-ref HEAD 2>/dev/null)
-  state_file=$(printf "%s" "$PWD-$git_branch" | sed -e 's|_|__|g' -e 's|/|_-|g')
-  state_dir=${XDG_STATE_HOME:-~/.local/state}/kak/harpoon
-  mkdir -p $state_dir
-  echo $state_dir/$state_file
-}
+declare-option str harpoon_state_file
 
-hook global KakBegin .* %{
+define-command -hidden harpoon-load %{
   evaluate-commands %sh{
     if [ -f "$kak_opt_harpoon_state_file" ]; then
       printf "set-option global harpoon_files "
@@ -103,8 +97,11 @@ hook global KakBegin .* %{
   }
 }
 
-hook global KakEnd .* %{
+define-command -hidden harpoon-save %{
   evaluate-commands %sh{
+    if [ -z "$kak_opt_harpoon_state_file" ]; then
+      exit
+    fi
     if [ -z "$kak_quoted_opt_harpoon_files" ]; then
       rm -f "$kak_opt_harpoon_state_file"
       exit
@@ -112,3 +109,24 @@ hook global KakEnd .* %{
     printf "$kak_quoted_opt_harpoon_files" > "$kak_opt_harpoon_state_file"
   }
 }
+
+define-command -hidden harpoon-check %{
+  evaluate-commands %sh{
+    git_branch=$(git -C "${kak_buffile%/*}" rev-parse --abbrev-ref HEAD 2>/dev/null)
+    state_file=$(printf "%s" "$PWD-$git_branch" | sed -e 's|_|__|g' -e 's|/|_-|g')
+    state_dir=${XDG_STATE_HOME:-~/.local/state}/kak/harpoon
+    state_path="$state_dir/$state_file"
+    if [ "$state_path" != "$kak_opt_harpoon_state_file" ]; then
+      mkdir -p "$state_dir"
+      printf "%s\\n" "
+        harpoon-save
+        set-option global harpoon_state_file '$state_path'
+        harpoon-load
+      "
+    fi
+  }
+}
+
+hook global FocusIn .* harpoon-check
+hook global WinDisplay .* harpoon-check
+hook global KakEnd .* harpoon-save
-- 
cgit v1.2.3