From: Andrew DeFaria Date: Sat, 7 Aug 2021 03:20:04 +0000 (-0700) Subject: Updated announceEmail.pl X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=4e6bdcd021a72103bfab56bc3d5a4e11e81d375a;p=clearscm.git Updated announceEmail.pl And a few other scripts --- diff --git a/bin/announceEmail b/bin/announceEmail index f0fbdd9..d992d89 100755 --- a/bin/announceEmail +++ b/bin/announceEmail @@ -8,6 +8,7 @@ case $1 in # 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 + /usr/local/bin/setsound.sh 35 sleep 60 killall -USR2 announceEmail.pl sleep 60 diff --git a/bin/announceEmail.pl b/bin/announceEmail.pl index 906b22a..22d30d0 100755 --- a/bin/announceEmail.pl +++ b/bin/announceEmail.pl @@ -33,7 +33,7 @@ $Date: 2019/04/04 13:40:10 $ Usage: announceEmail.pl [-usa|ge] [-h|elp] [-v|erbose] [-de|bug] [-use|rname ] [-p|assword ] - [-i|map ] + [-i|map ] [-t|imeout ] [-an|nouce] [-ap|pend] [-da|emon] [-n|name ] [-uses|sl] [-useb|locking] @@ -46,6 +46,7 @@ $Date: 2019/04/04 13:40:10 $ -user|name User name to log in with (Default: $USER) -p|assword Password to use (Default: prompted) -i|map IMAP server to talk to (Default: defaria.com) + -t|imeout Timeout IMAP idle call (Sefault: 600 seconds or 10 minutes) -an|nounce Announce startup (Default: False) -ap|pend Append to logfile (Default: Noappend) @@ -86,6 +87,8 @@ use Speak; use TimeUtils; use Utils; +local $0 = "$FindBin::Script " . join ' ', @ARGV; + my $defaultIMAPServer = 'defaria.com'; my $IMAP; my %unseen; @@ -114,6 +117,7 @@ my %opts = ( verbose => sub { set_verbose }, debug => sub { set_debug }, daemon => 1, + timeout => 600, # 10 minutes username => $ENV{USER}, password => $ENV{PASSWORD}, imap => $defaultIMAPServer, @@ -143,18 +147,16 @@ sub interrupted { sub Connect2IMAP; -sub restart { - my $msg = "Re-establishing connection to $opts{imap} as $opts{username}"; - - $log->dbug($msg); - - Connect2IMAP; - - goto MONITORMAIL; -} # restart +#sub restart { +# $log->dbug("Re-establishing connection to $opts{imap} as $opts{username}"); +# +# Connect2IMAP; +# +# goto MONITORMAIL; +#} # restart $SIG{USR1} = \&interrupted; -$SIG{USR2} = \&restart; +#$SIG{USR2} = \&restart; sub unseenMsgs() { $IMAP->select('inbox') or @@ -190,7 +192,7 @@ sub Connect2IMAP() { } # Connect2IMAP sub MonitorMail() { - MONITORMAIL: +# MONITORMAIL: $log->dbug("Top of MonitorMail loop"); # First close and reselect the INBOX to get its current status @@ -269,20 +271,27 @@ sub MonitorMail() { # Re-establish callback $log->dbug("Evaling idle"); - eval { $IMAP->idle(\&MonitorMail) }; + eval { $IMAP->idle(\&MonitorMail, $opts{timeout}) }; + + $log->err("Unable to set IMAP Idle - AS $@", 1) if $@; + $log->msg("IMAP Idle for $opts{name} timed out in " . howlong $startTime, time); # If we return from idle then the server went away for some reason. With Gmail - # the server seems to time out around 30-40 minutes. Here we simply reconnect - # to the imap server and continue to MonitorMail. - restart; + # the server seems to time out around 30-40 minutes. Here we simply return + # back to main which will re-establish the connection and call us again. + unless ($IMAP->get_response_code('timeout')) { + my $errstr = $IMAP->get_last_error; - return; + $log->dbug("$opts{name} went away - $errstr"); + } # unless + + return 0; } # MonitorMail END { # If $log is not yet defined then the exit is not unexpected if ($log) { - my $msg = "$FindBin::Script ending unexpectedly!"; + my $msg = "$FindBin::Script $opts{name} ended unexpectedly!"; speak $msg, $log; @@ -302,6 +311,7 @@ GetOptions( 'name=s', 'password=s', 'imap=s', + 'timeout=i', 'usessl', 'useblocking', 'announce!', @@ -333,8 +343,6 @@ $log = Logger->new( append => $opts{append}, ); -Connect2IMAP; - if ($opts{username} =~ /(.*)\@/) { $opts{user} = $1; } else { @@ -343,11 +351,20 @@ if ($opts{username} =~ /(.*)\@/) { my $msg = "Now monitoring email for $opts{user}\@$opts{name}"; -speak $msg, $log if $opts{announce}; +# Changed to loop here - better than using a goto. This kinda kills the idea of +# using siguser2 to interrupt announceEmail.pl to kick it into re-establishing +# the connection. +while () { + Connect2IMAP; + + speak $msg, $log if $opts{announce}; + + $log->msg($msg); -$log->msg($msg); + MonitorMail; -MonitorMail; + $log->dbug("$opts{name} timed out! Re-establishing connection"); +} # while # Should not get here $log->err("Falling off the edge of $0", 1); diff --git a/bin/cleantmp.pl b/bin/cleantmp.pl index 4b42cbe..12898a9 100755 --- a/bin/cleantmp.pl +++ b/bin/cleantmp.pl @@ -77,6 +77,8 @@ use Utils; my ($script) = ($FindBin::Script =~ /^(.*)\.pl/); my $log; +local $0 = $script; + my %opts = ( usage => sub { pod2usage }, help => sub { pod2usage(-verbose => 2)}, diff --git a/bin/setbg b/bin/setbg index 17bdc08..85479a5 100755 --- a/bin/setbg +++ b/bin/setbg @@ -204,6 +204,7 @@ GetOptions ( 'sleep=i', 'lockscreen', 'bgdirs=s@', + 'mate', ) || Usage; local $0 = "$FindBin::Script " . join ' ', @argvCopy; @@ -225,8 +226,16 @@ for (my $i = 0; $i < scalar @{$opts{bgdirs}}; $i++) { # Using gsettings my $setbg = "gsettings"; -my $setbgOpts = "set org.gnome.desktop.background picture-uri \"file://"; -my $setLockOpts = "set org.gnome.desktop.screensaver picture-uri \"file://"; + +my ($setbgOpts, $setLockOpts); + +if ($opts{mate}) { + $setbgOpts = 'set org.mate.background picture-filename '; + $setLockOpts = 'set org.mate.background picture-filename '; +} else { + $setbgOpts = "set org.gnome.desktop.background picture-uri \"file://"; + $setLockOpts = "set org.gnome.desktop.screensaver picture-uri \"file://"; +} # if my @images = fillPictures; @@ -262,7 +271,8 @@ while () { } else { $pickNewImages = 1; - my $cmd = "$setbg $setbgOpts$bgimage\" 2> /dev/null"; + my $cmd = $opts{mate} ? "$setbg $setbgOpts\"$bgimage\" 2> /dev/null" + : "$setbg $setbgOpts$bgimage\" 2> /dev/null"; ($status, @output) = Execute $cmd; @@ -275,7 +285,8 @@ while () { } # if if ($opts{lockscreen}) { - $cmd = "$setbg $setLockOpts$lockimage\" 2> /dev/null"; + $cmd = $opts{mate} ? "$setbg $setLockOpts\"$lockimage\" 2> /dev/null" + : "$setbg $setLockOpts$lockimage\" 2> /dev/null"; ($status, @output) = Execute $cmd; diff --git a/bin/tunnel.pl b/bin/tunnel.pl index 43dbfff..084f661 100755 --- a/bin/tunnel.pl +++ b/bin/tunnel.pl @@ -71,6 +71,8 @@ use Logger; use Speak; use Utils; +local $0 = $FindBin::Script; + my $VERSION = '$Revision: 1.0 $'; ($VERSION) = ($VERSION =~ /\$Revision: (.*) /); diff --git a/etc/cleantmp.conf b/etc/cleantmp.conf index 25d3271..79f3a4a 100644 --- a/etc/cleantmp.conf +++ b/etc/cleantmp.conf @@ -35,3 +35,6 @@ qipc* birdtry* nsemail* vboxdrv-Module* +dbus-* +r2-ipc +Rainlendar2*