some improvments and cleanup

1 files changed, 28 insertions, 22 deletions

diff --git a/rhautoimport-tr b/rhautoimport-tr
index b10815f..541d2d7 100755
--- a/rhautoimport-tr
+++ b/rhautoimport-tr
@@ -23,6 +23,7 @@
 
 use strict;
 use Date::Calc;
+use DateTime::Format::Strptime;
 use XML::Feed;
 use XML::Feed::Entry;
 use XML::Feed::Content;
@@ -40,18 +41,12 @@ my $RD_GROUP = "tierrecht";
 my $PV_ID = '506';
 my $TITLE="Tierrechtsradio";
 my $LAST_RUN = 0;
+my $upload_delay_days = 0;   # files are usally there on the same day of the original broadcast
 
 binmode(STDIN, ":utf8");
 binmode(STDOUT, ":utf8");
 binmode(STDERR, ":utf8");
 
-my @today = Date::Calc::Standard_to_Business(Date::Calc::Today());
-if($today[2] == 5) {
-  print "please don't run this script on fridays!\n";
-  rhautoimport::report_title_and_last($TITLE, 0);
-  exit 42;
-}
-
 if($#ARGV >= 0 && $ARGV[0] eq 'last') {
   print "!!!This is the last attempt, there won't be a retry on error!!!\n";
   $LAST_RUN = 1;
@@ -73,18 +68,25 @@ my $show_id = $allowed_dbs[0]->{'SHOWID'};
 my $show_title = $allowed_dbs[0]->{'SHOWTITLE'};
 
 
-my @broadcast_day = Date::Calc::Business_to_Standard($today[0], $today[1], 5);
-if($today[2] < 5) {
-  @broadcast_day = Date::Calc::Add_Delta_Days(@broadcast_day, -7);
+my @today = Date::Calc::Today();
+my @tmp = Date::Calc::Standard_to_Business(@today);
+my @broadcast_date = Date::Calc::Business_to_Standard($tmp[0], $tmp[1], 5);
+if($tmp[2] < 5) {
+  @broadcast_date = Date::Calc::Add_Delta_Days(@broadcast_date, -7);
 }
-my @import_date = Date::Calc::Add_Delta_Days(@broadcast_day, 7);
-print "day of original broadcast: " . Date::Calc::Date_to_Text(@broadcast_day) . "\n";
+my @import_date = Date::Calc::Add_Delta_Days(@broadcast_date, 7);
+print "day of original broadcast: " . Date::Calc::Date_to_Text(@broadcast_date) . "\n";
 print "day of Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@import_date) . "\n";
 
+if(Date::Calc::Delta_Days(@broadcast_date, @today) <= $upload_delay_days) {
+  print "File won't be available by now!\n";
+  exit 42;
+}
+
 my $id = sprintf("%04d-%02d-%02d", @import_date);
-my $bd = sprintf("%04d-%02d-%02d", @broadcast_day);
-my $bdfile = sprintf("^%04d-?%02d-?%02d", @broadcast_day);
-print "looking for files from $bd in RSS Feed\n";
+my $bd = sprintf("%04d-%02d-%02d", @broadcast_date);
+
+print "looking for files with cba:broadcastDate $bd in RSS Feed\n";
 print " -> $RSS_URL\n";
 
 my ($result, $feed) = rhautoimport::fetch_parse_rss_cba($RSS_URL);
@@ -102,6 +104,13 @@ my $i = 0;
 for my $entry ($feed->entries) {
   $i++;
   next unless $entry->enclosure;
+
+  my $entry_bdt = $entry->{'entry'}{'https://cba.fro.at/help#feeds'}{'broadcastDate'};
+  next unless (defined $entry_bdt);
+  my $bdt = DateTime::Format::Strptime::strptime("%a, %d %b %Y %H:%M:%S", $entry_bdt);
+
+  next unless($broadcast_date[0] == $bdt->year && $broadcast_date[1] == $bdt->month && $broadcast_date[2] == $bdt->day);
+
   my $j = 0;
   for my $enclosure($entry->enclosure) {
     $j++;
@@ -115,13 +124,10 @@ for my $entry ($feed->entries) {
       $uri = new URI::URL($orig_uri);
       my @path = $uri->path_components;
       $file = $path[-1];
-      unless(uc($file) =~ $bdfile) { # file not from correct day
-        $uri = "";
-        next;
-      }
 
-      my $current_file = `cat $STAT_FILE`;
-      if($current_file eq $file) {
+      my $current_stat = `cat $STAT_FILE`;
+      my ($current_id, $current_file) = $current_stat =~ m/^(.*)\n(.*)/;
+      if($current_id eq $id  &&  $current_file eq $file) {
         print "Already downloaded file of today\n";
         exit 42;
       }
@@ -172,7 +178,7 @@ if($ret) {
 
 unlink($STAT_FILE);
 open(my $fhs, '>', $STAT_FILE);
-print $fhs "$file";
+print $fhs "$id\n$file";
 close($fhs);
 
 exit $exit_code;