X-Git-Url: http://git.refcnt.org/?p=lugs.git;a=blobdiff_plain;f=lreminder%2Freminder.pl;h=eb9d79461e22a221c1d4de2e6fb4ffdfcb32a5e0;hp=aa0bc9ea48ab1145f491bc166b93f2eaf2ab24c5;hb=990582d3ffc09369b8f85b6b8e37a3959778f34e;hpb=11bd7a1a30f39afa0a880a99de22d87efb87fb6d

diff --git a/lreminder/reminder.pl b/lreminder/reminder.pl
index aa0bc9e..eb9d794 100755
--- a/lreminder/reminder.pl
+++ b/lreminder/reminder.pl
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # Author: Steven Schubiger <stsc@refcnt.org>
-# Last modified: Thu Jan 31 11:12:22 CET 2013
+# Last modified: Fri Jan  8 12:43:13 CET 2016
 
 use strict;
 use warnings;
@@ -23,7 +23,9 @@ use lib qw(lib);
 use constant true  => 1;
 use constant false => 0;
 
+use DateTime ();
 use DBI ();
+use Encode qw(encode);
 use File::Basename ();
 use File::Spec ();
 use FindBin qw($Bin);
@@ -32,9 +34,10 @@ use Hook::Output::File ();
 use LUGS::Events::Parser ();
 use Mail::Sendmail qw(sendmail);
 use Text::Wrap::Smart::XS qw(fuzzy_wrap);
+use URI ();
 use WWW::Mechanize ();
 
-my $VERSION = '0.41';
+my $VERSION = '0.51';
 
 #-----------------------
 # Start of configuration
@@ -47,6 +50,8 @@ my $Config = {
     dbase_name => '<hidden>',
     dbase_user => '<hidden>',
     dbase_pass => '<hidden>',
+    sleep_secs => 300,
+    max_tries  => 48,
 };
 
 #---------------------
@@ -54,7 +59,7 @@ my $Config = {
 #---------------------
 
 my $dbh  = DBI->connect("dbi:mysql(RaiseError=>1):$Config->{dbase_name}", $Config->{dbase_user}, $Config->{dbase_pass});
-my $file = File::Basename::basename($Config->{events_url});
+my $file = File::Spec->catfile('tmp', (URI->new($Config->{events_url})->path_segments)[-1]);
 
 my ($test, $run) = (false, false);
 
@@ -86,16 +91,36 @@ sub getopts
 sub fetch_and_write_events
 {
     my $mech = WWW::Mechanize->new;
-    my $http = $mech->get($Config->{events_url});
 
-    open(my $fh, '>', $file) or die "Cannot open $file: $!\n";
-    print {$fh} $http->content;
-    close($fh);
+    my ($http, $retry, $tries);
+    $http = undef;
+
+    do {
+        $retry = false;
+        $tries++;
+        eval {
+            $http = $mech->get($Config->{events_url});
+        } or do {
+            warn "[${\scalar localtime}] $@";
+            $retry = ($tries < $Config->{max_tries}) ? true : false;
+            sleep $Config->{sleep_secs} if $retry;
+        };
+    } while ($retry);
+
+    if (defined $http) {
+        open(my $fh, '>', $file) or die "Cannot open $file for writing: $!\n";
+        print {$fh} $http->content;
+        close($fh);
+    }
+    else {
+        warn "[${\scalar localtime}] ${\File::Basename::basename($0)} not entirely run, no http content\n";
+        exit;
+    }
 }
 
 sub init
 {
-    my ($parser, $month_days, $current) = @_;
+    my ($parser) = @_;
 
     $$parser = LUGS::Events::Parser->new($file, {
         filter_html  => true,
@@ -107,36 +132,17 @@ sub init
                 rewrite => '$TEXT - $HREF',
                 fields  => [ qw(location more) ],
             } ],
-            'br' => [ {
-                rewrite => '',
-                fields  => [ qw(more) ],
-            } ],
         },
+        purge_tags => [ qw(location responsible more) ],
         strip_text => [ 'mailto:' ],
     });
     unlink $file;
-
-    %$month_days = (
-        1 => 31,   7 => 31,
-        2 => 28,   8 => 31,
-        3 => 31,   9 => 30,
-        4 => 30,  10 => 31,
-        5 => 31,  11 => 30,
-        6 => 30,  12 => 31,
-    );
-
-    %$current = do {
-        my @time = (localtime)[3..5];
-        $time[1]++;
-        $time[2] += 1900;
-        map { $_ => shift @time } qw(day month year);
-    };
 }
 
 sub process_events
 {
-    my   ($parser,  %month_days,  %current);
-    init(\$parser, \%month_days, \%current);
+    my $parser;
+    init(\$parser);
 
     while (my $event = $parser->next_event) {
         my %event = (
@@ -160,24 +166,15 @@ sub process_events
             my $subscriptions = $sth{subscriptions}->fetchrow_hashref;
             next unless $subscriptions->{$event{color}};
 
-            my %notify = %current;
+            my $notify = DateTime->now(time_zone => 'Europe/Zurich');
 
             $subscriber->{notify} ||= 0;
 
-            my $day = $current{day} + $subscriber->{notify};
-            my $days_in_month = $month_days{$current{month}};
-
-            if ($day > $days_in_month) {
-                $notify{day} = $day - $days_in_month;
-                $notify{month}++;
-            }
-            else {
-                $notify{day} += $subscriber->{notify};
-            }
+            $notify->add(days => $subscriber->{notify});
 
-            if ($event{year}  == $notify{year}
-             && $event{month} == $notify{month}
-             && $event{day}   == $notify{day}
+            if ($event{year}  == $notify->year
+             && $event{month} == $notify->month
+             && $event{day}   == $notify->day
             ) {
                 send_mail($event, $subscriber->{mail});
             }
@@ -211,7 +208,7 @@ sub send_mail
 
     my $month_name = $month_names{$month};
 
-my $message = (<<MSG);
+my $message = (<<"MSG");
 Wann:\t$wday, $simple_day. $month_name $year, $time Uhr
 Was :\t$title
 Wo  :\t$location
@@ -228,9 +225,9 @@ MSG
         sendmail(
             From    => $Config->{mail_from},
             To      => $mail_subscriber,
-            Subject => "LUGS Reminder - $title",
+            Subject => encode('MIME-Q', "LUGS Reminder - $title"),
             Message => $message,
-        ) or die $Mail::Sendmail::error;
+        ) or die "Cannot send mail: $Mail::Sendmail::error";
     }
     elsif ($test) {
         printf "[%s] <$mail_subscriber> ($color)\n", scalar localtime;
@@ -261,9 +258,9 @@ sub info_string
     my $modified = localtime((stat($0))[9]);
 
     $modified =~ s/(?<=\b) (?:\d{2}\:?){3} (?=\b)//x;
-    $modified =~ s/\s+/ /g;
+    $modified =~ s/\s{2,}/ /g;
 
-    my $info = <<EOT;
+    my $info = <<"EOT";
 -- 
 running $script v$VERSION - last modified: $modified
 EOT