mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

eshell-detach: Add support for attaching

master
Pierre Neidhardt 2017-11-09 16:32:53 +01:00
parent 212f052434
commit e2762dd785
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.emacs.d/lisp/package-eshell-detach.el
View File

@ -28,7 +28,7 @@ The end command will be
\"`eshell-detach-shell' -c { { <command>; } > >(tee stdout) } 2> >(tee stderr) | tee stdout+stderr\"")
;; TODO: Set the detach character?
;; TODO: Set the detach character? No need when `C-c C-c` suffices.
(defvar eshell-detach-detach-character "^\\"
"Charcter to press to detach dtach, i.e. leave the process run in the background.
The character syntax follows terminal notations, not Emacs.")
@ -36,6 +36,9 @@ The character syntax follows terminal notations, not Emacs.")
(defvar eshell-detach-detach-character-binding "C-\\"
"The Emacs binding matching `eshell-detach-detach-character'.")
(defvar eshell-detach-socket-ext ".socket"
"The file name extension for the socket fo `eshell-detach-program'.")
(defvar eshell-detach-stdout-ext ".stdout"
"If non-nil and a string, stdout will also be saved to file named after the socket with this extension appened.
The 'tee' program is required.")
@ -62,12 +65,14 @@ The 'tee' program is required.")
(let* (
;; TODO: temp-file should not exist for dtach to start? That forces us
;; to use make-temp-file which is vulnerable to race condition.
(socket (make-temp-name
(expand-file-name
(concat "dtach-"
(replace-regexp-in-string "[^A-Za-z0-9=-]" "_" input)
"-" (format-time-string "%F-%R:%S") "-")
eshell-detach-directory)))
(socket (concat
(make-temp-name
(expand-file-name
(concat "dtach-"
(replace-regexp-in-string "[^A-Za-z0-9=-]" "_" input)
"-" (format-time-string "%F-%R:%S") "-")
eshell-detach-directory))
eshell-detach-socket-ext))
(stdout (if eshell-detach-stdout-ext (concat socket eshell-detach-stdout-ext) nil))
(stderr (if eshell-detach-stderr-ext (concat socket eshell-detach-stderr-ext) nil))
(stdout+stderr (if eshell-detach-stdout+stderr-ext (concat socket eshell-detach-stdout+stderr-ext) nil))
@ -84,6 +89,26 @@ The 'tee' program is required.")
(shell-quote-argument (or stdout+stderr "")))))
(format "%s -c %s -z %s -c %s" eshell-detach-program socket eshell-detach-shell (shell-quote-argument commandline))))
(defun eshell-detach--list-sockets ()
"List sockets of `eshell-detach-program'."
(file-expand-wildcards (concat
(expand-file-name "dtach-"
eshell-detach-directory)
"*" eshell-detach-socket-ext)))
(defun eshell-detach-attach ()
"Attach to a running session of `eshell-detach-program'."
(interactive)
(let ((socket (completing-read "Attach to session: " (eshell-detach--list-sockets) nil t)))
(when socket
(when (or (eshell-interactive-process)
(/= (point) eshell-last-output-end))
(eshell-interrupt-process))
(goto-char (point-max))
;; TODO: Redraw method?
(insert eshell-detach-program " -a " (shell-quote-argument socket))
(eshell-send-input))))
;;; This is almost an exact copy of `eshell-send-input'.
(defun eshell-detach-send-input (&optional use-region queue-p no-newline)
"Send the input received to Eshell for parsing and processing.