diff options
| -rw-r--r-- | INFO | 5 | ||||
| -rwxr-xr-x | rhautoimport-ra | 74 |
2 files changed, 21 insertions, 58 deletions
@@ -63,9 +63,8 @@ Original: wöchentlich Montags Upload: meistens am selben Tag, abends (> 20 Uhr) - Such-Kriterium: cba:productionDate - RH: wöchentlich, Mittwoch, 15:00-15:30 - wöchentlich, Samstag, 15:30-16:00, Wiederholung + Such-Kriterium: cba:broadcastDate wenn gesetzt sonst cba:productionDate + RH: wöchentlich, Samstag, 15:30-16:00 - (tr) Tierrechtsradio: https://cba.fro.at/series/tierrechtsradio/feed diff --git a/rhautoimport-ra b/rhautoimport-ra index 6492d6b..46980e5 100755 --- a/rhautoimport-ra +++ b/rhautoimport-ra @@ -60,34 +60,29 @@ if(!defined $allowed_dbs[0] && defined $allowed_dbs[1]) { exit 1; } -my $idx = 0; -my $idx_reb = 1; -if(scalar(@allowed_dbs) != 2) { - print "found more or less than 2 Dropboxes for this group?!\n"; +if(scalar(@allowed_dbs) != 1) { + print "found more or less than one Dropbox for this group?!\n"; exit 1; } -my $show_id = $allowed_dbs[$idx]->{'SHOWID'}; -my $show_title = $allowed_dbs[$idx]->{'SHOWTITLE'}; -my $show_id_reb = $allowed_dbs[$idx_reb]->{'SHOWID'}; -my $show_title_reb = $allowed_dbs[$idx_reb]->{'SHOWTITLE'}; +my $show_id = $allowed_dbs[0]->{'SHOWID'}; +my $show_title = $allowed_dbs[0]->{'SHOWTITLE'}; my @today = Date::Calc::Today(); my @tmp = Date::Calc::Standard_to_Business(@today); $tmp[2] = 1; my @broadcast_date = Date::Calc::Business_to_Standard(@tmp); -$tmp[2] = 3; +$tmp[2] = 6; my @import_date = Date::Calc::Business_to_Standard(@tmp); -my @import_date_reb = Date::Calc::Add_Delta_Days(@import_date, 3); 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"; -print "day of Radio Helsinki rebroadcast: " . Date::Calc::Date_to_Text(@import_date_reb) . "\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_date); print "looking for files with cba:broadcastDate $bd in RSS Feed (will be using cba:productionDate if cba:broadcastDate is not set)\n"; @@ -164,56 +159,25 @@ if($uri eq "") { exit 1; } -my $exit_code = 0; -print "\n\nwill import '$uri' to show $show_id, $show_title\n"; -my ($ret, $log, $keptfile_uri) = rhautoimport::import_uri($show_id, $uri->as_string, "keep"); -if($ret == 0) { - print "\nImport Success:\n\n"; - print $log; - print "\n"; - ($ret, $log) = rhautoimport::pv_add_note($sum_title, $sum_text, $PV_ID, sprintf("%04d-%02d-%02d", @import_date), "1"); - print $log; - if($ret) { - print "\nIgnoring failed note import - manual intervention necessary!\n"; - $exit_code = 23; - } - - print "\n"; - - if(!defined($keptfile_uri)) { - print "rhimportd didn't provide a clue where to find the kept file... will import '$uri' to rebroadcast $show_id_reb, $show_title_reb\n"; - ($ret, $log) = rhautoimport::import_uri($show_id_reb, $uri->as_string); - } else { - print "re-using kept file '$keptfile_uri' to import rebroadcast $show_id_reb, $show_title_reb\n"; - ($ret, $log) = rhautoimport::import_uri($show_id_reb, $keptfile_uri, "delete"); - } - - if($ret == 0) { - print "\nImport Success:\n\n"; - print $log; - print "\n"; - ($ret, $log) = rhautoimport::pv_add_note($sum_title, $sum_text, $PV_ID, sprintf("%04d-%02d-%02d", @import_date_reb), "2"); - print $log; - if($ret) { - print "\nIgnoring failed note import - manual intervention necessary!\n"; - $exit_code = 23; - } +print "\n\nwill import '$uri' to show $show_id, $show_title\n\n"; - } else { - print "\nImport Error:\n\n"; - print $log; - print "\n\nNot adding PV note!!"; - print "\n\nSince the import for the regular broadcast went through we will not retry this import!!!"; - print "\nYou need to manually import the rebroadcast."; - print "\n\n --> https://import.helsinki.at/shows/$show_id_reb\n"; - $exit_code = 23; - } -} else { +my ($ret, $log) = rhautoimport::import_uri($show_id, $uri->as_string); +if($ret) { print "\nImport Error:\n\n"; print $log; print "\n\nNot adding PV note!!"; exit 1; } +print "\nImport Success:\n\n"; +print $log; +print "\n"; +my $exit_code = 0; +($ret, $log) = rhautoimport::pv_add_note($sum_title, $sum_text, $PV_ID, $id, "1"); +print $log; +if($ret) { + print "\nIgnoring failed note import - manual intervention necessary!\n"; + $exit_code = 23; +} unlink($STAT_FILE); open(my $fhs, '>', $STAT_FILE); |