Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(promotion): autorename session when promoting #32

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat(promotion): autorename session when promoting #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e940f4f
perf(promotion): pane swapping instead of joining
TheSast May 10, 2023
9ffd530
refactor(promotion): use IDs instead of names
TheSast May 10, 2023
829a032
feat(promotion): autorename session when promoting
TheSast May 10, 2023
4f49307
revert(promotion): removed "tmux" command check
TheSast May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scripts/helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ switch_to_session() {
local session_name="$1"
tmux switch-client -t "$session_name"
}

number_of_session_collisions() {
tmux -S "$(tmux_socket)" list-sessions | grep -c "$1"
# this is a temporary implementation, a session might have a similar name or have a name with a higher value than the number of collision
# I need help fixing those potential issues
}
30 changes: 20 additions & 10 deletions scripts/promote_pane.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,41 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_DIR/helpers.sh"

# global vars passed to the script as arguments
CURRENT_SESSION_NAME="$1"
CURRENT_SESSION_ID="$1"
CURRENT_PANE_ID="$2"
PANE_CURRENT_PATH="$3"
PANE_CURRENT_COMMAND="$3"
PANE_CURRENT_PATH="$4"

number_of_panes() {
tmux list-panes -s -t "$CURRENT_SESSION_NAME" |
tmux list-panes -s -t "$CURRENT_SESSION_ID" |
wc -l |
tr -d ' '
}

create_new_session() {
TMUX="" tmux -S "$(tmux_socket)" new-session -c "$PANE_CURRENT_PATH" -d -P -F "#{session_name}"
TMUX="" tmux -S "$(tmux_socket)" new-session -c "$PANE_CURRENT_PATH" -d -P -F "#{session_id}"
}

new_session_pane_id() {
local session_name="$1"
tmux list-panes -t "$session_name" -F "#{pane_id}"
local session_id="$1"
tmux list-panes -t "$session_id" -F "#{pane_id}"
}

rename_session_to_pane() {
local new_session_name="$PANE_CURRENT_COMMAND"
name_collisions="$(number_of_session_collisions "$new_session_name")"
[ "$name_collisions" -gt 0 ] &&
new_session_name="$new_session_name-$((name_collisions+1))"
tmux rename-session -t "$1" "$new_session_name"
}

promote_pane() {
local session_name="$(create_new_session)"
local new_session_pane_id="$(new_session_pane_id "$session_name")"
tmux join-pane -s "$CURRENT_PANE_ID" -t "$new_session_pane_id"
local session_id="$(create_new_session)"
local new_session_pane_id="$(new_session_pane_id "$session_id")"
tmux swap-pane -s "$CURRENT_PANE_ID" -t "$new_session_pane_id"
tmux kill-pane -t "$new_session_pane_id"
switch_to_session "$session_name"
rename_session_to_pane "$session_id"
switch_to_session "$session_id"
}

main() {
Expand Down
25 changes: 17 additions & 8 deletions scripts/promote_window.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,41 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_DIR/helpers.sh"

# global vars passed to the script as arguments
CURRENT_SESSION_NAME="$1"
CURRENT_SESSION_ID="$1"
CURRENT_WINDOW_ID="$2"
CURRENT_WINDOW_NAME="$3"
WINDOW_CURRENT_PATH="$4"

number_of_windows() {
tmux list-windows -t "$CURRENT_SESSION_NAME" |
tmux list-windows -t "$CURRENT_SESSION_ID" |
wc -l |
tr -d ' '
}

create_new_session() {
TMUX="" tmux -S "$(tmux_socket)" new-session -c "$WINDOW_CURRENT_PATH" -s "$CURRENT_WINDOW_NAME" -d -P -F "#{session_name}"
TMUX="" tmux -S "$(tmux_socket)" new-session -c "$WINDOW_CURRENT_PATH" -d -P -F "#{session_id}"
}

new_session_window_id() {
local session_name="$1"
tmux list-windows -t "$session_name" -F "#{window_id}"
local session_id="$1"
tmux list-windows -t "$session_id" -F "#{window_id}"
}

rename_session_to_window() {
local new_session_name="$CURRENT_WINDOW_NAME"
name_collisions="$(number_of_session_collisions "$new_session_name")"
[ "$name_collisions" -gt 0 ] &&
new_session_name="$new_session_name-$((name_collisions+1))"
tmux rename-session -t "$1" "$new_session_name"
}

promote_window() {
local session_name="$(create_new_session)"
local new_session_window_id="$(new_session_window_id "$session_name")"
local session_id="$(create_new_session)"
local new_session_window_id="$(new_session_window_id "$session_id")"
tmux swap-window -s "$CURRENT_WINDOW_ID" -t "$new_session_window_id"
tmux kill-window -t "$new_session_window_id"
switch_to_session "$session_name"
rename_session_to_window "$session_id"
switch_to_session "$session_id"
}

main() {
Expand Down
4 changes: 2 additions & 2 deletions sessionist.tmux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ set_promote_pane_binding() {
local key_bindings=$(get_tmux_option "$tmux_option_promote_pane" "$default_key_bindings_promote_pane")
local key
for key in $key_bindings; do
tmux bind "$key" run "$CURRENT_DIR/scripts/promote_pane.sh '#{session_name}' '#{pane_id}' '#{pane_current_path}'"
tmux bind "$key" run "$CURRENT_DIR/scripts/promote_pane.sh '#{session_id}' '#{pane_id}' '#{pane_current_command}' '#{pane_current_path}'"
done
}

Expand All @@ -67,7 +67,7 @@ set_promote_window_binding() {
local key_bindings=$(get_tmux_option "$tmux_option_promote_window" "$default_key_bindings_promote_window")
local key
for key in $key_bindings; do
tmux bind "$key" run "$CURRENT_DIR/scripts/promote_window.sh '#{session_name}' '#{window_id}' '#{window_name}' '#{pane_current_path}'"
tmux bind "$key" run "$CURRENT_DIR/scripts/promote_window.sh '#{session_id}' '#{window_id}' '#{window_name}' '#{pane_current_path}'"
done
}

Expand Down