From f0ea46dac7e7ae2af6db87b8f31342e1813fb5fb Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 13 Jan 2021 21:10:39 +0100
Subject: XY has been canceled
diff --git a/INFO b/INFO
index 03d1b69..199b2f3 100644
--- a/INFO
+++ b/INFO
@@ -106,15 +106,6 @@
RH: 4wöchentlich, Woche 3, Dienstag, 16:30-17:00
4wöchentlich, Woche 2, Mittwoch, 14:30-15:00, Wiederholung
-- (xy) X_XY (Un)gelöst und (Un)erhört!:
- https://cba.fro.at/series/x_xy-ungeloest-und-unerhoert/feed
-
- Original: 2wöchentlich, Woche 2/4, Freitag
- Upload: oft ein paar Tage davor, manchmal erst 1 Tag später
- Such-Kriterium: Dateiname bgeinnt mit 'dd-mm-YYYY'
- RH: 4wöchentlich, Woche 4, Dienstag, 13:00-14:00
- (wir übernehmen die aktuellste Sendung)
-
- (dm) das mensch. gender_queer on air:
https://cba.fro.at/series/das-mensch-gender_queer-on-air/feed
diff --git a/Makefile b/Makefile
index 7e3526e..203e528 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endif
.PHONY: clean distclean
EXECUTABLE := rhautoimport
-IMPORTER := ba btl cb dm dn dv ek eu gd lr oi po rs ra tr wr xy
+IMPORTER := ba btl cb dm dn dv ek eu gd lr oi po rs ra tr wr
EXECUTABLES := $(IMPORTER:%=$(EXECUTABLE)-%)
all: $(EXECUTABLE)
diff --git a/graveyard/INFO b/graveyard/INFO
index ca882f0..0cc3919 100644
--- a/graveyard/INFO
+++ b/graveyard/INFO
@@ -42,3 +42,12 @@
Upload: ein paar tage davor, gelegentlich erst ein paar Tage später...
Such-Kriterium: cba:broadcastDate wenn gesetzt sonst cba:productionDate
RH: 4wöchentlich, Woche 3, Freitag, 15:00-16:00
+
+- (xy) X_XY (Un)gelöst und (Un)erhört!:
+ https://cba.fro.at/series/x_xy-ungeloest-und-unerhoert/feed
+
+ Original: 2wöchentlich, Woche 2/4, Freitag
+ Upload: oft ein paar Tage davor, manchmal erst 1 Tag später
+ Such-Kriterium: Dateiname bgeinnt mit 'dd-mm-YYYY'
+ RH: 4wöchentlich, Woche 4, Dienstag, 13:00-14:00
+ (wir übernehmen die aktuellste Sendung)
diff --git a/graveyard/rhautoimport-xy b/graveyard/rhautoimport-xy
new file mode 100755
index 0000000..36722c3
--- /dev/null
+++ b/graveyard/rhautoimport-xy
@@ -0,0 +1,219 @@
+#!/usr/bin/perl -w
+#
+#
+# rhautoimport
+#
+# Copyright (C) 2009-2017 Christian Pointner <equinox@helsinki.at>
+#
+# This file is part of rhautoimport.
+#
+# rhautoimport is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# rhautoimport is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with rhautoimport. If not, see <http://www.gnu.org/licenses/>.
+#
+
+use strict;
+use Date::Calc;
+use XML::Feed;
+use XML::Feed::Entry;
+use XML::Feed::Content;
+use XML::Feed::Enclosure;
+use URI::URL;
+use HTML::Entities;
+
+use lib '/usr/local/share/rhautoimport/';
+use rhautoimport;
+
+my $STAT_FILE = $ENV{'HOME'} . "/rhautoimport-xy.stat";
+my $RSS_URL = "https://cba.fro.at/series/x_xy-ungeloest-und-unerhoert/feed";
+$XML::Feed::MULTIPLE_ENCLOSURES=1;
+my $RD_GROUP = "X_XYungel";
+my $RD_CART = 111001;
+my $PV_ID = '608';
+my $TITLE="X_XY (Un)gelöst und (Un)erhört!";
+my $LAST_RUN = 0;
+my $upload_delay_days = 1; # files are usally there at least 1 day after original broadcast
+my $last_resort_threshold = 2; # also consider older file when there are only 2 days until the RH broadcast
+
+binmode(STDIN, ":utf8");
+binmode(STDOUT, ":utf8");
+binmode(STDERR, ":utf8");
+
+my $curweek = RHRD::utils::get_rd_week();
+
+if($#ARGV >= 0 && $ARGV[0] eq 'last') {
+ if($curweek == 4) {
+ print "!!!This is the last attempt, there won't be a retry on error!!!\n";
+ $LAST_RUN = 1;
+ }
+}
+rhautoimport::report_title_and_last($TITLE, $LAST_RUN);
+
+
+my @allowed_dbs = rhautoimport::get_dropboxes($RD_GROUP);
+if(!defined $allowed_dbs[0] && defined $allowed_dbs[1]) {
+ print "$allowed_dbs[1]\n";
+ exit 1;
+}
+
+if(scalar(@allowed_dbs) != 1) {
+ print "found more or less than one Dropbox for this group?!\n";
+ exit 1;
+}
+my $show_id = $allowed_dbs[0]->{'SHOWID'};
+my $show_title = $allowed_dbs[0]->{'SHOWTITLE'};
+
+my @today = Date::Calc::Today();
+
+my @import_date = Date::Calc::Standard_to_Business(@today);
+my $dow = $import_date[2];
+@import_date = Date::Calc::Business_to_Standard($import_date[0], $import_date[1], 2);
+if($curweek == 1) {
+ @import_date = Date::Calc::Add_Delta_Days(@import_date, 21);
+} elsif ($curweek == 2) {
+ @import_date = Date::Calc::Add_Delta_Days(@import_date, 14);
+} elsif ($curweek == 3) {
+ @import_date = Date::Calc::Add_Delta_Days(@import_date, 7);
+} elsif($dow > 2) {
+ @import_date = Date::Calc::Add_Delta_Days(@import_date, 28);
+}
+
+my @broadcast_dateW2 = Date::Calc::Add_Delta_Days(@import_date, -11);
+print "today: " . Date::Calc::Date_to_Text(@today) . "\n";
+print "day of next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@import_date) . "\n";
+print "day of latest original broadcast before next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@broadcast_dateW2) . "\n";
+
+if(Date::Calc::Delta_Days(@broadcast_dateW2, @today) <= $upload_delay_days) {
+ print "File won't be available by now!\n";
+ exit 42;
+}
+
+my $includeW4 = 0;
+my @broadcast_dateW4 = Date::Calc::Add_Delta_Days(@broadcast_dateW2, -14);
+if(Date::Calc::Delta_Days(@import_date, @today) <= $last_resort_threshold) {
+ $includeW4 = 1;
+ print " ... it's already late, also including show from: " . Date::Calc::Date_to_Text(@broadcast_dateW4) . "\n";
+}
+
+my $id = sprintf("%04d-%02d-%02d", @import_date);
+my $bdW2 = sprintf("%04d-%02d-%02d", @broadcast_dateW2);
+my $bdW4 = sprintf("%04d-%02d-%02d", @broadcast_dateW4);
+my $bdfileW2 = sprintf("^0?%d-?0?%d-?%04d", $broadcast_dateW2[2], $broadcast_dateW2[1], $broadcast_dateW2[0]);
+my $bdfileW4 = sprintf("^0?%d-?0?%d-?%04d", $broadcast_dateW4[2], $broadcast_dateW4[1], $broadcast_dateW4[0]);
+
+if($includeW4) {
+ print "looking for files like '$bdfileW2' and '$bdfileW4' in RSS Feed\n";
+} else {
+ print "looking for files like '$bdfileW2' in RSS Feed\n";
+}
+print " -> $RSS_URL\n";
+
+my ($result, $feed) = rhautoimport::fetch_parse_rss_cba($RSS_URL);
+unless ($result) {
+ print "Error fetching feed: $feed\n";
+ exit 1;
+}
+
+my $uri = "";
+my $file = "";
+my $sum_title = "";
+my $sum_text = "";
+
+my $i = 0;
+for my $entry ($feed->entries) {
+ $i++;
+ next unless $entry->enclosure;
+ my $j = 0;
+ for my $enclosure($entry->enclosure) {
+ $j++;
+ if($enclosure->type eq "audio/mpeg" || $enclosure->type eq "audio/ogg") {
+ print "$i/$j: (" . $enclosure->type . ", " . $enclosure->length . ") " . $enclosure->url . "\n";
+ my $orig_uri = $enclosure->url;
+ if($orig_uri =~ /^(.*)_cut(\.[^\.]+)$/) {
+ $orig_uri = $1 . $2;
+ }
+
+ $uri = new URI::URL($orig_uri);
+ my @path = $uri->path_components;
+ $file = $path[-1];
+ unless(uc($file) =~ $bdfileW2) { # file not from correct day
+ if($includeW4) {
+ unless(uc($file) =~ $bdfileW4) { # file not from correct day (either from the show 2 weeks earlier
+ $uri = "";
+ next;
+ }
+ } else {
+ $uri = "";
+ next;
+ }
+ }
+
+ my $current_file = `cat $STAT_FILE`;
+ if($current_file eq $file) {
+ print "Already downloaded file of today\n";
+ exit 42;
+ }
+ if(!rhautoimport::check_file_extension($file)) {
+ print "\n\nThe extension of the matching file '". $file . "' seems to be wrong - manual import necessary!!!\n";
+ print "\n\n --> https://import.helsinki.at/shows/$show_id\n";
+ exit 1;
+ }
+
+ $sum_title = decode_entities($entry->title);
+ $sum_text = decode_entities($entry->content->body);
+ print "summary:\n" . $sum_title . "\n\n" . $sum_text . "\n";
+ last;
+ }
+ }
+ last if $uri ne "";
+}
+if($uri eq "") {
+ if($includeW4) {
+ print "No Entry found from $bdW2 or $bdW4 - ";
+ } else {
+ print "No Entry found from $bdW2 - ";
+ }
+ if($LAST_RUN) {
+ print "giving up, manual import necessary!!!\n";
+ print "\n\n --> https://import.helsinki.at/shows/$show_id\n";
+ } else {
+ print "will retry later\n";
+ }
+ exit 1;
+}
+
+print "\n\nwill import '$uri' to show $show_id, $show_title\n\n";
+
+my ($ret, $log) = rhautoimport::import_uri($show_id, $uri->as_string, undef, $RD_CART);
+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);
+print $fhs "$file";
+close($fhs);
+
+exit $exit_code;
diff --git a/rhautoimport-xy b/rhautoimport-xy
deleted file mode 100755
index 36722c3..0000000
--- a/rhautoimport-xy
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/perl -w
-#
-#
-# rhautoimport
-#
-# Copyright (C) 2009-2017 Christian Pointner <equinox@helsinki.at>
-#
-# This file is part of rhautoimport.
-#
-# rhautoimport is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# any later version.
-#
-# rhautoimport is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with rhautoimport. If not, see <http://www.gnu.org/licenses/>.
-#
-
-use strict;
-use Date::Calc;
-use XML::Feed;
-use XML::Feed::Entry;
-use XML::Feed::Content;
-use XML::Feed::Enclosure;
-use URI::URL;
-use HTML::Entities;
-
-use lib '/usr/local/share/rhautoimport/';
-use rhautoimport;
-
-my $STAT_FILE = $ENV{'HOME'} . "/rhautoimport-xy.stat";
-my $RSS_URL = "https://cba.fro.at/series/x_xy-ungeloest-und-unerhoert/feed";
-$XML::Feed::MULTIPLE_ENCLOSURES=1;
-my $RD_GROUP = "X_XYungel";
-my $RD_CART = 111001;
-my $PV_ID = '608';
-my $TITLE="X_XY (Un)gelöst und (Un)erhört!";
-my $LAST_RUN = 0;
-my $upload_delay_days = 1; # files are usally there at least 1 day after original broadcast
-my $last_resort_threshold = 2; # also consider older file when there are only 2 days until the RH broadcast
-
-binmode(STDIN, ":utf8");
-binmode(STDOUT, ":utf8");
-binmode(STDERR, ":utf8");
-
-my $curweek = RHRD::utils::get_rd_week();
-
-if($#ARGV >= 0 && $ARGV[0] eq 'last') {
- if($curweek == 4) {
- print "!!!This is the last attempt, there won't be a retry on error!!!\n";
- $LAST_RUN = 1;
- }
-}
-rhautoimport::report_title_and_last($TITLE, $LAST_RUN);
-
-
-my @allowed_dbs = rhautoimport::get_dropboxes($RD_GROUP);
-if(!defined $allowed_dbs[0] && defined $allowed_dbs[1]) {
- print "$allowed_dbs[1]\n";
- exit 1;
-}
-
-if(scalar(@allowed_dbs) != 1) {
- print "found more or less than one Dropbox for this group?!\n";
- exit 1;
-}
-my $show_id = $allowed_dbs[0]->{'SHOWID'};
-my $show_title = $allowed_dbs[0]->{'SHOWTITLE'};
-
-my @today = Date::Calc::Today();
-
-my @import_date = Date::Calc::Standard_to_Business(@today);
-my $dow = $import_date[2];
-@import_date = Date::Calc::Business_to_Standard($import_date[0], $import_date[1], 2);
-if($curweek == 1) {
- @import_date = Date::Calc::Add_Delta_Days(@import_date, 21);
-} elsif ($curweek == 2) {
- @import_date = Date::Calc::Add_Delta_Days(@import_date, 14);
-} elsif ($curweek == 3) {
- @import_date = Date::Calc::Add_Delta_Days(@import_date, 7);
-} elsif($dow > 2) {
- @import_date = Date::Calc::Add_Delta_Days(@import_date, 28);
-}
-
-my @broadcast_dateW2 = Date::Calc::Add_Delta_Days(@import_date, -11);
-print "today: " . Date::Calc::Date_to_Text(@today) . "\n";
-print "day of next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@import_date) . "\n";
-print "day of latest original broadcast before next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@broadcast_dateW2) . "\n";
-
-if(Date::Calc::Delta_Days(@broadcast_dateW2, @today) <= $upload_delay_days) {
- print "File won't be available by now!\n";
- exit 42;
-}
-
-my $includeW4 = 0;
-my @broadcast_dateW4 = Date::Calc::Add_Delta_Days(@broadcast_dateW2, -14);
-if(Date::Calc::Delta_Days(@import_date, @today) <= $last_resort_threshold) {
- $includeW4 = 1;
- print " ... it's already late, also including show from: " . Date::Calc::Date_to_Text(@broadcast_dateW4) . "\n";
-}
-
-my $id = sprintf("%04d-%02d-%02d", @import_date);
-my $bdW2 = sprintf("%04d-%02d-%02d", @broadcast_dateW2);
-my $bdW4 = sprintf("%04d-%02d-%02d", @broadcast_dateW4);
-my $bdfileW2 = sprintf("^0?%d-?0?%d-?%04d", $broadcast_dateW2[2], $broadcast_dateW2[1], $broadcast_dateW2[0]);
-my $bdfileW4 = sprintf("^0?%d-?0?%d-?%04d", $broadcast_dateW4[2], $broadcast_dateW4[1], $broadcast_dateW4[0]);
-
-if($includeW4) {
- print "looking for files like '$bdfileW2' and '$bdfileW4' in RSS Feed\n";
-} else {
- print "looking for files like '$bdfileW2' in RSS Feed\n";
-}
-print " -> $RSS_URL\n";
-
-my ($result, $feed) = rhautoimport::fetch_parse_rss_cba($RSS_URL);
-unless ($result) {
- print "Error fetching feed: $feed\n";
- exit 1;
-}
-
-my $uri = "";
-my $file = "";
-my $sum_title = "";
-my $sum_text = "";
-
-my $i = 0;
-for my $entry ($feed->entries) {
- $i++;
- next unless $entry->enclosure;
- my $j = 0;
- for my $enclosure($entry->enclosure) {
- $j++;
- if($enclosure->type eq "audio/mpeg" || $enclosure->type eq "audio/ogg") {
- print "$i/$j: (" . $enclosure->type . ", " . $enclosure->length . ") " . $enclosure->url . "\n";
- my $orig_uri = $enclosure->url;
- if($orig_uri =~ /^(.*)_cut(\.[^\.]+)$/) {
- $orig_uri = $1 . $2;
- }
-
- $uri = new URI::URL($orig_uri);
- my @path = $uri->path_components;
- $file = $path[-1];
- unless(uc($file) =~ $bdfileW2) { # file not from correct day
- if($includeW4) {
- unless(uc($file) =~ $bdfileW4) { # file not from correct day (either from the show 2 weeks earlier
- $uri = "";
- next;
- }
- } else {
- $uri = "";
- next;
- }
- }
-
- my $current_file = `cat $STAT_FILE`;
- if($current_file eq $file) {
- print "Already downloaded file of today\n";
- exit 42;
- }
- if(!rhautoimport::check_file_extension($file)) {
- print "\n\nThe extension of the matching file '". $file . "' seems to be wrong - manual import necessary!!!\n";
- print "\n\n --> https://import.helsinki.at/shows/$show_id\n";
- exit 1;
- }
-
- $sum_title = decode_entities($entry->title);
- $sum_text = decode_entities($entry->content->body);
- print "summary:\n" . $sum_title . "\n\n" . $sum_text . "\n";
- last;
- }
- }
- last if $uri ne "";
-}
-if($uri eq "") {
- if($includeW4) {
- print "No Entry found from $bdW2 or $bdW4 - ";
- } else {
- print "No Entry found from $bdW2 - ";
- }
- if($LAST_RUN) {
- print "giving up, manual import necessary!!!\n";
- print "\n\n --> https://import.helsinki.at/shows/$show_id\n";
- } else {
- print "will retry later\n";
- }
- exit 1;
-}
-
-print "\n\nwill import '$uri' to show $show_id, $show_title\n\n";
-
-my ($ret, $log) = rhautoimport::import_uri($show_id, $uri->as_string, undef, $RD_CART);
-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);
-print $fhs "$file";
-close($fhs);
-
-exit $exit_code;
--
cgit v0.10.2