Optimize sxmo_modemtext contact listing
When you number of conversation start to grow, it rapidly take some seconds for the menu to open itself. The [ -d "folder" ] test really is uneficient. This simplify this part as we now ask sxmo_contacts to only list texted contacts.
This commit is contained in:
parent
823ad95477
commit
e444553ae4
2 changed files with 26 additions and 14 deletions
|
@ -16,16 +16,13 @@
|
|||
CONTACTSFILE="$XDG_CONFIG_HOME"/sxmo/contacts.tsv
|
||||
LOGFILE="$XDG_DATA_HOME"/sxmo/modem/modemlog.tsv
|
||||
|
||||
contacts() {
|
||||
grep -q . "$CONTACTSFILE" || echo " " > "$CONTACTSFILE"
|
||||
RECENTCONTACTEDNUMBERSREVCHRON="$(
|
||||
cut -f3 "$LOGFILE" |
|
||||
sed "s/^0\([0-9]\{9\}\)$/${DEFAULT_NUMBER_PREFIX:-0}\1/" |
|
||||
tac |
|
||||
awk '!($0 in a){a[$0]; print}' |
|
||||
sed '/^[[:space:]]*$/d'
|
||||
)"
|
||||
printf %b "$RECENTCONTACTEDNUMBERSREVCHRON" | awk -F'\t' '
|
||||
prepare_contacts_list() {
|
||||
cut -f3 |
|
||||
sed "s/^0\([0-9]\{9\}\)$/${DEFAULT_NUMBER_PREFIX:-0}\1/" |
|
||||
tac |
|
||||
awk '!($0 in a){a[$0]; print}' |
|
||||
sed '/^[[:space:]]*$/d' |
|
||||
awk -F'\t' '
|
||||
FNR==NR{a[$1]=$2; next}
|
||||
{
|
||||
if (!a[$1]) a[$1] = "Unknown Number";
|
||||
|
@ -34,6 +31,18 @@ contacts() {
|
|||
' "$CONTACTSFILE" -
|
||||
}
|
||||
|
||||
contacts() {
|
||||
prepare_contacts_list < "$LOGFILE"
|
||||
}
|
||||
|
||||
texted_contacts() {
|
||||
grep "\(recv\|sent\)_txt" "$LOGFILE" | prepare_contacts_list
|
||||
}
|
||||
|
||||
called_contacts() {
|
||||
grep "call_\(pickup\|start\)" "$LOGFILE" | prepare_contacts_list
|
||||
}
|
||||
|
||||
all_contacts() {
|
||||
awk -F'\t' '{
|
||||
print $1 ": " $2
|
||||
|
@ -47,10 +56,16 @@ unknown_contacts() {
|
|||
| grep "^+[0-9]\{9,14\}$"
|
||||
}
|
||||
|
||||
[ -f "$CONTACTSFILE" ] || touch "$CONTACTSFILE"
|
||||
|
||||
if [ "$1" = "--all" ]; then
|
||||
all_contacts
|
||||
elif [ "$1" = "--unknown" ]; then
|
||||
unknown_contacts
|
||||
elif [ "$1" = "--texted" ]; then
|
||||
texted_contacts
|
||||
elif [ "$1" = "--called" ]; then
|
||||
called_contacts
|
||||
else
|
||||
contacts
|
||||
fi
|
||||
|
|
|
@ -89,10 +89,7 @@ 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\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
|
||||
sxmo_contacts.sh --texted | xargs -IL echo "L logfile"
|
||||
)"
|
||||
PICKED="$(printf %b "$ENTRIES" | dmenu -p Texts -c -l 10 -i)" || exit
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue