From f36b93bfd29a520f79f11a05f9b3c0c3aba4f47a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 12 Mar 2016 05:24:11 +0100 Subject: onda-info importer now uses rhimportd as well diff --git a/rhautoimport-oi b/rhautoimport-oi index 33a6d80..fe8601f 100755 --- a/rhautoimport-oi +++ b/rhautoimport-oi @@ -27,11 +27,8 @@ use XML::Feed; use XML::Feed::Entry; use XML::Feed::Content; use XML::Feed::Enclosure; -use File::Fetch; -use IO::Handle; -use IPC::Open3; +use URI::URL; use HTML::Entities; -use RHRD::rddb; use lib '/usr/local/share/rhautoimport/'; use rhautoimport; @@ -39,38 +36,26 @@ use rhautoimport; my $STAT_FILE = $ENV{'HOME'} . "/rhautoimport-oi.stat"; my $LAST_FILE = $ENV{'HOME'} . "/rhautoimport-oi.last"; my $RSS_URL = "http://npla.de/onda/feed/serie=3"; +my $RD_GROUP = "ondainfo"; my $PV_ID = '220'; -binmode(STDIN, ":utf8"); -binmode(STDOUT, ":utf8"); -binmode(STDERR, ":utf8"); - if($#ARGV >= 0 && $ARGV[0] eq 'last') { print "!!!This is the last attempt, there won't be a retry on error!!!\n" } -my $user = `/usr/bin/id -un`; -$user =~ s/\n//; -my $group = "ondainfo"; -my ($dbh, $errorstring) = RHRD::rddb::opendb(); -if(!defined $dbh) { - print "$errorstring\n"; - exit 1; -} -my @allowed_dbs = RHRD::rddb::get_dropboxes($dbh, $user, $group); -if(!defined $allowed_dbs[0] && defined $allowed_dbs[2]) { - print "$allowed_dbs[2]\n"; +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"; - RHRD::rddb::closedb($dbh); exit 1; } -my $dropbox = $allowed_dbs[0]->{'PATH'}; -my $to_cart = $allowed_dbs[0]->{'TO_CART'}; +my $show_id = $allowed_dbs[0]->{'SHOWID'}; +my $show_title = $allowed_dbs[0]->{'SHOWTITLE'}; my @today = Date::Calc::Today(); @@ -87,13 +72,12 @@ print "day of next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@impor print "Number of next broadcast: " . $broadcast_num . "\n"; my $id = sprintf("%04d-%02d-%02d", @import_date); -my $bdfile = sprintf('.*onda.?info_%d.*\.mp3$', $broadcast_num); +my $bdfile = sprintf('.*onda.?info[-_]%d.*\.mp3$', $broadcast_num); my $current_stat = `cat $STAT_FILE`; my ($current_id, $current_file) = $current_stat =~ m/^(.*)\n(.*)/; if($current_id eq $id) { print "Already downloaded current file\n"; - RHRD::rddb::closedb($dbh); exit 0; } @@ -103,37 +87,32 @@ print " -> $RSS_URL\n"; my $feed = rhautoimport::fetch_parse_rss($RSS_URL) or die "Error fetching feed: " . XML::Feed->errstr; +my $uri = ""; my $file = ""; -my $out_file = ""; for my $entry ($feed->entries) { if($entry->enclosure) { print $entry->enclosure->url . "\n"; next unless $entry->enclosure->url =~ /$bdfile/; - my $sum_title = decode_entities($entry->title); - my $sum_text = decode_entities($entry->content->body); + $uri = new URI::URL($entry->enclosure->url); + my @path = $uri->path_components; + $file = $path[-1]; - my $ff = File::Fetch->new(uri => $entry->enclosure->url); - $out_file = $ff->output_file; - if(!rhautoimport::check_file_extension($out_file)) { - print "\n\nThe extension of the matching file '". $out_file . "' seems to be wrong - manual import necessary!!!\n"; - RHRD::rddb::closedb($dbh); + if(!rhautoimport::check_file_extension($file)) { + print "\n\nThe extension of the matching file '". $file . "' seems to be wrong - manual import necessary!!!\n"; exit 1; } - print $broadcast_num . ": downloading " . $entry->enclosure->url . " (" . $entry->enclosure->length . " Bytes) .. "; - $file = $ff->fetch( to => '/tmp' ) or die $ff->error; - print "ok\n"; - + my $sum_title = decode_entities($entry->title); + my $sum_text = decode_entities($entry->content->body); print "summary:\n" . $sum_title . "\n\n" . $sum_text . "\n"; - rhautoimport::pv_add_note($sum_title, $sum_text, $PV_ID, $id, "1"); last; } } -if($file eq "" || !(-e "$file")) { - print "No Entry found with " . $broadcast_num . " or download error - "; +if($uri eq "") { + print "No Entry found with #" . $broadcast_num . " - "; if($#ARGV >= 0 && $ARGV[0] eq 'last') { print "giving up, manual import necessary!!!\n"; } else { @@ -142,36 +121,20 @@ if($file eq "" || !(-e "$file")) { exit 1; } -print "will import $file to dropbox $dropbox (cart=$to_cart)\n"; - -my $error_cb = sub { - my ($text) = @_; - - print "\n$text"; - return 0; -}; - -rhautoimport::check_key_file() or die "Import Key not found, use rhautoimport-create-id to create one\n"; - -my $ret; -my $log = rhautoimport::clear_carts($dbh, $group, $to_cart); -my $import_log; -($ret, $import_log) = rhautoimport::import_single($file, $dropbox, $user, 0, $error_cb); -$log .= $import_log; - -RHRD::rddb::closedb($dbh); - -unlink $file; +print "will import '$uri' to show $show_id, $show_title\n\n"; -if(!$ret) { - print "\nImport Error:\n"; +my ($ret, $log) = rhautoimport::import_uri($show_id, $uri->as_string); +if($ret) { + print "\nImport Error:\n\n"; print $log; exit 1; } +print "\nImport Success:\n\n"; +print $log; unlink($STAT_FILE); open(my $fhs, '>', $STAT_FILE); -print $fhs "$id\n$out_file"; +print $fhs "$id\n$file"; close($fhs); unlink($LAST_FILE); -- cgit v0.10.2