hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-04 15:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Relocate jupyter-write-connection-file

Browse source 
The function writes to `jupyter-runtime-directory` and does not depend on
anything in`jupyter-kernel-process-manager.el` so it is more appropriate in
`jupyter-env.el`.

* jupyter-env.el (jupyter-write-connection-file): New function.

* jupyter-kernel-process-manager.el (jupyter-write-connection-file): Remove.
This commit is contained in:
Nathaniel Nicandro 2020-04-04 13:26:35 -05:00
parent 187cb479c2
commit 02231066e1
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
jupyter-env.el
View file

@ -101,6 +101,28 @@ This function always returns the `file-local-name' of the path."
finally (error "No `python' found in search paths"))
(file-local-name path)))
(cl-defmethod jupyter-write-connection-file ((session jupyter-session) (obj jupyter-finalized-object))
"Write a connection file based on SESSION to `jupyter-runtime-directory'.
Return the path to the connection file.
Also register a finalizer on OBJ to delete the file when OBJ is
garbage collected. The file is also deleted when Emacs exits if
it hasn't been already."
(let* ((temporary-file-directory (jupyter-runtime-directory))
(json-encoding-pretty-print t)
(file (make-temp-file "emacs-kernel-" nil ".json"))
(kill-hook (lambda () (when (and file (file-exists-p file))
(delete-file file)))))
(add-hook 'kill-emacs-hook kill-hook)
(jupyter-add-finalizer obj
(lambda ()
(funcall kill-hook)
(remove-hook 'kill-emacs-hook kill-hook)))
(prog1 file
(with-temp-file file
(insert (json-encode-plist
(jupyter-session-conn-info session)))))))
(provide 'jupyter-env)
;;; jupyter-env.el ends here

24
jupyter-kernel-process-manager.el
View file

@ -150,30 +150,6 @@ argument of the process."
(or (null attribs)
(not (equal atime (nth 4 attribs))))))))
(defun jupyter-write-connection-file (session obj)
"Write a connection file based on SESSION to `jupyter-runtime-directory'.
Return the path to the connection file.
Also register a finalizer on OBJ to delete the file when OBJ is
garbage collected. The file is also deleted when Emacs exits if
it hasn't been already."
(cl-check-type session jupyter-session)
(cl-check-type obj jupyter-finalized-object)
(let* ((temporary-file-directory (jupyter-runtime-directory))
(json-encoding-pretty-print t)
(file (make-temp-file "emacs-kernel-" nil ".json"))
(kill-hook (lambda () (when (and file (file-exists-p file))
(delete-file file)))))
(add-hook 'kill-emacs-hook kill-hook)
(jupyter-add-finalizer obj
(lambda ()
(funcall kill-hook)
(remove-hook 'kill-emacs-hook kill-hook)))
(prog1 file
(with-temp-file file
(insert (json-encode-plist
(jupyter-session-conn-info session)))))))
(cl-defmethod jupyter-start-kernel ((kernel jupyter-spec-kernel) &rest _args)
(cl-destructuring-bind (_name . (resource-dir . spec)) (oref kernel spec)
;; FIXME: Cleanup old connection file on kernel restarts. They will be