diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | rhimport-dn | 11 | ||||
| -rwxr-xr-x | rhimport-fw | 11 | ||||
| -rwxr-xr-x | rhimport-ra | 11 | ||||
| -rwxr-xr-x | rhimport-rs | 11 | ||||
| -rwxr-xr-x | rhimport-wl | 161 |
7 files changed, 46 insertions, 168 deletions
@@ -44,14 +44,12 @@ install-bin: $(INSTALL) -d $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE)-dn $(DESTDIR)$(BINDIR) - $(INSTALL) -m 755 $(EXECUTABLE)-wl $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE)-rs $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE)-ra $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE)-fw $(DESTDIR)$(BINDIR) $(INSTALL) -m 755 $(EXECUTABLE)-create-id $(DESTDIR)$(BINDIR) @sed s#/usr/local/share/rhimport/#$(SHAREDIR)/$(EXECUTABLE)/#g -i $(DESTDIR)$(BINDIR)/$(EXECUTABLE) @sed s#/usr/local/share/rhimport/#$(SHAREDIR)/$(EXECUTABLE)/#g -i $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-dn - @sed s#/usr/local/share/rhimport/#$(SHAREDIR)/$(EXECUTABLE)/#g -i $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-wl @sed s#/usr/local/share/rhimport/#$(SHAREDIR)/$(EXECUTABLE)/#g -i $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-rs @sed s#/usr/local/share/rhimport/#$(SHAREDIR)/$(EXECUTABLE)/#g -i $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-ra @sed s#/usr/local/share/rhimport/#$(SHAREDIR)/$(EXECUTABLE)/#g -i $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-fw @@ -69,7 +67,6 @@ remove: $(REMOVE_TARGETS) remove-bin: rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE) rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-dn - rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-wl rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-rs rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-ra rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE)-fw diff --git a/debian/changelog b/debian/changelog index 8e8ea4b..1ddc032 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rhimport (0.3.9-1) unstable; urgency=low + + * autoimports now know if the run for the last time + + -- Christian Pointner <equinox@helsinki.at> Tue, 27 Sep 2012 16:54:10 +0200 + rhimport (0.3.8-12) unstable; urgency=low * radio attac with rebroadcast diff --git a/rhimport-dn b/rhimport-dn index ccb774d..4c86bf3 100755 --- a/rhimport-dn +++ b/rhimport-dn @@ -50,6 +50,10 @@ 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 = "democracyn"; @@ -123,7 +127,12 @@ for my $entry ($files_feed->entries) { } } if($file eq "" || !(-e "$file")) { - print "No Entry found from day in qeustion or download error - will retry later\n"; + print "No Entry found from day in qeustion or download error - "; + if($#ARGV >= 0 && $ARGV[0] eq 'last') { + print "giving up, manual import necessary!!!\n"; + } else { + print "will retry later\n"; + } exit 1; } diff --git a/rhimport-fw b/rhimport-fw index 075b689..75fcd27 100755 --- a/rhimport-fw +++ b/rhimport-fw @@ -48,6 +48,10 @@ 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 = "frontex"; @@ -118,7 +122,12 @@ for my $entry ($feed->entries) { } } if($file eq "" || !(-e "$file")) { - print "No Entry found for " . Date::Calc::Date_to_Text(@broadcastday) . " or download error - will retry later\n"; + print "No Entry found for " . Date::Calc::Date_to_Text(@broadcastday) . " or download error - "; + if($#ARGV >= 0 && $ARGV[0] eq 'last') { + print "giving up, manual import necessary!!!\n"; + } else { + print "will retry later\n"; + } exit 1; } diff --git a/rhimport-ra b/rhimport-ra index bacfce4..84097f0 100755 --- a/rhimport-ra +++ b/rhimport-ra @@ -48,6 +48,10 @@ 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 = "RadioATTAC"; @@ -118,7 +122,12 @@ for my $entry ($feed->entries) { } } if($file eq "" || !(-e "$file")) { - print "No Entry found from $bd or download error - will retry later\n"; + print "No Entry found from $bd or download error - "; + if($#ARGV >= 0 && $ARGV[0] eq 'last') { + print "giving up, manual import necessary!!!\n"; + } else { + print "will retry later\n"; + } exit 1; } diff --git a/rhimport-rs b/rhimport-rs index b92d310..3cbc3ff 100755 --- a/rhimport-rs +++ b/rhimport-rs @@ -48,6 +48,10 @@ 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 = "radioStimm"; @@ -140,7 +144,12 @@ while(1) { } if($file eq "" || !(-e "$file")) { - print "No Entry found from $bdtw or $bdlw or download error - will retry later\n"; + print "No Entry found from $bdtw or $bdlw or download error - "; + if($#ARGV >= 0 && $ARGV[0] eq 'last') { + print "giving up, manual import necessary!!!\n"; + } else { + print "will retry later\n"; + } exit 1; } diff --git a/rhimport-wl b/rhimport-wl deleted file mode 100755 index 8769e81..0000000 --- a/rhimport-wl +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/perl -w -# -# -# rhimport -# -# Copyright (C) 2009 Christian Pointner <equinox@helsinki.at> -# -# This file is part of rhimport. -# -# rhimport 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. -# -# rhimport 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 rhimport. If not, see <http://www.gnu.org/licenses/>. -# - -use strict; -use DBI; -use Date::Calc; -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 lib '/usr/local/share/rhimport/'; -use rhimport; - -my $DBHOST = "airplay"; -my $DBUSER = "rivendell"; -my $DBPW = "lldriven"; -my $DB = "rivendell"; - -my $STAT_FILE = $ENV{'HOME'} . "/rhimport-wl.stat"; -my $RSS_URL = "http://www.radiowienerlied.at/rss/podcast.xml"; -my $PV_ID = '82'; - -binmode(STDIN, ":utf8"); -binmode(STDOUT, ":utf8"); -binmode(STDERR, ":utf8"); - -my $user = `/usr/bin/id -un`; -$user =~ s/\n//; -my $group = "WienerLied"; - -my $dbh = DBI->connect("DBI:mysql:$DB:$DBHOST","$DBUSER","$DBPW") or die "Database Error: $DBI::errstr"; -my @allowed_dbs = rhimport::get_dropboxes($dbh, $user, $group); - -if(scalar(@allowed_dbs) != 1) { - print "found multiple or no Dropboxes for this group?!\n"; - $dbh->disconnect(); - exit 1; -} -my $dropbox = $allowed_dbs[0]->{'PATH'}; -my $to_cart = $allowed_dbs[0]->{'TO_CART'}; - -my @today = Date::Calc::Today(); -print "today: " . Date::Calc::Date_to_Text(@today) . "\n"; - -my @import_date; -my $t; -my $tfile; - -if(Date::Calc::Day_of_Week(@today) == 7) { - @import_date = Date::Calc::Add_Delta_Days($today[0], $today[1], $today[2], 1); - $t = sprintf("%04d-%02d-%02d", $today[0], $today[1], $today[2]); - $tfile = sprintf("%04d%02d%02d.mp3", $today[0], $today[1], $today[2]); - print "looking for files from today in RSS Feed\n"; -} elsif(Date::Calc::Day_of_Week(@today) == 1) { - my @yesterday = Date::Calc::Add_Delta_Days($today[0], $today[1], $today[2], -1); - @import_date = @today; - $t = sprintf("%04d-%02d-%02d", $yesterday[0], $yesterday[1], $yesterday[2]); - $tfile = sprintf("%04d%02d%02d.mp3", $yesterday[0], $yesterday[1], $yesterday[2]); - print "looking for files from yesterday in RSS Feed\n"; -} else { - print "it's neither Sunday nor Monday, please check cron script"; - exit 1; -} - - -my $feed = XML::Feed->parse(URI->new($RSS_URL)) - or die "Error fetching feed: " . XML::Feed->errstr; - -my $file = ""; -my $out_file = ""; -for my $entry ($feed->entries) { - if($entry->enclosure && $entry->enclosure->type eq "audio/mpeg") { - my $ff = File::Fetch->new(uri => $entry->enclosure->url); - next if($ff->output_file ne $tfile); # file not from today/yesterday - - my $sum_title = $entry->title; - my $sum_text = $entry->content->body; - - my $current_file = `cat $STAT_FILE`; - if($current_file eq $ff->output_file) { - print "Already downloaded file of today\n"; - $dbh->disconnect(); - exit 0; - } - $out_file = $ff->output_file; - - print $tfile . ": 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"; - rhimport::pv_add_note($sum_title, $sum_text, $PV_ID, sprintf("%04d-%02d-%02d", $import_date[0], $import_date[1], $import_date[2]), "1"); - print "\n"; - } -} -if($file eq "" || !(-e "$file")) { - print "No Entry found for today or download error - just clearing cart!\n"; - rhimport::check_key_file() or die "Import Key not found, use rhimport-create-id to create one\n"; - rhimport::clear_carts($dbh, $group, $to_cart); - exit 1; -} - -print "will import $file to dropbox $dropbox (cart=$to_cart)\n\n"; - -my $error_cb = sub { - my ($text) = @_; - - print "\n$text"; - return 0; -}; - -rhimport::check_key_file() or die "Import Key not found, use rhimport-create-id to create one\n"; - -my $ret; -my $log; -$log = rhimport::clear_carts($dbh, $group, $to_cart); -my $import_log; -($ret, $import_log) = rhimport::import_single($file, $dropbox, $user, 0, $error_cb); -$log .= $import_log; - -$dbh->disconnect(); - -unlink $file; - -if(!$ret) { - print "\nImport Error:\n"; - print $log; - exit 1; -} - -unlink($STAT_FILE); -open(my $fhs, '>', $STAT_FILE); -print $fhs $out_file; -close($fhs); - -exit 0; |