--- trunk/bin/irc-logger.pl	2008/03/07 00:43:45	89
+++ trunk/bin/irc-logger.pl	2008/03/07 10:50:16	94
@@ -20,12 +20,6 @@
 
 =item --log=irc-logger.log
 
-Name of log file
-
-=item --follow=file.log
-
-Follows new messages in file
-
 =back
 
 =head1 DESCRIPTION
@@ -50,9 +44,6 @@
 $CHANNEL = '#irc-logger' if ($HOSTNAME =~ m/llin/);
 my $IRC_ALIAS = "log";
 
-# default log to follow and announce messages
-my $follows_path = 'follows.log';
-
 my $DSN = 'DBI:Pg:dbname=' . $NICK;
 
 my $TIMESTAMP = '%Y-%m-%d %H:%M:%S';
@@ -72,7 +63,7 @@
 
 ## END CONFIG
 
-use POE qw(Component::IRC Wheel::FollowTail Component::Server::HTTP);
+use POE qw(Component::IRC Component::Server::HTTP);
 use HTTP::Status;
 use DBI;
 use Regexp::Common qw /URI/;
@@ -97,7 +88,6 @@
 my $log_path;
 GetOptions(
 	'import-dircproxy:s' => \$import_dircproxy,
-	'follows:s' => \$follows_path,
 	'log:s' => \$log_path,
 );
 
@@ -111,24 +101,6 @@
 	print strftime($TIMESTAMP,localtime()) . ' ' . join(" ",@_) . $/;
 }
 
-# LOG following
-
-my %FOLLOWS =
-  (
-#   ACCESS => "/var/log/apache/access.log",
-#   ERROR => "/var/log/apache/error.log",
-  );
-
-sub add_follow_path {
-	my $path = shift;
-	my $name = $path;
-	$name =~ s/\..*$//;
-	warn "# using $path to announce messages from $name\n";
-	$FOLLOWS{$name} = $path;
-}
-
-add_follow_path( $follows_path ) if ( -e $follows_path );
-
 # HTML formatters
 
 my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
@@ -656,29 +628,44 @@
 		_log("can't fetch RSS ", $args->{url});
 		return;
 	}
+
 	my ( $total, $updates ) = ( 0, 0 );
 	for my $entry ($feed->entries) {
 		$total++;
 
 		# seen allready?
-		return if $_rss->{$feed->link}->{seen}->{$entry->id}++ > 0;
+		next if $_rss->{$feed->link}->{seen}->{$entry->id}++ > 0;
 
 		sub prefix {
 			my ($txt,$var) = @_;
+			$var =~ s/\s+/ /gs;
 			$var =~ s/^\s+//g;
+			$var =~ s/\s+$//g;
 			return $txt . $var if $var;
 		}
 
+		# fix absolute and relative links to feed entries
+		my $link = $entry->link;
+		if ( $link =~ m!^/! ) {
+			my $host = $args->{url};
+			$host =~ s!^(http://[^/]+).*$!$1!;	#!vim
+			$link = "$host/$link";
+		} elsif ( $link !~ m!^http! ) {
+			$link = $args->{url} . $link;
+		}
+		$link =~ s!//+!/!g;
+
 		my $msg;
-		$msg .= prefix( 'From: ' , $feed->title );
+		$msg .= prefix( 'From: ' , $args->{name} || $feed->title );
 		$msg .= prefix( ' by ' , $entry->author );
-		$msg .= prefix( ' -- ' , $entry->link );
+		$msg .= prefix( ' | ' , $entry->title );
+		$msg .= prefix( ' | ' , $link );
 #		$msg .= prefix( ' id ' , $entry->id );
 
 		if ( $args->{kernel} && $send_rss_msgs ) {
 			$send_rss_msgs--;
-			_log('RSS', $msg);
-			$sth_insert_log->execute( $CHANNEL, 1, $NICK, $msg, undef );
+			_log('>>', $msg);
+			$sth_insert_log->execute( $CHANNEL, 1, $NICK, $msg, 'now()' );
 			$args->{kernel}->post( $IRC_ALIAS => notice => $CHANNEL, $msg );
 			$updates++;
 		}
@@ -719,7 +706,7 @@
 	my $kernel = shift;
 	my $last_t = $_rss->{last_poll} || time();
 	my $t = time();
-	if ( $last_t - $t > $rss_min_delay ) {
+	if ( $t - $last_t > $rss_min_delay ) {
 		$_rss->{last_poll} = $t;
 		_log rss_fetch_all( $kernel );
 	}
@@ -732,8 +719,6 @@
 # POE handing part
 #
 
-my $SKIPPING = 0;               # if skipping, how many we've done
-my $SEND_QUEUE;                 # cache
 my $ping;						# ping stats
 
 POE::Component::IRC->new($IRC_ALIAS);
@@ -925,22 +910,31 @@
 			$res = rss_fetch_all( $_[KERNEL] );
 		} elsif ($msg =~ m/^rss-clean/) {
 			$_rss = undef;
+			$dbh->do( qq{ update feeds set last_update = now() - delay } );
 			$res = "OK, cleaned RSS cache";
+		} elsif ($msg =~ m/^rss-list/) {
+			my $sth = $dbh->prepare(qq{ select url,name,last_update,active from feeds });
+			$sth->execute;
+			while (my @row = $sth->fetchrow_array) {
+				$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, join(' | ',@row) );
+			}
+			$res = '';
 		} elsif ($msg =~ m!^rss-(add|remove|stop|start)\s+(http://\S+)\s*(.*)!) {
 			my $sql = {
 				add		=> qq{ insert into feeds (url,name) values (?,?) },
 #				remove	=> qq{ delete from feeds				where url = ? and name = ? },
-				start	=> qq{ update feeds set active = true	where url = ? -- ? },
-				stop	=> qq{ update feeds set active = false	where url = ? -- ? },
-				
+				start	=> qq{ update feeds set active = true	where url = ? },
+				stop	=> qq{ update feeds set active = false	where url = ? },
 			};
 			if (my $q = $sql->{$1} ) {
 				my $sth = $dbh->prepare( $q );
-				warn "## SQL $q ( $2 | $3 )\n";
-				eval { $sth->execute( $2, $3 ) };
+				my @data = ( $2 );
+				push @data, $3 if ( $q =~ s/\?//g == 2 );
+				warn "## $1 SQL $q with ",dump( @data ),"\n";
+				eval { $sth->execute( @data ) };
 			}
 
-			$res ||= "OK, RSS $1 : $2 - $3";
+			$res = "OK, RSS $1 : $2 - $3";
 		}
 
 		if ($res) {