From 1e68b305cbd15dd961f6bc225985a0427e8a4535 Mon Sep 17 00:00:00 2001 From: danix Date: Wed, 26 Apr 2023 16:50:50 +0200 Subject: [PATCH] reimplemented title dialog when adding note if nothing is passed on the command line. --- SOURCE/CORE/core-add.sh | 16 +++++++++++++++- SOURCE/main.sh | 2 +- notes.sh | 18 ++++++++++++++++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/SOURCE/CORE/core-add.sh b/SOURCE/CORE/core-add.sh index 58831e4..3404f71 100644 --- a/SOURCE/CORE/core-add.sh +++ b/SOURCE/CORE/core-add.sh @@ -6,8 +6,22 @@ addnote() { rm $TMPDB fi + # RANDOM TITLE RTITLE=$(random_title) - [[ -z "$1" ]] && NOTETITLE="$RTITLE" || NOTETITLE="$1" + + if [[ -z $1 ]]; then + read -r -p "Title: " TITLE + case "$TITLE" in + '' ) + NOTETITLE="$RTITLE" + ;; + * ) + NOTETITLE=$TITLE + ;; + esac + fi + + # [[ -z "$1" ]] && NOTETITLE="$RTITLE" || NOTETITLE="$1" echo "adding new note - \"$NOTETITLE\"" # shellcheck disable=SC2086 LASTID=$($JQ '.notes[-1].id // 0 | tonumber' $DB) diff --git a/SOURCE/main.sh b/SOURCE/main.sh index 6198adb..c2822d9 100644 --- a/SOURCE/main.sh +++ b/SOURCE/main.sh @@ -1,5 +1,5 @@ # shellcheck disable=SC2006 -GOPT=$(getopt -o hvplr:a:e:d:s: --long help,version,list,plain,userconf,showconf,sync,restore:,backup:,add:,edit:,delete:,show: -n 'bash-notes' -- "$@") +GOPT=$(getopt -o hvplr:a::e:d:s: --long help,version,list,plain,userconf,showconf,sync,restore:,backup:,add::,edit:,delete:,show: -n 'bash-notes' -- "$@") # shellcheck disable=SC2181 if [ $? != 0 ] ; then helptext >&2 ; exit 1 ; fi diff --git a/notes.sh b/notes.sh index 87b8a77..a9afd60 100755 --- a/notes.sh +++ b/notes.sh @@ -381,8 +381,22 @@ addnote() { rm $TMPDB fi + # RANDOM TITLE RTITLE=$(random_title) - [[ -z "$1" ]] && NOTETITLE="$RTITLE" || NOTETITLE="$1" + + if [[ -z $1 ]]; then + read -r -p "Title: " TITLE + case "$TITLE" in + '' ) + NOTETITLE="$RTITLE" + ;; + * ) + NOTETITLE=$TITLE + ;; + esac + fi + + # [[ -z "$1" ]] && NOTETITLE="$RTITLE" || NOTETITLE="$1" echo "adding new note - \"$NOTETITLE\"" # shellcheck disable=SC2086 LASTID=$($JQ '.notes[-1].id // 0 | tonumber' $DB) @@ -612,7 +626,7 @@ shownote() { fi } # shellcheck disable=SC2006 -GOPT=$(getopt -o hvplr:a:e:d:s: --long help,version,list,plain,userconf,showconf,sync,restore:,backup:,add:,edit:,delete:,show: -n 'bash-notes' -- "$@") +GOPT=$(getopt -o hvplr:a::e:d:s: --long help,version,list,plain,userconf,showconf,sync,restore:,backup:,add::,edit:,delete:,show: -n 'bash-notes' -- "$@") # shellcheck disable=SC2181 if [ $? != 0 ] ; then helptext >&2 ; exit 1 ; fi -- 2.20.1