From: Ihor Radchenko <yantar92@posteo.net>
To: Jack Kamm <jackkamm@gmail.com>
Cc: Nasser Alkmim <nasser.alkmim@gmail.com>, emacs-orgmode@gnu.org
Subject: Re: Async Python src block behavior with :dir header property
Date: Sun, 04 Feb 2024 16:30:56 +0000 [thread overview]
Message-ID: <87y1c019a7.fsf@localhost> (raw)
In-Reply-To: <87bk8x81g3.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
Jack Kamm <jackkamm@gmail.com> writes:
> I updated the patch for `org-babel-comint-async-filter' to follow the
> same approach, setting default-directory based on the session buffer's
> value rather than the :dir header arg.
Thanks!
Attaching the two patches combined with some fixed to my patch.
Please check if these two patches solve the discussed bug.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-babel-execute-src-block-Force-dir-according-to-l.patch --]
[-- Type: text/x-patch, Size: 1946 bytes --]
From 66bbac4207d7132ebc9f91f60384809ae556c2ef Mon Sep 17 00:00:00 2001
Message-ID: <66bbac4207d7132ebc9f91f60384809ae556c2ef.1707064153.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Sat, 3 Feb 2024 16:47:57 +0100
Subject: [PATCH 1/2] org-babel-execute-src-block: Force :dir according to live
session
* lisp/ob-core.el (org-babel-execute-src-block): Force eval directory
to follow live session buffer, if any. This is consistent with what
we promise in the manual section "16.4 Environment of a Code
Block">Choosing a working directory.
Link: https://orgmode.org/list/87mssi8ht2.fsf@gmail.com
---
lisp/ob-core.el | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 1de3af6ad..fd8d06c5d 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -840,14 +840,17 @@ (defun org-babel-execute-src-block (&optional arg info params executor-type)
(dir (cdr (assq :dir params)))
(mkdirp (cdr (assq :mkdirp params)))
(default-directory
- (cond
- ((not dir) default-directory)
- ((member mkdirp '("no" "nil" nil))
- (file-name-as-directory (expand-file-name dir)))
- (t
- (let ((d (file-name-as-directory (expand-file-name dir))))
- (make-directory d 'parents)
- d))))
+ (cond
+ ((not dir) default-directory)
+ ((when-let ((session (cdr (assq :session params))))
+ (when (org-babel-comint-buffer-livep session)
+ (buffer-local-value 'default-directory (get-buffer session)))))
+ ((member mkdirp '("no" "nil" nil))
+ (file-name-as-directory (expand-file-name dir)))
+ (t
+ (let ((d (file-name-as-directory (expand-file-name dir))))
+ (make-directory d 'parents)
+ d))))
(cmd (intern (concat "org-babel-execute:" lang)))
result exec-start-time)
(unless (fboundp cmd)
--
2.43.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-ob-comint-Make-file-results-from-async-sessions-resp.patch --]
[-- Type: text/x-patch, Size: 2635 bytes --]
From e9765a146bf27e6769a2563862d52b0efb77eb2e Mon Sep 17 00:00:00 2001
Message-ID: <e9765a146bf27e6769a2563862d52b0efb77eb2e.1707064153.git.yantar92@posteo.net>
In-Reply-To: <66bbac4207d7132ebc9f91f60384809ae556c2ef.1707064153.git.yantar92@posteo.net>
References: <66bbac4207d7132ebc9f91f60384809ae556c2ef.1707064153.git.yantar92@posteo.net>
From: Jack Kamm <jackkamm@gmail.com>
Date: Wed, 31 Jan 2024 20:06:00 -0800
Subject: [PATCH 2/2] ob-comint: Make file results from async sessions respect
:dir header
* lisp/ob-comint.el (org-babel-comint-async-filter): Set
default-directory before calling `org-babel-insert-result'
https://list.orgmode.org/875xz9o4nj.fsf@localhost/T/#t
---
lisp/ob-comint.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 7d258ea0e..349524701 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -224,6 +224,8 @@ (defun org-babel-comint-async-filter (string)
(file-callback org-babel-comint-async-file-callback)
(combined-string (concat org-babel-comint-async-dangling string))
(new-dangling combined-string)
+ ;; Assumes comint filter called with session buffer current
+ (session-dir default-directory)
;; list of UUID's matched by `org-babel-comint-async-indicator'
uuid-list)
(with-temp-buffer
@@ -248,7 +250,8 @@ (defun org-babel-comint-async-filter (string)
(let* ((info (org-babel-get-src-block-info))
(params (nth 2 info))
(result-params
- (cdr (assq :result-params params))))
+ (cdr (assq :result-params params)))
+ (default-directory session-dir))
(org-babel-insert-result
(funcall file-callback
(nth
@@ -291,7 +294,8 @@ (defun org-babel-comint-async-filter (string)
(let* ((info (org-babel-get-src-block-info))
(params (nth 2 info))
(result-params
- (cdr (assq :result-params params))))
+ (cdr (assq :result-params params)))
+ (default-directory session-dir))
(org-babel-insert-result
res-str result-params info))
t))))
--
2.43.0
[-- Attachment #4: Type: text/plain, Size: 224 bytes --]
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
next prev parent reply other threads:[~2024-02-04 16:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-31 7:29 Async Python src block behavior with :dir header property Nasser Alkmim
2024-01-31 11:23 ` Ihor Radchenko
2024-01-31 12:17 ` Nasser Alkmim
2024-01-31 12:47 ` Ihor Radchenko
2024-01-31 15:00 ` Nasser Alkmim
2024-01-31 16:21 ` Ihor Radchenko
2024-02-01 4:16 ` Jack Kamm
2024-02-01 8:40 ` Nasser Alkmim
2024-02-01 11:59 ` Ihor Radchenko
2024-02-03 1:20 ` Jack Kamm
2024-02-03 15:51 ` Ihor Radchenko
2024-02-04 1:26 ` Jack Kamm
2024-02-04 16:30 ` Ihor Radchenko [this message]
2024-02-05 0:59 ` Jack Kamm
2024-02-05 14:10 ` Ihor Radchenko
2024-02-06 6:56 ` Jack Kamm
2024-02-06 14:06 ` Ihor Radchenko
2024-02-08 3:08 ` Jack Kamm
2024-02-08 15:43 ` Ihor Radchenko
2024-02-08 17:46 ` Bruno Barbier
2024-02-10 18:14 ` Jack Kamm
2024-02-10 21:01 ` Ihor Radchenko
2024-02-13 9:43 ` Nasser Alkmim
2024-02-13 14:31 ` Ihor Radchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y1c019a7.fsf@localhost \
--to=yantar92@posteo.net \
--cc=emacs-orgmode@gnu.org \
--cc=jackkamm@gmail.com \
--cc=nasser.alkmim@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).