Remove unnecessary seq and s deps

Use built-in functions instead
This commit is contained in:
Correl Roush 2022-06-12 02:18:04 -04:00
parent c9d17e8fbb
commit bad117b220
2 changed files with 10 additions and 12 deletions

View file

@ -9,7 +9,7 @@
;; Version: 0.0.1 ;; Version: 0.0.1
;; Keywords: abbrev bib c calendar comm convenience data docs emulations extensions faces files frames games hardware help hypermedia i18n internal languages lisp local maint mail matching mouse multimedia news outlines processes terminals tex tools unix vc wp ;; Keywords: abbrev bib c calendar comm convenience data docs emulations extensions faces files frames games hardware help hypermedia i18n internal languages lisp local maint mail matching mouse multimedia news outlines processes terminals tex tools unix vc wp
;; Homepage: https://github.com/correlr/org-roam-export ;; Homepage: https://github.com/correlr/org-roam-export
;; Package-Requires: ((emacs "24.3") org-roam s seq) ;; Package-Requires: ((emacs "24.3") org-roam)
;; ;;
;; This file is not part of GNU Emacs. ;; This file is not part of GNU Emacs.
;; ;;
@ -20,15 +20,14 @@
;;; Code: ;;; Code:
(require 'org-roam) (require 'org-roam)
(require 's)
(require 'seq)
(defun org-roam-export-backlink-title (backlink) (defun org-roam-export-backlink-title (backlink)
"Get exportable title of BACKLINK." "Get exportable title of BACKLINK."
(s-join " > " (mapconcat #'identity
(seq-concatenate 'list (append
(list (org-roam-node-title (org-roam-backlink-source-node backlink))) (list (org-roam-node-title (org-roam-backlink-source-node backlink)))
(plist-get (org-roam-backlink-properties backlink) :outline)))) (plist-get (org-roam-backlink-properties backlink) :outline))
" > "))
(defun org-roam-export-backlink-link (backlink) (defun org-roam-export-backlink-link (backlink)
"Get Org link to BACKLINK." "Get Org link to BACKLINK."
@ -40,7 +39,7 @@
(insert-file-contents-literally (org-roam-node-file (org-roam-backlink-source-node backlink))) (insert-file-contents-literally (org-roam-node-file (org-roam-backlink-source-node backlink)))
(goto-char (org-roam-backlink-point backlink)) (goto-char (org-roam-backlink-point backlink))
(let ((element (org-element-at-point))) (let ((element (org-element-at-point)))
(s-trim (buffer-substring (org-element-property :contents-begin element) (string-trim (buffer-substring (org-element-property :contents-begin element)
(org-element-property :contents-end element)))))) (org-element-property :contents-end element))))))
(provide 'org-roam-export) (provide 'org-roam-export)

View file

@ -13,7 +13,6 @@
(require 'ert) (require 'ert)
(require 'org-roam) (require 'org-roam)
(require 'org-roam-export) (require 'org-roam-export)
(require 'seq)
(setq org-roam-directory (expand-file-name "./test-slipbox") (setq org-roam-directory (expand-file-name "./test-slipbox")
org-roam-db-location (expand-file-name "org-roam.db")) org-roam-db-location (expand-file-name "org-roam.db"))
@ -26,7 +25,7 @@
(ert-deftest lorem-backlink-titles () (ert-deftest lorem-backlink-titles ()
(should (equal '("Ipsum > II") (should (equal '("Ipsum > II")
(seq-map #'org-roam-export-backlink-title (org-roam-backlinks-get (org-roam-node-from-id "d12a1ce4-3199-42f4-b39b-b68c03458669") :unique t))))) (mapcar #'org-roam-export-backlink-title (org-roam-backlinks-get (org-roam-node-from-id "d12a1ce4-3199-42f4-b39b-b68c03458669") :unique t)))))
(ert-deftest lorem-backlink-excerpt () (ert-deftest lorem-backlink-excerpt ()
(should (equal '("Aliquam [[id:d12a1ce4-3199-42f4-b39b-b68c03458669][lorem]] ante, suscipit a lorem molestie, aliquet elementum eros. Proin (should (equal '("Aliquam [[id:d12a1ce4-3199-42f4-b39b-b68c03458669][lorem]] ante, suscipit a lorem molestie, aliquet elementum eros. Proin
@ -39,7 +38,7 @@ commodo, lacinia odio vitae, blandit metus. Nam et tempus ipsum. Aenean lobortis
mauris sit amet lorem accumsan blandit. Fusce eleifend, tellus non tristique mauris sit amet lorem accumsan blandit. Fusce eleifend, tellus non tristique
auctor, ligula justo varius dolor, id bibendum nulla elit ac dui. Vestibulum auctor, ligula justo varius dolor, id bibendum nulla elit ac dui. Vestibulum
sodales enim eget tristique tempor.") sodales enim eget tristique tempor.")
(seq-map #'org-roam-export-backlink-excerpt (org-roam-backlinks-get (org-roam-node-from-id "d12a1ce4-3199-42f4-b39b-b68c03458669") :unique t))))) (mapcar #'org-roam-export-backlink-excerpt (org-roam-backlinks-get (org-roam-node-from-id "d12a1ce4-3199-42f4-b39b-b68c03458669") :unique t)))))
(provide 'tests) (provide 'tests)
;;; tests.el ends here ;;; tests.el ends here