From 5483e65d5ac489f0bbadb68278bfbd74177304a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Egil=20Hoftun=20Kv=C3=A6stad?=
 <103839750+toregilhk@users.noreply.github.com>
Date: Mon, 2 May 2022 18:12:28 +0200
Subject: [PATCH] (fix)org-roam-file-p: don't exclude org-roam-directory
 (#2178)

* (fix)org-roam-file-p: don't exclude org-roam-directory

Don't exlude the org-roam-directory even if it matches
org-roam-file-exclude-regexp.

Should fix [#2165].

* Refactor PR #2178

Refactor PR #2178 to avoid recalculating (file-relative-name path
org-roam-directory) multiple timess.
---
 CHANGELOG.md | 1 +
 org-roam.el  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00cdc1b..585d5cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Added
 ### Removed
 ### Fixed
+- [#2165](https://github.com/org-roam/org-roam/pull/2165) (fix)org-roam-file-p: don't exclude org-roam-directory
 - [#2168](https://github.com/org-roam/org-roam/pull/2168) (perf)node-read: filter nodes before mapping --to-candidate
 ### Changed
 
diff --git a/org-roam.el b/org-roam.el
index 767d753..3038668 100644
--- a/org-roam.el
+++ b/org-roam.el
@@ -193,6 +193,7 @@ FILE is an Org-roam file if:
 - It has a matching file extension (`org-roam-file-extensions')
 - It doesn't match excluded regexp (`org-roam-file-exclude-regexp')"
   (let* ((path (or file (buffer-file-name (buffer-base-buffer))))
+         (relative-path (file-relative-name path org-roam-directory))
          (ext (when path (org-roam--file-name-extension path)))
          (ext (if (string= ext "gpg")
                   (org-roam--file-name-extension (file-name-sans-extension path))
@@ -203,11 +204,11 @@ FILE is an Org-roam file if:
           (cond
            ((not org-roam-file-exclude-regexp) nil)
            ((stringp org-roam-file-exclude-regexp)
-            (string-match-p org-roam-file-exclude-regexp path))
+            (string-match-p org-roam-file-exclude-regexp relative-path))
            ((listp org-roam-file-exclude-regexp)
             (let (is-match)
               (dolist (exclude-re org-roam-file-exclude-regexp)
-                (setq is-match (or is-match (string-match-p exclude-re path))))
+                (setq is-match (or is-match (string-match-p exclude-re relative-path))))
               is-match)))))
     (save-match-data
       (and