From b403bac1d07e17409e476b0370676cb27db3d8a9 Mon Sep 17 00:00:00 2001
From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Tue, 20 Jul 2021 12:04:34 -0700
Subject: [PATCH] Still tinkering with announceEmail

---
 bin/announceEmail    |  4 ----
 bin/announceEmail.pl | 30 +++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/bin/announceEmail b/bin/announceEmail
index f0fbdd9..b775335 100755
--- a/bin/announceEmail
+++ b/bin/announceEmail
@@ -6,10 +6,6 @@ case $1 in
     # IMAP server. So instead we use this cheap method of sleeping for a while
     # as the network should be back by then. A better method would be to poll
     # looking for the network to come back up but that's tricker to implement.
-    #
-    # Seems like one kill is not enough. Try 2 - spaced a minute apart
-    sleep 60
-    killall -USR2 announceEmail.pl
     sleep 60
     killall -USR2 announceEmail.pl
     ;;
diff --git a/bin/announceEmail.pl b/bin/announceEmail.pl
index 96da982..cf3dc49 100755
--- a/bin/announceEmail.pl
+++ b/bin/announceEmail.pl
@@ -40,7 +40,7 @@ $Date: 2019/04/04 13:40:10 $
  Where:
    -usa|ge       Print this usage
    -h|elp        Detailed help
-   -v|erbose     Verbose mode (Default: -verbose)
+   -v|erbose     Verbose mode (Default: Not verbose)
    -de|bug       Turn on debugging (Default: Off)
 
    -user|name    User name to log in with (Default: $USER)
@@ -125,6 +125,8 @@ sub notify($) {
   my $cmd = "notify-send -i $icon -t $timeout '$msg'";
 
   Execute $cmd;
+
+  return;
 } # notify
 
 sub interrupted {
@@ -139,17 +141,9 @@ sub interrupted {
   return;
 } # interrupted
 
-sub Connect2IMAP;
-
-sub restart {
-  my $msg = "Re-establishing connection to $opts{imap} as $opts{username}";
+sub restart;
 
-  $log->dbug($msg);
-
-  Connect2IMAP;
-
-  goto MONITORMAIL;
-} # restart
+sub Connect2IMAP;
 
 $SIG{USR1} = \&interrupted;
 $SIG{USR2} = \&restart;
@@ -235,6 +229,10 @@ sub MonitorMail() {
     # Google Talk doesn't like #
     $subject =~ s/\#//g;
 
+    # Remove long strings of numbers like order numbers. They are uninteresting
+    my $longNumber = 5;
+    $subject =~ s/\s+\S*\d{$longNumber,}\S*\s*//g;
+
     # Now speak it!
     my $logmsg = "From $from $subject";
 
@@ -273,6 +271,16 @@ sub MonitorMail() {
   return;
 } # MonitorMail
 
+sub restart {
+  my $msg = "Re-establishing connection to $opts{imap} as $opts{username}";
+
+  $log->dbug($msg);
+
+  Connect2IMAP;
+
+  MonitorMail;
+} # restart
+
 END {
   # If $log is not yet defined then the exit is not unexpected
   if ($log) {
-- 
2.17.1