mirrors
/
ob-tmux
mirror of https://github.com/ahendriksen/ob-tmux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix inconsistency bug in create-window and send-keys 

Previously, if you had two sessions and wanted to target by index, a
new window would be created with the index as name. Nonetheless, the
command body would be sent to the window with the target index.

Test case:
echo hoi

echo hoi :session bug:=2 && date

Expected behaviour: date shows up on bug:b. no new window is created.

Actual behaviour: date shows up on bug:b. new window bug:"2" is
created.

Now the date shows up on bug:b and no new window is created.
hello-test
Allard Hendriksen 2018-07-16 11:54:30 +02:00
parent 26f738b8f9
commit 9b9c578c95
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ob-tmux.el
View File

@ -136,9 +136,7 @@ must be created."
"tmux"
"set-window-option"
"-t"
(concat (org-babel-tmux-session session)
":"
(org-babel-tmux-window-default session))
(org-babel-tmux-target-session session)
option
value))))
@ -161,9 +159,7 @@ to find the window again later."
"send-keys"
"-l"
"-t"
(concat (org-babel-tmux-session session)
":"
(org-babel-tmux-window-default session))
(org-babel-tmux-target-session session)
line
"\n"))))
@ -177,13 +173,17 @@ to find the window again later."
(defun org-babel-tmux-session (org-session)
"Extracts the tmux session from the org session string."
(concat org-babel-tmux-session-prefix
(car (split-string org-session ":"))))
(let* ((session (car (split-string org-session ":"))))
(concat org-babel-tmux-session-prefix
(if (string-empty-p session) "default" session))))
(defun org-babel-tmux-window (org-session)
"Extracts the tmux window from the org session string.
Can return nil if no window specified."
(cadr (split-string org-session ":")))
(let* ((window (cadr (split-string org-session ":"))))
(if (string-empty-p window) nil window)))
(defun org-babel-tmux-window-default (org-session)
"Extracts the tmux window from the org session string.
@ -192,10 +192,13 @@ Returns '1' if no window specified."
(if tmux-window tmux-window "1")))
(defun org-babel-tmux-target-session (org-session)
"Constructs a target-session from the org session string."
(concat (org-babel-tmux-session org-session)
":"
(org-babel-tmux-window-default org-session)))
"Constructs a tmux target from the org session string.
If no window is specified, use first window."
(let* ((target-session (org-babel-tmux-session org-session))
(window (org-babel-tmux-window org-session))
(target-window (if window (concat "=" window) "^")))
(concat target-session ":" target-window)))
(defun org-babel-tmux-session-alive-p (session)
"Check if SESSION exists by parsing output of \"tmux ls\"."
@ -205,17 +208,18 @@ Returns '1' if no window specified."
(seq-filter (lambda (x) (string-equal tmux-session x))
(split-string tmux-ls "\n")))))
(defun org-babel-tmux-window-alive-p (session)
"Check if WINDOW exists in tmux session."
(let* ((tmux-session (org-babel-tmux-session session))
(tmux-window (org-babel-tmux-window session))
(defun org-babel-tmux-window-alive-p (org-session)
"Check if WINDOW exists in tmux session.
If no window is specified in org-session, returns 't."
(let* ((tmux-window (org-babel-tmux-window org-session))
(tmux-target (org-babel-tmux-target-session org-session))
(tmux-lws (shell-command-to-string
(concat "tmux list-windows -F '#W' -t '"
tmux-session "'"))))
(concat "tmux list-panes -F 'yes_exists' -t '"
tmux-target "'"))))
(if tmux-window
(car
(seq-filter (lambda(x) (string-equal tmux-window x))
(split-string tmux-lws "\n")))
(progn
(string-equal "yes_exists\n" tmux-lws))
't)))
(defun org-babel-tmux-open-file (path)