jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Notification patch v4

Browse source
This commit is contained in:
iressa 2020-07-31 19:34:12 -04:00 • committed by Miles Alan
parent dcf5ddd77c
commit e6635ba7ef
7 changed files with 102 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/modem/sxmo_modemmonitor.sh
View file

@ -1,6 +1,7 @@
#!/usr/bin/env sh
TIMEOUT=3
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
NOTIFDIR="$XDG_CONFIG_HOME"/sxmo/notifications
trap "gracefulexit" INT TERM
err() {
@ -10,7 +11,6 @@ err() {
gracefulexit() {
echo "gracefully exiting $0!"
sxmo_setpineled green 0
kill -9 0
}
@ -28,14 +28,14 @@ checkforincomingcalls() {
)"
if echo "$VOICECALLID" | grep -v .; then
rm -f /tmp/sxmo_incomingcall
rm -f "$NOTIFDIR/sxmo_incomingcall"
return
fi
if [ -x "$XDG_CONFIG_HOME/sxmo/hooks/ring" ]; then
"$XDG_CONFIG_HOME/sxmo/hooks/ring"
else
sxmo_vibratepine 2000 & sxmo_setpineled green 1
sxmo_vibratepine 2000 &
fi
# Delete all previous calls which have been terminated calls
@ -61,7 +61,7 @@ checkforincomingcalls() {
TIME="$(date --iso-8601=seconds)"
mkdir -p "$LOGDIR"
printf %b "$TIME\tcall_ring\t$INCOMINGNUMBER\n" >> "$LOGDIR/modemlog.tsv"
echo "$VOICECALLID:$INCOMINGNUMBER" > /tmp/sxmo_incomingcall
printf %b "$VOICECALLID:$INCOMINGNUMBER\n" > "$NOTIFDIR/sxmo_incomingcall"
echo "Number: $INCOMINGNUMBER (VOICECALLID: $VOICECALLID)"
}
@ -74,16 +74,8 @@ checkfornewtexts() {
echo "$TEXTIDS" | grep -v . && return
# Loop each textid received and read out the data into appropriate logfile
{
sxmo_setpineled green 1
sxmo_vibratepine 200;
sleep 0.1;
sxmo_vibratepine 200;
sleep 0.1;
sxmo_vibratepine 200;
} &
for TEXTID in $TEXTIDS; do
for TEXTID in $(printf %b "$TEXTIDS") ; do
TEXTDATA="$(mmcli -m "$(modem_n)" -s "$TEXTID" -K)"
TEXT="$(echo "$TEXTDATA" | grep sms.content.text | sed -E 's/^sms\.content\.text\s+:\s+//')"
NUM="$(
@ -97,12 +89,15 @@ checkfornewtexts() {
printf %b "Received from $NUM at $TIME:\n$TEXT\n\n" >> "$LOGDIR/$NUM/sms.txt"
printf %b "$TIME\trecv_txt\t$NUM\t${#TEXT} chars\n" >> "$LOGDIR/modemlog.tsv"
mmcli -m "$(modem_n)" --messaging-delete-sms="$TEXTID"
CONTACT="$(sxmo_contacts.sh | grep "$NUM" || echo "$NUM")"
echo "$CONTACT" | grep -c . | grep 1 || CONTACT="$NUM"
( sxmo_notificationwrite.sh "Message from $CONTACT: $TEXT" "st -e tail -n9999 -f $LOGDIR/$NUM/sms.txt" "$LOGDIR/$NUM/sms.txt" & ) &
done
}
mainloop() {
while true; do
sxmo_setpineled green 0
checkforincomingcalls
checkfornewtexts
sleep $TIMEOUT & wait