elisp/anki-editor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reenable support for setting tags via "ANKI_TAGS" property and add a variable to control whether count org tags as anki tags.

Browse source
This commit is contained in:
louie 2018-07-29 11:12:23 +08:00
parent 11dbf07895
commit 4403cb17f1
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
anki-editor.el
View file

@ -4,7 +4,7 @@
;; ;;
;; Description: Make Anki Cards in Org-mode ;; Description: Make Anki Cards in Org-mode
;; Author: Lei Tan ;; Author: Lei Tan
;; Version: 0.3.2 ;; Version: 0.3.3
;; Package-Requires: ((emacs "25") (request "0.3.0") (dash "2.12.0")) ;; Package-Requires: ((emacs "25") (request "0.3.0") (dash "2.12.0"))
;; URL: https://github.com/louietan/anki-editor ;; URL: https://github.com/louietan/anki-editor
;; ;;
@ -71,6 +71,7 @@
(defconst anki-editor-prop-note-type "ANKI_NOTE_TYPE") (defconst anki-editor-prop-note-type "ANKI_NOTE_TYPE")
(defconst anki-editor-prop-note-id "ANKI_NOTE_ID") (defconst anki-editor-prop-note-id "ANKI_NOTE_ID")
(defconst anki-editor-prop-deck "ANKI_DECK") (defconst anki-editor-prop-deck "ANKI_DECK")
(defconst anki-editor-prop-tags "ANKI_TAGS")
(defconst anki-editor-prop-failure-reason "ANKI_FAILURE_REASON") (defconst anki-editor-prop-failure-reason "ANKI_FAILURE_REASON")
(defconst anki-editor-buffer-html-output "*AnkiEditor HTML Output*") (defconst anki-editor-buffer-html-output "*AnkiEditor HTML Output*")
(defconst anki-editor-org-tag-regexp "^\\([[:alnum:]_@#%]+\\)+$") (defconst anki-editor-org-tag-regexp "^\\([[:alnum:]_@#%]+\\)+$")
@ -88,6 +89,10 @@ See https://apps.ankiweb.net/docs/manual.html#latex-conflicts.")
nil nil
"If non-nil, creates deck before creating a note.") "If non-nil, creates deck before creating a note.")
(defcustom anki-editor-org-tags-as-anki-tags
t
"If nil, tags of entries wont't be counted as Anki tags.")
(defcustom anki-editor-anki-connect-listening-address (defcustom anki-editor-anki-connect-listening-address
"127.0.0.1" "127.0.0.1"
"The network address AnkiConnect is listening.") "The network address AnkiConnect is listening.")
@ -436,15 +441,19 @@ Where the subtree is created depends on PREFIX."
"Get all decks names from Anki." "Get all decks names from Anki."
(anki-editor--anki-connect-invoke-result "deckNames")) (anki-editor--anki-connect-invoke-result "deckNames"))
(defun anki-editor--enable-tag-completion ()
(and anki-editor-mode anki-editor-org-tags-as-anki-tags))
(defun anki-editor--before-set-tags (&optional _ just-align) (defun anki-editor--before-set-tags (&optional _ just-align)
"Fetch and cache tags from Anki." "Fetch and cache tags from Anki."
(unless (or (not anki-editor-mode) just-align) (when (and (anki-editor--enable-tag-completion)
(not just-align))
(setq anki-editor--anki-tags-cache (anki-editor-all-tags)))) (setq anki-editor--anki-tags-cache (anki-editor-all-tags))))
(defun anki-editor--get-buffer-tags (oldfun) (defun anki-editor--get-buffer-tags (oldfun)
"Append tags from Anki to the result of applying OLDFUN." "Append tags from Anki to the result of applying OLDFUN."
(append (funcall oldfun) (append (funcall oldfun)
(when anki-editor-mode (when (anki-editor--enable-tag-completion)
(mapcar #'list anki-editor--anki-tags-cache)))) (mapcar #'list anki-editor--anki-tags-cache))))
(defun anki-editor-note-types () (defun anki-editor-note-types ()
@ -457,7 +466,7 @@ Where the subtree is created depends on PREFIX."
(deck (org-entry-get-with-inheritance anki-editor-prop-deck)) (deck (org-entry-get-with-inheritance anki-editor-prop-deck))
(note-id (org-entry-get nil anki-editor-prop-note-id)) (note-id (org-entry-get nil anki-editor-prop-note-id))
(note-type (org-entry-get nil anki-editor-prop-note-type)) (note-type (org-entry-get nil anki-editor-prop-note-type))
(tags (org-get-tags-at)) (tags (anki-editor--get-tags))
(fields (anki-editor--build-fields))) (fields (anki-editor--build-fields)))
(unless deck (error "No deck specified")) (unless deck (error "No deck specified"))
@ -470,6 +479,14 @@ Where the subtree is created depends on PREFIX."
(tags . ,tags) (tags . ,tags)
(fields . ,fields)))) (fields . ,fields))))
(defun anki-editor--get-tags ()
(let ((tags (org-entry-get-multivalued-property
nil
anki-editor-prop-tags)))
(if anki-editor-org-tags-as-anki-tags
(append tags (org-get-tags-at))
tags)))
(defun anki-editor--build-fields () (defun anki-editor--build-fields ()
"Build a list of fields from subheadings of current heading, each element of which is a cons cell, the car of which is field name and the cdr of which is field content." "Build a list of fields from subheadings of current heading, each element of which is a cons cell, the car of which is field name and the cdr of which is field content."
(save-excursion (save-excursion