Nicolas Goaziou <[email protected]> writes:
> Hello,
>
> stardiviner <[email protected]> writes:
>
>> Oh, sorry, seems yes.
>
> OK. A couple of comments if you don't mind.
>> +(defcustom org-drill-pronounce-command ""
>> + "Org-drill pronounce command."
>> + :type 'string
>> + :safe #'stringp
>> + :group 'org-drill)
>
> This is clearly not a safe command. You can remove the :safe keyword, or
> put :safe nil
Ok, I removed it. (I misunderstand it's functionality..)
>
>> +(defun org-drill-pronounce-word ()
>> + "Pronounce word after querying."
>> + (when org-drill-auto-pronounce
>> + (shell-command-to-string
>> + (format "%s %s %s &"
>> + org-drill-pronounce-command org-drill-pronounce-command-args
>> + (shell-quote-argument
>> + (substring-no-properties
>> + (org-get-heading 'no-tags 'no-todo 'no-priority
>> 'no-comment)))))))
>
> Is there any reason to use `shell-command-to-string'? You don't seem to
> need the returned string anyway. Why not calling `start-process', or at
> least `async-shell-command'?
Changed to `start-process' now.
>
> Regards,
Also I add some new functionality, which can pronounce at anytime when
press the key [p] not just at start time.
I almost forgot my patch. I pressed [C-g] to interrupt it.
>From eeee73acb5177526f7bf5d621f45ca979ee7119c Mon Sep 17 00:00:00 2001
From: stardiviner <[email protected]>
Date: Sun, 27 Jan 2019 10:43:37 +0800
Subject: [PATCH] org-drill.el: Add feature let org-drill auto pronounce
* contrib/lisp/org-drill.el (org-drill-entry,
org-drill-entry-before-hook, org-drill-entry-after-hook): Add two
hooks around ~org-drill-entry~.
(org-drill-auto-pronounce): option to toggle this functionality.
(org-drill-pronounce-command,org-drill-pronounce-command-args): option
to specify the pronounce command and arguments.
(org-drill-pronounce-word): The real function to pronounce word.
(org-drill-hide-subheadings-if): fix issue in Org 9.2 version.
---
contrib/lisp/org-drill.el | 79 ++++++++++++++++++++++++++++++++-------
1 file changed, 66 insertions(+), 13 deletions(-)
diff --git a/contrib/lisp/org-drill.el b/contrib/lisp/org-drill.el
index c7f509bff..70d0dee4b 100644
--- a/contrib/lisp/org-drill.el
+++ b/contrib/lisp/org-drill.el
@@ -269,6 +269,9 @@ item.")
(defvar org-drill--tags-key ?t
"If this character is pressed during a drill session, edit the tags for
the current item.")
+(defvar org-drill--pronounce-key ?p
+ "If this character is pressed during a drill session, pronounce for
+the current item.")
(defcustom org-drill-card-type-alist
@@ -532,6 +535,35 @@ exponential effect on inter-repetition spacing."
:type 'float)
+(defcustom org-drill-entry-before-hook nil
+ "A hook to run functions when every org-drill entry."
+ :type 'hook
+ :group 'org-drill)
+
+(defcustom org-drill-entry-after-hook nil
+ "A hook to run functions when every org-drill entry."
+ :type 'hook
+ :group 'org-drill)
+
+(defcustom org-drill-auto-pronounce t
+ "Auto pronounce org-drill word if non-nil."
+ :type 'boolean
+ :safe #'booleanp
+ :group 'org-drill)
+
+(defcustom org-drill-pronounce-command (executable-find "espeak")
+ "Org-drill pronounce command."
+ :type 'string
+ :group 'org-drill)
+
+(defcustom org-drill-pronounce-command-args
+ (if (string= org-drill-pronounce-command "/usr/bin/espeak")
+ "-v en")
+ "Org-drill pronounce command arguments."
+ :type 'string
+ :group 'org-drill)
+
+
(defvar drill-answer nil
"Global variable that can be bound to a correct answer when an
item is being presented. If this variable is non-nil, the default
@@ -1364,8 +1396,9 @@ of QUALITY."
(let ((ch nil)
(input nil)
(next-review-dates (org-drill-hypothetical-next-review-dates))
- (key-prompt (format "(0-5, %c=help, %c=edit, %c=tags, %c=quit)"
+ (key-prompt (format "(0-5, %c=help, %c=pronounce, %c=edit, %c=tags, %c=quit)"
org-drill--help-key
+ org-drill--pronounce-key
org-drill--edit-key
org-drill--tags-key
org-drill--quit-key)))
@@ -1391,7 +1424,9 @@ How well did you do? %s"
(round (nth 4 next-review-dates))
(round (nth 5 next-review-dates))
key-prompt)
- (format "How well did you do? %s" key-prompt))))
+ (format "How well did you do? %s" key-prompt))
+ (if (eq ch org-drill--pronounce-key)
+ (org-drill-pronounce-word))))
(cond
((stringp input)
(setq ch (elt input 0)))
@@ -1486,7 +1521,7 @@ the current topic."
(funcall test))
(hide-subtree))
(push (point) drill-sections)))
- "" 'tree))
+ nil 'tree))
(reverse drill-sections)))
@@ -1511,7 +1546,8 @@ the current topic."
(first fmt-and-args)
(rest fmt-and-args))
(format (concat "Press key for answer, "
- "%c=edit, %c=tags, %c=skip, %c=quit.")
+ "%c=pronounce, %c=edit, %c=tags, %c=skip, %c=quit.")
+ org-drill--pronounce-key
org-drill--edit-key
org-drill--tags-key
org-drill--skip-key
@@ -1561,19 +1597,21 @@ You seem to be having a lot of trouble memorising this item.
Consider reformulating the item to make it easier to remember.\n"
'face '(:foreground "red"))
prompt)))
- (while (memq ch '(nil org-drill--tags-key))
+ (while (memq ch '(nil org-drill--tags-key org-drill--pronounce-key))
(setq ch nil)
(while (not (input-pending-p))
- (let ((elapsed (time-subtract (current-time) item-start-time)))
- (message (concat (if (>= (time-to-seconds elapsed) (* 60 60))
- "++:++ "
- (format-time-string "%M:%S " elapsed))
- prompt))
- (sit-for 1)))
+ (let ((elapsed (time-subtract (current-time) item-start-time)))
+ (message (concat (if (>= (time-to-seconds elapsed) (* 60 60))
+ "++:++ "
+ (format-time-string "%M:%S " elapsed))
+ prompt))
+ (sit-for 1)))
(setq input (read-key-sequence nil))
(if (stringp input) (setq ch (elt input 0)))
(if (eql ch org-drill--tags-key)
- (org-set-tags-command)))
+ (org-set-tags-command))
+ (if (eql ch org-drill--pronounce-key)
+ (org-drill-pronounce-word)))
(case ch
(org-drill--quit-key nil)
(org-drill--edit-key 'edit)
@@ -2163,6 +2201,18 @@ If ANSWER is supplied, set the global variable `drill-answer' to its value."
(prog1 (org-drill-presentation-prompt)
(org-drill-hide-subheadings-if 'org-drill-entry-p)))))
+(defun org-drill-pronounce-word ()
+ "Pronounce word after querying."
+ (interactive)
+ (start-process-shell-command
+ "org-drill pronounce"
+ nil
+ org-drill-pronounce-command
+ (format "%s %s"
+ org-drill-pronounce-command-args
+ (shell-quote-argument
+ (substring-no-properties
+ (org-get-heading 'no-tags 'no-todo 'no-priority 'no-comment))))))
(defun org-drill-entry ()
"Present the current topic for interactive review, as in `org-drill'.
@@ -2202,6 +2252,8 @@ See `org-drill' for more details."
'org-drill-present-default-answer)
present-empty-cards (third presentation-fn)
presentation-fn (first presentation-fn)))
+ (when org-drill-auto-pronounce (org-drill-pronounce-word))
+ (run-hook-with-args 'org-drill-entry-before-hook)
(prog1
(cond
((null presentation-fn)
@@ -2223,7 +2275,8 @@ See `org-drill' for more details."
(save-excursion
(funcall answer-fn
(lambda () (org-drill-reschedule))))))))
- (org-remove-latex-fragment-image-overlays)))))))
+ (run-hook-with-args 'org-drill-entry-after-hook)
+ (org-remove-latex-fragment-image-overlays)))))))
(defun org-drill-entries-pending-p ()
--
2.20.1
--
[ stardiviner ]
I try to make every word tell the meaning what I want to express.
Blog: https://stardiviner.github.io/
IRC(freenode): stardiviner, Matrix: stardiviner
GPG: F09F650D7D674819892591401B5DF1C95AE89AC3
