netwachter importer now uses rhimportd as well

2 files changed, 32 insertions, 71 deletions

diff --git a/rhautoimport-nw b/rhautoimport-nw
index 1edfdc0..4642707 100755
--- a/rhautoimport-nw
+++ b/rhautoimport-nw
@@ -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,27 @@ use rhautoimport;
 my $STAT_FILE = $ENV{'HOME'} . "/rhautoimport-nw.stat";
 my $RSS_URL = "http://cba.fro.at/seriesrss/262514?c=Kfs2IoV2Wmd";
 $XML::Feed::MULTIPLE_ENCLOSURES=1;
+my $RD_GROUP = "netwatcher";
 my $PV_ID = '73';
 
-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 = "netwatcher";
 
-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 1 Dropbox for this group?!\n";
-  RHRD::rddb::closedb($dbh);
+  print "found more or less than one Dropbox for this group?!\n";
   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();
 my @import_date = @today;
@@ -92,11 +78,11 @@ my $bdfile = sprintf("NETWATCHER[-_]?%04d%02d%02d(.*)\.MP3", @broadcast_day);
 print "looking for files from $bd in RSS Feed\n";
 print " -> $RSS_URL\n";
 
-my $feed = XML::Feed->parse(URI->new($RSS_URL))
+my $feed = rhautoimport::fetch_parse_rss($RSS_URL)
   or die "Error fetching feed: " . XML::Feed->errstr;
 
+my $uri = "";
 my $file = "";
-my $out_file = "";
 my $i = 0;
 for my $entry ($feed->entries) {
   $i++;
@@ -106,46 +92,37 @@ for my $entry ($feed->entries) {
     $j++;
     if($enclosure->type eq "audio/mpeg" || $enclosure->type eq "audio/ogg") {
       print "$i/$j: (" . $enclosure->type . ", " . $enclosure->length . ") "  . $enclosure->url . "\n";
-      my $url = $enclosure->url;
-      if($url =~ /^(.*)_cut(\.[^\.]+)$/) {
-        $url = $1 . $2;
+      my $orig_uri = $enclosure->url;
+      if($orig_uri =~ /^(.*)_cut(\.[^\.]+)$/) {
+        $orig_uri = $1 . $2;
       }
 
-      my $ff = File::Fetch->new(uri => $url);
-      next unless (uc($ff->output_file) =~ $bdfile); # file not from correct day
-
-      my $sum_title = decode_entities($entry->title);
-      my $sum_text = decode_entities($entry->content->body);
+      $uri = new URI::URL($orig_uri);
+      my @path = $uri->path_components;
+      $file = $path[-1];
+      next unless (uc($file) =~ $bdfile); # file not from correct day
 
       my $current_file = `cat $STAT_FILE`;
-      if($current_file eq $ff->output_file) {
+      if($current_file eq $file) {
         print "Already downloaded file of today\n";
-        RHRD::rddb::closedb($dbh);
         exit 0;
       }
-      $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 " --> " . $bdfile . ": downloading " . $url . " (" . $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");
-      print "\n";
 
       last;
     }
   }
   last if $file ne "";
 }
-
-if($file eq "" || !(-e "$file")) {
+if($uri eq "") {
   print "No Entry found from $bd or download error - ";
   if($#ARGV >= 0 && $ARGV[0] eq 'last') {
     print "giving up, manual import necessary!!!\n";
@@ -155,36 +132,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 $out_file;
+print $fhs "$file";
 close($fhs);
 
 exit 0;
diff --git a/rhautoimport.pm b/rhautoimport.pm
index f866940..588d13b 100644
--- a/rhautoimport.pm
+++ b/rhautoimport.pm
@@ -173,7 +173,7 @@ sub import_uri
     last if(-e $runningfile || -e $donefile);
 
     if($i >= RHIMPORTD_TIMEOUT) {
-      $log .= "timout waiting for rhimportd ... is it running?\n";
+      $log .= "!! timeout waiting for rhimportd ... is it running?\n";
       unlink($requestfile);
       return (1, $log);
     }