1 files changed, 24 insertions, 61 deletions

diff --git a/rhautoimport-btl b/rhautoimport-btl
index 1579fa7..54ef790 100755
--- a/rhautoimport-btl
+++ b/rhautoimport-btl
@@ -27,50 +27,34 @@ 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 LWP::Simple;
-use RHRD::rddb;
 
 use lib '/usr/local/share/rhautoimport/';
 use rhautoimport;
 
 my $STAT_FILE = $ENV{'HOME'} . "/rhautoimport-btl.stat";
 my $RSS_URL = "http://www.btlonline.org/rss/btl128.xml";
+my $RD_GROUP = "betweenlin";
 my $PV_ID = '221';
 
-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 = "betweenlin";
 
-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();
@@ -94,11 +78,11 @@ my $bdfile = sprintf("%02d%02d%02d-btlv128\.mp3", $broadcast_date[0]%100, $broad
 print "looking for files like '$bdfile' 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 = "";
 for my $entry ($feed->entries) {
   if($entry->enclosure && ($entry->enclosure->type eq "audio/mpeg" || entry->enclosure->type eq "audio/mp3")) {
     next unless $entry->enclosure->url =~ /$bdfile/;
@@ -107,32 +91,27 @@ for my $entry ($feed->entries) {
     $sum_title =~ s/ \(128 kbps\)$//;
     my $sum_text = decode_entities($entry->content->body);
 
-    my $ff = File::Fetch->new(uri => $entry->enclosure->url);
+    $uri = new URI::URL($entry->enclosure->url);
+    my @path = $uri->path_components;
+
     my $current_file = `cat $STAT_FILE`;
-    if($current_file eq $ff->output_file) {
+    if($current_file eq $path[-1]) {
       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);
+    $file = $path[-1];
+    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 " . $entry->enclosure->url . " (" . $entry->enclosure->length . " Bytes) .. ";
-    $file = $ff->fetch( to => '/tmp' ) or die $ff->error;
-    print "ok\n";
-
     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")) {
+if($uri eq "") {
   print "No Entry found for " . Date::Calc::Date_to_Text(@broadcast_date) . " or download error - ";
   if($#ARGV >= 0 && $ARGV[0] eq 'last') {
     print "giving up, manual import necessary!!!\n";
@@ -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 "$out_file";
+print $fhs "$file";
 close($fhs);
 
 exit 0;