(feat) include links in vulpea-note

Following discussion #106

Author: d12frosted

CHANGELOG.org

@@ -26,6 +26,7 @@
     property.
 - New function to select on arbitrary list of notes as opposed to relying on
   filter - =vulpea-select-from=.
+- [[https://github.com/d12frosted/vulpea/discussions/106][vulpea#106]] Include links in =vulpea-note=.
 
 ** v0.2.0
 

README.org

@@ -148,6 +148,8 @@ slots/fields:
 - =vulpea-note-primary-title= - primary title of the note (present only when
   =title= is an alias);
 - =vulpea-note-aliases= - aliases of the note;
+- =vulpea-note-links= - list of links, each link being represented as =cons= of
+  type and link;
 - =vulpea-note-tags= - tags of the note;
 - =vulpea-note-meta= - associative list of [[#metadata][metadata]], where key is a string and
   the value is a list of strings. There are also two utilities to access/query

test/vulpea-db-test.el

@@ -171,7 +171,7 @@
                            (cons "FILE" (expand-file-name "same-name-2.org" org-roam-directory))
                            (cons "PRIORITY" "B"))))))
 
-  (it "includes meta"
+  (it "includes meta and links"
     (expect (vulpea-db-query
              (lambda (n)
                (seq-contains-p
@@ -185,6 +185,9 @@
               :tags nil
               :level 0
               :id "05907606-f836-45bf-bd36-a8444308eddd"
+              :links '(("https" . "https://en.wikipedia.org/wiki/Frappato")
+                       ("id" . "444f94d7-61e0-4b7c-bb7e-100814c6b4bb")
+                       ("id" . "5093fc4e-8c63-4e60-a1da-83fc7ecd5db7"))
               :properties (list
                            (cons "CATEGORY" "with-meta")
                            (cons "ID" "05907606-f836-45bf-bd36-a8444308eddd")
@@ -266,7 +269,7 @@
                           (cons "PRIORITY" "B")
                           (cons "ITEM" "Big note sub-sub-heading")))))
 
-  (it "includes meta in response"
+  (it "includes meta and links in response"
     (expect (vulpea-db-get-by-id "05907606-f836-45bf-bd36-a8444308eddd")
             :to-equal
             (make-vulpea-note
@@ -275,6 +278,9 @@
              :tags nil
              :level 0
              :id "05907606-f836-45bf-bd36-a8444308eddd"
+             :links '(("https" . "https://en.wikipedia.org/wiki/Frappato")
+                      ("id" . "444f94d7-61e0-4b7c-bb7e-100814c6b4bb")
+                      ("id" . "5093fc4e-8c63-4e60-a1da-83fc7ecd5db7"))
              :properties (list
                           (cons "CATEGORY" "with-meta")
                           (cons "ID" "05907606-f836-45bf-bd36-a8444308eddd")
@@ -413,6 +419,9 @@
              :tags nil
              :level 0
              :id "05907606-f836-45bf-bd36-a8444308eddd"
+             :links '(("https" . "https://en.wikipedia.org/wiki/Frappato")
+                      ("id" . "444f94d7-61e0-4b7c-bb7e-100814c6b4bb")
+                      ("id" . "5093fc4e-8c63-4e60-a1da-83fc7ecd5db7"))
              :properties (list
                           (cons "CATEGORY" "with-meta")
                           (cons "ID" "05907606-f836-45bf-bd36-a8444308eddd")
@@ -434,6 +443,9 @@
              :tags nil
              :level 0
              :id "05907606-f836-45bf-bd36-a8444308eddd"
+             :links '(("https" . "https://en.wikipedia.org/wiki/Frappato")
+                      ("id" . "444f94d7-61e0-4b7c-bb7e-100814c6b4bb")
+                      ("id" . "5093fc4e-8c63-4e60-a1da-83fc7ecd5db7"))
              :properties (list
                           (cons "CATEGORY" "with-meta")
                           (cons "ID" "05907606-f836-45bf-bd36-a8444308eddd")

test/vulpea-test.el

@@ -284,6 +284,7 @@
              :tags '("tag1" "tag2")
              :level 0
              :id (vulpea-note-id note)
+             :links '(("https" . "https://d12frosted.io"))
              :properties (list
                           (cons "CATEGORY" "prefix-aglianico")
                           (cons "MY_TAG" "super-tag")

vulpea-db.el

@@ -87,8 +87,9 @@ returned."
   file,
   title,
   \"level\",
-  '(' || group_concat(tags, ' ') || ')' as tags,
+  tags,
   aliases,
+  '(' || group_concat(links, ' ') || ')' as links,
   properties,
   meta
 from
@@ -98,33 +99,61 @@ from
     file,
     title,
     \"level\",
-    tags,
-    '(' || group_concat(aliases, ' ') || ')' as aliases,
+    '(' || group_concat(tags,
+    ' ') || ')' as tags,
+    aliases,
+    links,
     properties,
     meta
   from
     (
     select
-      nodes.id as id,
-      nodes.file as file,
-      nodes.title as title,
-      nodes.\"level\" as \"level\",
-      tags.tag as tags,
-      aliases.alias as aliases,
-      nodes.properties as properties,
-      '(' || group_concat('(' || meta.prop
+      id,
+      file,
+      title,
+      \"level\",
+      tags,
+      '(' || group_concat(aliases,
+      ' ') || ')' as aliases,
+      links,
+      properties,
+      meta
+    from
+      (
+      select
+        nodes.id as id,
+        nodes.file as file,
+        nodes.title as title,
+        nodes.\"level\" as \"level\",
+        tags.tag as tags,
+        aliases.alias as aliases,
+        '(' || links.\"type\" || ' ' || links.dest || ')' as links,
+        nodes.properties as properties,
+        '(' || group_concat('(' || meta.prop
                               || ' '
                               || meta.value
                               || ')',
-                          ' ')
+        ' ')
           || ')' as meta
-    from nodes
-    left join tags on tags.node_id = nodes.id
-    left join aliases on aliases.node_id = nodes.id
-    left join meta on meta.node_id = nodes.id
-    group by nodes.id, tags.tag, aliases.alias )
-  group by id, tags )
-group by id"))
+      from nodes
+      left join tags on tags.node_id = nodes.id
+      left join aliases on aliases.node_id = nodes.id
+      left join meta on meta.node_id = nodes.id
+      left join links on links.\"source\" = nodes.id
+      group by
+        nodes.id,
+        tags.tag,
+        aliases.alias,
+        links.dest)
+    group by
+      id,
+      tags,
+      links)
+  group by
+    id,
+    links)
+group by
+  id"))
          notes)
     (dolist (row rows notes)
       (let ((id (nth 0 row))
@@ -133,8 +162,9 @@ group by id"))
             (level (nth 3 row))
             (tags (nth 4 row))
             (aliases (nth 5 row))
-            (properties (nth 6 row))
-            (meta (nth 7 row)))
+            (links (nth 6 row))
+            (properties (nth 7 row))
+            (meta (nth 8 row)))
         (dolist (name (cons title aliases))
           (let ((note (make-vulpea-note
                        :path file
@@ -146,6 +176,9 @@ group by id"))
                        :aliases aliases
                        :id id
                        :level level
+                       :links (seq-uniq (seq-map
+                                         #'vulpea-db--parse-link-pair
+                                         links))
                        :properties properties
                        :meta (seq-map
                               (lambda (row)
@@ -221,17 +254,34 @@ If the FILE is relative, it is considered to be relative to
                   [:select [prop value]
                    :from meta
                    :where (= node-id $s1)]
-                  id))))
+                  id)))
+          (links (seq-map
+                  #'vulpea-db--parse-link-pair
+                  (org-roam-db-query
+                   [:select [type dest]
+                    :from links
+                    :where (and (= source $s1))]
+                   id))))
       (make-vulpea-note
        :id id
        :path (org-roam-node-file node)
        :level (or (org-roam-node-level node) 0)
        :title title
        :aliases (org-roam-node-aliases node)
        :tags (org-roam-node-tags node)
+       :links (seq-uniq links)
        :properties (org-roam-node-properties node)
        :meta meta))))
 
+(defun vulpea-db--parse-link-pair (link)
+  "Parse LINK pair."
+  (let ((type (car link))
+        (value (cadr link)))
+    (pcase type
+      (`"http" (cons type (concat type ":" value)))
+      (`"https" (cons type (concat type ":" value)))
+      (_ (cons type value)))))
+
 
 
 (defconst vulpea-db--schemata

vulpea-note.el

@@ -45,6 +45,7 @@
   primary-title
   aliases
   tags
+  links
   properties
   meta)