bth/um-mode
Watch
1
Fork
You've already forked um-mode
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(um-next) : change the um/next.sh interface to call this function

Browse source 
um/next.sh now has minimal elisp, and calls this function instead, and only prints the next file with UMNEXTPRINT

so that (um-next-shell) can just get the next file and feed it into (next-file)

and we don't have to call (undo) to leave out the header
This commit is contained in:
bth 2024-07-18 14:06:10 -07:00
commit e28aca4de0
3 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
shell/next.sh
View file

@ -30,24 +30,28 @@ LASTFILE=`$UMBASEPATH/last.sh || echo $UMDEFAULTINIT`
NEXTFILE=`echo $LASTFILE | awk -f $UMBASEPATH/next.awk -v arg=$1`
# tag is optional second arg to this script
TAGINSERT='(previous-line) (insert "+ %s\\n") (next-line)'
if [ $2 ]; then
# + means insert the string descriptor as tag
if [ $2 = '+' ]; then
UMTAG=$(printf "$TAGINSERT" "$1")
UMTAG="$1"
else
UMTAG=$(printf "$TAGINSERT" "$2")
UMTAG="$2"
fi
UMELISP=$(printf '(um-next "%s" "%s")' "$NEXTFILE" "$UMTAG")
else
UMELISP=$(printf '(um-next "%s")' "$NEXTFILE")
fi
UMELISP="(progn (setq um-next-file \"$NEXTFILE\") (find-file um-next-file) (um-journal-header) $UMTAG (message \"creating $NEXTFILE\"))"
# for testing and piping
if [ $UMNEXTECHO ]; then
if [ $UMNEXTPRINT ]; then
# NOTE: printf instead of echo, because echo inserts a newline, and we pipe
# this back into elisp for um-next-shell:
printf $NEXTFILE
elif [ $UMNEXTTEST ]; then
echo $UMELISP
else
# HACK: emacs won't accept piped input as a file name, so we use --eval to open
# the file via find-file.
# NOTE: emacs won't accept piped input as a file name, so we use --eval to run
# um-next as elisp. Which also lets us add the header and tag.
emacsclient --eval "$UMELISP"
fi

10
shell/test/um.bats
View file

@ -13,11 +13,11 @@ setup() {
export ORIGPWD=`pwd`
cd $DIR/mockjournal
# so that we can run next.sh without dealing with emacsclient.
export UMNEXTECHO=true
export UMNEXTTEST=true
}
teardown() {
export UMNEXTECHO=false
export UMNEXTTEST=false
cd $ORIGPWD
git restore $DIR/mockjournal
}
@ -46,7 +46,7 @@ um_next_awk() {
@test "um next empty elisp" {
run um next
assert_output '(progn (setq um-next-file "100.md") (find-file um-next-file) (um-journal-header) (message "creating 100.md"))'
assert_output '(um-next "100.md")'
}
@test "um next descriptor" {
@ -56,12 +56,12 @@ um_next_awk() {
@test "um next descriptor tag" {
run um next foo bar
assert_output --partial '(insert "+ bar\n")'
assert_output '(um-next "100.foo.md" "bar")'
}
@test "um next descriptor +" {
run um next foo +
assert_output --partial '(insert "+ foo\n")'
assert_output '(um-next "100.foo.md" "foo")'
}
@test "um last" {