From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id aCemLljfXmYNOwEAqHPOHw:P1 (envelope-from ) for ; Tue, 04 Jun 2024 11:33:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id aCemLljfXmYNOwEAqHPOHw (envelope-from ) for ; Tue, 04 Jun 2024 11:33:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=dyJSNVRC; dmarc=pass (policy=none) header.from=posteo.net; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717493592; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CdmyqbPkda3u2k211Ubj2KcSJLdRN3EPoIGLMyFnh5Y=; b=Ww2JQYkXv9rNLmd1z+M31VvNauV43Nc3hvWTc8amTFETwg+h0+3rguO6v1qoARVJn2n7vO eNYjm4Olat9BDEMUKv8IonCFfyyL093XnQnZ4s98t2dIGsXZdu/JWzMUvRrR6n/9mNY63I yjJG86v77xFeGUgd7GFPoxwsrYBSUsY39zFn3K9sbhQOsu5kEMAb4cA3Og+O6Tm7r7nmPC DDsjg4nECeyIhSfdfMikHQvBAg/Xf7zLCAamITK/FMwOGG9KJulIQJMJeMhnHS68DblH/6 YKFhYVAca2tTSBZHIFN7jPjUH34mRx9kQA7rzE/kdFsxZ9GpCxn4zDbulNqxsg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717493592; a=rsa-sha256; cv=none; b=PSk5+35gqTYHkO/aDSswh8sEYkC3ykWA3pOf6dDodx8ygPDtFvuixcEv7M2+iJhDACKg6J t26YeZtH6SvQDXOGw3w3fO3pkWCdmj5QTTA9LgunWMlZ4yn5nIR/j1iEIds5frjmcKZ/v6 z7Y+Q9KZH2aybaq81y5961/vaHX6Dcd6KcnJW4gLgQOhXDaO0ZFr9nphoqfnPYhvQyt1Iz t2PYALrw1nbcPTTMiocCaXRg7Vk/FIR+trTZuZ4PxcpxPry8Tz5JG202YIccfZBXpIPrS3 +4ybniu8bJ281GInGcWHejuZlciU7TbpmMZKWjmLZDE1NwrO7KNT2hJdIA+XJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=dyJSNVRC; dmarc=pass (policy=none) header.from=posteo.net; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 776443F803 for ; Tue, 04 Jun 2024 11:33:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEQWj-0004HL-Pr; Tue, 04 Jun 2024 05:32:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEQWX-0004Ft-7c for emacs-orgmode@gnu.org; Tue, 04 Jun 2024 05:32:10 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEQWU-00080n-Gm for emacs-orgmode@gnu.org; Tue, 04 Jun 2024 05:32:09 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E4EB0240027 for ; Tue, 4 Jun 2024 11:32:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717493523; bh=QMTveXF82v6unh6T6N+FdZ7G0AvStFtcwqyj1hs9iF4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=dyJSNVRCKYf6mm/r+A1iRfDds1d0yJldRjZZ3VdBYOq3QT2NzDHrZKGmKoflBweB/ SKwHSDKiGnnZtxyUQ6Pr/cem0mERSZPDAevN2qqBALVZyHScPbOZuSmYIXTob43UZa vU1DKWwtQIhuvdri9w4VW9dMeyr+5tUZurnZApy1azenMln10ikTr+fDokJC9pu7R2 7i8sqpcBUFTXE6Bw4oS8Rvl//sFBdRcZIv4z+QI/a7CtuRELa8XfqUe9yAbWOkhD1O vJVDfguv0i8I47YObWVEPqqpCbDEfkBTM35JIMndMUn/BKgnjLchg39/GkuPjLrY5b LPNnmXN6Q3new== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Vtljb0T7Fz9rxV; Tue, 4 Jun 2024 11:32:03 +0200 (CEST) From: Ihor Radchenko To: Karthik Chikmagalur Cc: emacs-orgmode@gnu.org Subject: Re: [BUG] Attachments not resolved correctly from symlinked Org files In-Reply-To: <87seyydnf7.fsf@localhost> References: <87ttjl8cf9.fsf@gmail.com> <87h6fjz07g.fsf@localhost> <875xvxk1bj.fsf@gmail.com> <87seyydnf7.fsf@localhost> Date: Tue, 04 Jun 2024 09:33:43 +0000 Message-ID: <87mso1oxvs.fsf@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=yantar92@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.56 X-Spam-Score: -6.56 X-Migadu-Queue-Id: 776443F803 X-Migadu-Scanner: mx11.migadu.com X-TUID: r1qivUDrDmpY --=-=-= Content-Type: text/plain Ihor Radchenko writes: > What about the approach we already use in > `org-attach-id-to-path-function-list' - check if an attachment directory > already exists, generated using any rule, and only if not, create a new? > > Similarly, in `org-attach-dir', we can first check local attachment > directory and return it if it exists. Then, we check attachment > directory for the symlink source, and return it when it exists. > If none exists, create attachment locally or relative to the symlink > source, according to some customization. The default will be creating > locally, to follow the existing behavior. See the attached tentative patch. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-org-attach-dir-from-id-Search-existing-attachments-f.patch >From add9e512fa80e53bfa396ebc4d0bdf35b3bee089 Mon Sep 17 00:00:00 2001 Message-ID: From: Ihor Radchenko Date: Tue, 4 Jun 2024 11:30:44 +0200 Subject: [PATCH] org-attach-dir-from-id: Search existing attachments for symlinks * lisp/org-attach.el (org-attach-dir-from-id): When current buffer displays a symlinked file, search for existing attachments in the original file dir. * etc/ORG-NEWS (=org-attach= now considers symlinked files when searching pre-existing attach dirs): Announce the change. Reported-by: Karthik Chikmagalur Link: https://orgmode.org/list/87seyydnf7.fsf@localhost --- etc/ORG-NEWS | 8 ++++++++ lisp/org-attach.el | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 4b0b77ca8..4ac88f139 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -41,6 +41,14 @@ all the references are resolved in the generated png. # This also includes changes in function behavior from Elisp perspective. ** Miscellaneous +*** =org-attach= now considers symlinked files when searching pre-existing attach dirs + +When Org buffer is opened from a symlink, Org mode looks into the +original file directory when searching if an attach directory already exists. +This way, attachments will remain accessible when opening symlinked Org file. + +When no attach dir exists, Org mode will still prefer creating it in +the "default" directory - where the symlink is located. * Version 9.7 diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 16f6e1e29..d4bff03ad 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -433,22 +433,42 @@ (defun org-attach-dir-get-create () (make-directory attach-dir t)) attach-dir)) -(defun org-attach-dir-from-id (id &optional existing) +(defun org-attach-dir-from-id (id &optional existing) "Return a folder path based on `org-attach-id-dir' and ID. Try id-to-path functions in `org-attach-id-to-path-function-list' ignoring nils. If EXISTING is non-nil, then return the first path -found in the filesystem. Otherwise return the first non-nil value." +found in the filesystem. Otherwise return the first non-nil value. + +The existing paths are searched in +1. `org-attach-id-dir'; +2. in \"data/\" dir - the default value of `org-attach-id-dir'; +3. if current buffer is a symlink, (1) and (2) searches are repeated + in the `default-directory' of symlink target." (let ((fun-list org-attach-id-to-path-function-list) (base-dir (expand-file-name org-attach-id-dir)) - (default-base-dir (expand-file-name "data/")) + (fallback-dirs (list (expand-file-name "data/"))) preferred first) + (when (and (buffer-file-name) + (file-symlink-p (buffer-file-name))) + (let ((default-directory + (file-name-directory + (file-truename (buffer-file-name))))) + (cl-pushnew (expand-file-name org-attach-id-dir) fallback-dirs) + (cl-pushnew (expand-file-name "data/") fallback-dirs))) + (setq fallback-dirs (delete base-dir fallback-dirs)) + (setq fallback-dirs (seq-filter #'file-directory-p fallback-dirs)) (while (and fun-list (not preferred)) (let* ((name (funcall (car fun-list) id)) (candidate (and name (expand-file-name name base-dir))) - ;; Try the default value `org-attach-id-dir' as a fallback. - (candidate2 (and name (not (equal base-dir default-base-dir)) - (expand-file-name name default-base-dir)))) + ;; Try the default value `org-attach-id-dir', and linked + ;; dirs if buffer is a symlink as a fallback. + (fallback-candidates + (and name (mapcar + (lambda (dir) (expand-file-name name dir)) + fallback-dirs))) + (fallback-candidates + (seq-filter #'file-directory-p fallback-candidates))) (setq fun-list (cdr fun-list)) (when candidate (if (or (not existing) (file-directory-p candidate)) @@ -456,10 +476,9 @@ (defun org-attach-dir-from-id (id &optional existing) (unless first (setq first candidate))) (when (and existing - candidate2 - (not (file-directory-p candidate)) - (file-directory-p candidate2)) - (setq preferred candidate2))))) + fallback-candidates + (not (file-directory-p candidate))) + (setq preferred (car fallback-candidates)))))) (or preferred first))) (defun org-attach-check-absolute-path (dir) -- 2.45.1 --=-=-= Content-Type: text/plain -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at . Support Org development at , or support my work at --=-=-=--