From 262418637f878d9325f6fb5a0a2844b3e20c95b2 Mon Sep 17 00:00:00 2001 From: Stacy Harper Date: Mon, 5 Apr 2021 11:56:08 +0200 Subject: [PATCH] Rework of the sxmo_modemtext with benefit * Draft files are assigned to each number: Stored here ".local/share/modem/+33666666666/draft.txt" We automatically edit this single file, making crash or unexpected edition issue to leave intact saved draft. * Simplification of some logics Having a known draft file instead of using a TEXT var simplify lots of things * EDITOR is not run in a subshell Some editors as kakoune got issues with that. Futhermore, it will be usefull for some other development as making all menu ssh mode compatible * Remove modem check As we now got draft, why do we care if modem is up or down ? * Display the contact name instead of it number in the conversation Or use "Unknown Number (+337798676)" * Unify display message notif adding possibilities to bypass the main menu Signed-off-by: Stacy Harper Signed-off-by: Maarten van Gompel --- scripts/core/sxmo_appmenu.sh | 2 +- scripts/modem/sxmo_modemmonitor.sh | 2 +- scripts/modem/sxmo_modemtext.sh | 137 +++++++++++++---------------- 3 files changed, 62 insertions(+), 79 deletions(-) diff --git a/scripts/core/sxmo_appmenu.sh b/scripts/core/sxmo_appmenu.sh index 51dbd14..dab0058 100755 --- a/scripts/core/sxmo_appmenu.sh +++ b/scripts/core/sxmo_appmenu.sh @@ -307,7 +307,7 @@ programchoicesinit() { number="$(echo "$WMNAME" | sed -e 's|^\"||' -e 's|\"$||' | cut -f1 -d' ')" #sms CHOICES=" - $icon_msg Reply ^ 0 ^ sxmo_modemtext.sh $number + $icon_msg Reply ^ 0 ^ sxmo_modemtext.sh sendtextmenu $number $icon_phn Call ^ 0 ^ sxmo_modemdial.sh $number " WINNAME=sms diff --git a/scripts/modem/sxmo_modemmonitor.sh b/scripts/modem/sxmo_modemmonitor.sh index ce32082..bbc56f8 100755 --- a/scripts/modem/sxmo_modemmonitor.sh +++ b/scripts/modem/sxmo_modemmonitor.sh @@ -172,7 +172,7 @@ checkfornewtexts() { sxmo_notificationwrite.sh \ random \ - "st -T '$NUM SMS' -e tail -n9999 -f '$LOGDIR/$NUM/sms.txt'" \ + "sxmo_modemtext.sh tailtextlog $NUM" \ "$LOGDIR/$NUM/sms.txt" \ "Message - $CONTACTNAME: $TEXT" diff --git a/scripts/modem/sxmo_modemtext.sh b/scripts/modem/sxmo_modemtext.sh index 97d32f7..ebb8211 100755 --- a/scripts/modem/sxmo_modemtext.sh +++ b/scripts/modem/sxmo_modemtext.sh @@ -5,7 +5,6 @@ . "$(dirname "$0")/sxmo_common.sh" TERMMODE=$([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && echo "true") -DRAFT_DIR="$XDG_DATA_HOME/sxmo/modem/draft" menu() { if [ "$TERMMODE" != "true" ]; then @@ -21,26 +20,7 @@ err() { kill $$ } -modem_n() { - MODEMS="$(mmcli -L)" - echo "$MODEMS" | grep -qoE 'Modem\/([0-9]+)' || err "Couldn't find modem - is your modem enabled?" - echo "$MODEMS" | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2 -} - -editmsg() { - TMP="$(mktemp --suffix "$1_msg")" - echo "$2" > "$TMP" - if [ "$TERMMODE" != "true" ]; then - st -e "$EDITOR" "$TMP" - else - "$EDITOR" "$TMP" - fi - cat "$TMP" -} - choosenumbermenu() { - modem_n >/dev/null || err "Couldn't determine modem number - is modem online?" - # Prompt for number NUMBER="$( printf %b "\n$icon_cls Cancel\n$icon_grp More contacts\n$(sxmo_contacts.sh | grep -E "^\+?[0-9]+:")" | @@ -49,94 +29,97 @@ choosenumbermenu() { cut -d: -f1 | tr -d -- '- ' )" - echo "$NUMBER" | grep -q "Morecontacts" && NUMBER="$( #joined words without space is not a bug - printf %b "\nCancel\n$(sxmo_contacts.sh --all)" | - grep . | - menu sxmo_dmenu_with_kb.sh -l 10 -p "Number" -c -i | - cut -d: -f1 | - tr -d -- '- ' - )" - echo "$NUMBER" | grep -q "Cancel" && exit 1 - echo "$NUMBER" | grep -qE '^[+0-9]+$' || err "That doesn't seem like a valid number" - echo "$NUMBER" + if echo "$NUMBER" | grep -q "Morecontacts"; then + NUMBER="$( #joined words without space is not a bug + printf %b "\nCancel\n$(sxmo_contacts.sh --all)" | + grep . | + menu sxmo_dmenu_with_kb.sh -l 10 -p "Number" -c -i | + cut -d: -f1 | + tr -d -- '- ' + )" + fi + + if echo "$NUMBER" | grep -q "Cancel"; then + exit 1 + elif ! echo "$NUMBER" | grep -qE '^[+0-9]+$'; then + notify-send "That doesn't seem like a valid number" + else + echo "$NUMBER" + fi } -sendnewtextmenu() { +sendtextmenu() { if [ -n "$1" ]; then NUMBER="$1" else NUMBER="$(choosenumbermenu)" fi - # Compose first version of msg - TEXT="$(editmsg "$NUMBER" 'Enter text message here')" - sendtextmenu "$NUMBER" "$TEXT" -} -sendtextmenu() { - NUMBER="$1" - TEXT="$2" + DRAFT="$LOGDIR/$NUMBER/draft.txt" + if [ ! -f "$DRAFT" ]; then + mkdir -p "$(dirname "$DRAFT")" + echo 'Enter text message here' > "$DRAFT" + fi + + if [ "$TERMMODE" != "true" ]; then + st -e "$EDITOR" "$DRAFT" + else + "$EDITOR" "$DRAFT" + fi + while true do CONFIRM="$( - printf %b "$icon_edt Edit Message ($(echo "$TEXT" | head -n1))\n$icon_snd Send to → $NUMBER\n$icon_sav Save as Draft\n$icon_cls Cancel" | + printf %b "$icon_edt Edit\n$icon_snd Send\n$icon_cls Cancel" | menu dmenu -c -idx 1 -p "Confirm" -l 10 )" - echo "$CONFIRM" | grep -E "Send to" && (echo "$TEXT" | sxmo_modemsendsms.sh "$NUMBER" -) && echo "Sent text to $NUMBER">&2 && exit 0 - echo "$CONFIRM" | grep -E "Cancel$" && exit 1 - echo "$CONFIRM" | grep -E "Edit Message" && TEXT="$(editmsg "$NUMBER" "$TEXT")" - echo "$CONFIRM" | grep -E "Save as Draft$" && err "Draft saved to $(draft "$NUMBER" "$TEXT")" + if echo "$CONFIRM" | grep -q "Send"; then + (cat "$DRAFT" | sxmo_modemsendsms.sh "$NUMBER" -) && \ + rm "$DRAFT" && \ + echo "Sent text to $NUMBER">&2 && exit 0 + elif echo "$CONFIRM" | grep -q "Edit"; then + sendtextmenu "$NUMBER" + elif echo "$CONFIRM" | grep -q "Cancel"; then + exit 1 + fi done } -draft() { +tailtextlog() { NUMBER="$1" - TEXT="$2" - DRAFT_FILE="$NUMBER-$(date +'%Y-%m-%d_%H-%m-%S')" - echo "$NUMBER" > "$DRAFT_DIR/$DRAFT_FILE" - echo "$TEXT" >> "$DRAFT_DIR/$DRAFT_FILE" - echo "$DRAFT_FILE" -} + CONTACTNAME="$(sxmo_contacts.sh | grep "^$NUMBER" | cut -d' ' -f2-)" + [ "Unknown Number" = "$CONTACTNAME" ] && CONTACTNAME="$CONTACTNAME ($NUMBER)" -senddrafttextmenu() { - CONFIRM="$( - printf %b "$icon_cls Cancel\n$(ls "$DRAFT_DIR")" | - menu sxmo_dmenu_with_kb.sh -p "Draft Message" -l 10 -c -i - )" - echo "$CONFIRM" | grep -E "Cancel$" && exit 1 - FILE="$DRAFT_DIR/$CONFIRM" - NUMBER="$(head -n1 "$FILE")" - TEXT="$(tail -n +2 "$FILE")" - rm "$FILE" - sendtextmenu "$NUMBER" "$TEXT" -} - -tailtextlog() { + set -- sh -c "tail -n9999 -f \"$LOGDIR/$NUMBER/sms.txt\" | sed \"s|$NUMBER|$CONTACTNAME|g\"" if [ "$TERMMODE" != "true" ]; then - st -T "$1 SMS" -e tail -n9999 -f "$LOGDIR/$1/sms.txt" + st -T "$NUMBER SMS" -e "$@" else - tail -n9999 -f "$LOGDIR/$1/sms.txt" + "$@" fi } -main() { - [ ! -d "$DRAFT_DIR" ] && mkdir -p "$DRAFT_DIR" +readtextmenu() { # E.g. only display logfiles for directories that exist and join w contact name ENTRIES="$( - printf %b "$icon_cls Close Menu\n$icon_edt Send a Text$( [ "$(ls -A "$DRAFT_DIR")" ] && printf %b "\n$icon_edt Send a Draft Text")\n"; + printf %b "$icon_cls Close Menu\n$icon_edt Send a Text\n"; sxmo_contacts.sh | while read -r CONTACT; do [ -d "$LOGDIR"/"$(printf %b "$CONTACT" | cut -d: -f1)" ] || continue printf %b "$CONTACT" | xargs -IL echo "L logfile" done )" - CONTACTIDANDNUM="$(printf %b "$ENTRIES" | menu dmenu -p Texts -c -l 10 -i)" - echo "$CONTACTIDANDNUM" | grep "Close Menu" && exit 1 - echo "$CONTACTIDANDNUM" | grep "Send a Text" && sendnewtextmenu && exit 1 - echo "$CONTACTIDANDNUM" | grep "Send a Draft Text" && senddrafttextmenu && exit 1 - tailtextlog "$(echo "$CONTACTIDANDNUM" | cut -d: -f1)" + PICKED="$(printf %b "$ENTRIES" | menu dmenu -p Texts -c -l 10 -i)" + + if echo "$PICKED" | grep "Close Menu"; then + exit 1 + elif echo "$PICKED" | grep "Send a Text"; then + sendtextmenu + else + tailtextlog "$(echo "$PICKED" | cut -d: -f1)" + fi } -if [ -n "$1" ]; then - sendnewtextmenu "$1" +if [ "2" != "$#" ]; then + readtextmenu else - main + "$@" fi