--- trunk/bin/irc-logger.pl	2007/06/08 12:17:35	65
+++ trunk/bin/irc-logger.pl	2008/03/06 18:03:05	84
@@ -22,6 +22,10 @@
 
 Name of log file
 
+=item --follow=file.log
+
+Follows new messages in file
+
 =back
 
 =head1 DESCRIPTION
@@ -32,7 +36,8 @@
 
 ## CONFIG
 
-my $HOSTNAME = `hostname`;
+my $HOSTNAME = `hostname -f`;
+chomp($HOSTNAME);
 
 my $NICK = 'irc-logger';
 $NICK .= '-dev' if ($HOSTNAME =~ m/llin/);
@@ -45,11 +50,8 @@
 $CHANNEL = '#irc-logger' if ($HOSTNAME =~ m/llin/);
 my $IRC_ALIAS = "log";
 
-my %FOLLOWS =
-  (
-   ACCESS => "/var/log/apache/access.log",
-   ERROR => "/var/log/apache/error.log",
-  );
+# default log to follow and announce messages
+my $follows_path = 'follows.log';
 
 my $DSN = 'DBI:Pg:dbname=' . $NICK;
 
@@ -58,6 +60,13 @@
 
 my $sleep_on_error = 5;
 
+# number of last tags to keep in circular buffer
+my $last_x_tags = 50;
+
+my $http_port = $NICK =~ m/-dev/ ? 8001 : 8000;
+
+my $url = "http://$HOSTNAME:$http_port";
+
 ## END CONFIG
 
 
@@ -76,6 +85,9 @@
 use URI::Escape;
 use Data::Dump qw/dump/;
 use DateTime::Format::ISO8601;
+use Carp qw/confess/;
+use XML::Feed;
+use DateTime::Format::Flexible;
 
 my $use_twitter = 1;
 eval { require Net::Twitter; };
@@ -85,15 +97,80 @@
 my $log_path;
 GetOptions(
 	'import-dircproxy:s' => \$import_dircproxy,
+	'follows:s' => \$follows_path,
 	'log:s' => \$log_path,
 );
 
+$SIG{__DIE__} = sub {
+	confess "fatal error";
+};
+
 open(STDOUT, '>', $log_path) || warn "can't redirect log to $log_path: $!";
 
 sub _log {
 	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;');
+my $escape_re  = join '|' => keys %escape;
+
+my $tag_regex = '\b([\w-_]+)//';
+
+my %nick_enumerator;
+my $max_color = 0;
+
+my $filter = {
+	message => sub {
+		my $m = shift || return;
+
+		# protect HTML from wiki modifications
+		sub e {
+			my $t = shift;
+			return 'uri_unescape{' . uri_escape($t) . '}';
+		}
+
+		$m =~ s/($escape_re)/$escape{$1}/gs;
+		$m =~ s#($RE{URI}{HTTP})#e(qq{<a href="$1">$1</a>})#egs ||
+		$m =~ s#\/(\w+)\/#<i>$1</i>#gs;
+		$m =~ s#$tag_regex#e(qq{<a href="$url?tag=$1" class="tag">$1</a>})#egs;
+		$m =~ s#\*(\w+)\*#<b>$1</b>#gs;
+		$m =~ s#_(\w+)_#<u>$1</u>#gs;
+
+		$m =~ s#uri_unescape{([^}]+)}#uri_unescape($1)#egs;
+		return $m;
+	},
+	nick => sub {
+		my $n = shift || return;
+		if (! $nick_enumerator{$n})  {
+			my $max = scalar keys %nick_enumerator;
+			$nick_enumerator{$n} = $max + 1;
+		}
+		return '<span class="nick col-' .
+			( $nick_enumerator{$n} % $max_color ) .
+			'">' . $n . '</span>';
+	},
+};
+
 my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
 
 my $sql_schema = {
@@ -193,7 +270,6 @@
 
 
 my $tags;
-my $tag_regex = '\b([\w-_]+)//';
 
 =head2 get_from_log
 
@@ -230,14 +306,16 @@
 sub get_from_log {
 	my $args = {@_};
 
-	$args->{fmt} ||= {
-		date => '[%s] ',
-		time => '{%s} ',
-		time_channel => '{%s %s} ',
-		nick => '%s: ',
-		me_nick => '***%s ',
-		message => '%s',
-	};
+	if ( ! $args->{fmt} ) {
+		$args->{fmt} = {
+			date => '[%s] ',
+			time => '{%s} ',
+			time_channel => '{%s %s} ',
+			nick => '%s: ',
+			me_nick => '***%s ',
+			message => '%s',
+		};
+	}
 
 	my $sql_message = qq{
 		select
@@ -260,35 +338,50 @@
 
 	my $sql = $context ? $sql_context : $sql_message;
 
-	$sql .= " where message ilike ? or nick ilike ? " if ($args->{search});
-	$sql .= " where id in (" . join(",", @{ $tags->{ $args->{tag} } }) . ") " if ($args->{tag} && $tags->{ $args->{tag} });
-	if ($args->{date}) {
-		my $date = eval { DateTime::Format::ISO8601->parse_datetime( $args->{date} )->ymd; };
+	sub check_date {
+		my $date = shift || return;
+		my $new_date = eval { DateTime::Format::ISO8601->parse_datetime( $date )->ymd; };
 		if ( $@ ) {
-			warn "invalid date ", $args->{date}, $/;
-			$date = DateTime->now->ymd;
+			warn "invalid date $date\n"; 
+			$new_date = DateTime->now->ymd;
 		}
-		$sql .= " where date(time) = ? ";
-		$args->{date} = $date;
+		return $new_date;
 	}
-	$sql .= " order by log.time desc";
-	$sql .= " limit " . $args->{limit} if ($args->{limit});
 
-	my $sth = $dbh->prepare( $sql );
+	my @where;
+	my @args;
+
 	if (my $search = $args->{search}) {
 		$search =~ s/^\s+//;
 		$search =~ s/\s+$//;
-		$sth->execute( ( '%' . $search . '%' ) x 2 );
-		_log "search for '$search' returned ", $sth->rows, " results ", $context || '';
-	} elsif (my $tag = $args->{tag}) {
-		$sth->execute();
-		_log "tag '$tag' returned ", $sth->rows, " results ", $context || '';
-	} elsif (my $date = $args->{date}) {
-		$sth->execute($date);
-		_log "found ", $sth->rows, " messages for date $date ", $context || '';
-	} else {
-		$sth->execute();
+		push @where, 'message ilike ? or nick ilike ?';
+		push @args, ( ( '%' . $search . '%' ) x 2 );
+		_log "search for '$search'";
+	}
+
+	if ($args->{tag} && $tags->{ $args->{tag} }) {
+		push @where, 'id in (' . join(',', @{ $tags->{ $args->{tag} } }) . ')';
+		_log "search for tags $args->{tag}";
+	}
+
+	if (my $date = $args->{date} ) {
+		$date = check_date( $date );
+		push @where, 'date(time) = ?';
+		push @args, $date;
+		_log "search for date $date";
 	}
+
+	$sql .= " where " . join(" and ", @where) if @where;
+
+	$sql .= " order by log.time desc";
+	$sql .= " limit " . $args->{limit} if ($args->{limit});
+
+	#warn "### sql: $sql ", dump( @args );
+
+	my $sth = $dbh->prepare( $sql );
+	eval { $sth->execute( @args ) };
+	return if $@;
+
 	my $last_row = {
 		date => '',
 		time => '',
@@ -409,10 +502,12 @@
 
 =head2 add_tag
 
- add_tag( id => 42, message => 'irc message' );
+ add_tag( id => 42, message => 'irc message', nick => 'foobar' [, me => 1 ] );
 
 =cut
 
+my @last_tags;
+
 sub add_tag {
 	my $arg = {@_};
 
@@ -421,13 +516,23 @@
 	my $m = $arg->{message};
 	from_to('UTF-8', 'iso-8859-2', $m) if (is_utf8($m));
 
+	my @tags;
+
 	while ($m =~ s#$tag_regex##s) {
 		my $tag = $1;
 		next if (! $tag || $tag =~ m/https?:/i);
 		push @{ $tags->{$tag} }, $arg->{id};
 		#warn "+tag $tag: $arg->{id}\n";
-		$cloud->add($tag, "?tag=$tag", scalar @{$tags->{$tag}} + 1);
+		$cloud->add($tag, "$url?tag=$tag", scalar @{$tags->{$tag}} + 1);
+		push @tags, $tag;
+
+	}
+
+	if ( @tags ) {
+		pop @last_tags if $#last_tags == $last_x_tags;
+		unshift @last_tags, { tags => [ @tags ], %$arg };
 	}
+
 }
 
 =head2 seed_tags
@@ -437,14 +542,14 @@
 =cut
 
 sub seed_tags {
-	my $sth = $dbh->prepare(qq{ select id,message from log where message like '%//%' });
+	my $sth = $dbh->prepare(qq{ select id,message,nick,me,time from log where message like '%//%' order by time asc });
 	$sth->execute;
 	while (my $row = $sth->fetchrow_hashref) {
 		add_tag( %$row );
 	}
 
 	foreach my $tag (keys %$tags) {
-		$cloud->add($tag, "?tag=$tag", scalar @{$tags->{$tag}} + 1);
+		$cloud->add($tag, "$url?tag=$tag", scalar @{$tags->{$tag}} + 1);
 	}
 }
 
@@ -457,7 +562,7 @@
   	channel => '#foobar',
 	me => 0,
 	nick => 'dpavlin',
-	msg => 'test message',
+	message => 'test message',
 	time => '2006-06-25 18:57:18',
   );
 
@@ -469,26 +574,26 @@
 
 sub save_message {
 	my $a = {@_};
+	confess "have msg" if $a->{msg};
 	$a->{me} ||= 0;
 	$a->{time} ||= strftime($TIMESTAMP,localtime());
 
 	_log
 		$a->{channel}, " ",
 		$a->{me} ? "***" . $a->{nick} : "<" . $a->{nick} . ">",
-		" " . $a->{msg};
+		" " . $a->{message};
 
-	from_to($a->{msg}, 'UTF-8', $ENCODING);
+	from_to($a->{message}, 'UTF-8', $ENCODING);
 
-	$sth->execute($a->{channel}, $a->{me}, $a->{nick}, $a->{msg}, $a->{time});
-	add_tag( id => $dbh->last_insert_id(undef,undef,"log",undef),
-		message => $a->{msg});
+	$sth->execute($a->{channel}, $a->{me}, $a->{nick}, $a->{message}, $a->{time});
+	add_tag( id => $dbh->last_insert_id(undef,undef,"log",undef), %$a );
 }
 
 
 if ($import_dircproxy) {
 	open(my $l, $import_dircproxy) || die "can't open $import_dircproxy: $!";
 	warn "importing $import_dircproxy...\n";
-	my $tz_offset = 2 * 60 * 60;	# TZ GMT+2
+	my $tz_offset = 1 * 60 * 60;	# TZ GMT+2
 	while(<$l>) {
 		chomp;
 		if (/^@(\d+)\s(\S+)\s(.+)$/) {
@@ -506,7 +611,7 @@
 				channel => $CHANNEL,
 				me => $me,
 				nick => $nick,
-				msg => $msg,
+				message => $msg,
 				time => $dt->ymd . " " . $dt->hms,
 			) if ($nick !~ m/^-/);
 
@@ -539,7 +644,7 @@
 		$_[KERNEL]->post($IRC_ALIAS => join => $CHANNEL);
 		$_[KERNEL]->post($IRC_ALIAS => join => '#logger');
 		$_[KERNEL]->yield("heartbeat"); # start heartbeat
-#		$_[KERNEL]->yield("my_add", $_) for keys %FOLLOWS;
+		$_[KERNEL]->yield("my_add", $_) for keys %FOLLOWS;
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "IDENTIFY $NICK" );
     },
     irc_public => sub {
@@ -548,7 +653,7 @@
 		my $channel = $_[ARG1]->[0];
 		my $msg = $_[ARG2];
 
-		save_message( channel => $channel, me => 0, nick => $nick, msg => $msg);
+		save_message( channel => $channel, me => 0, nick => $nick, message => $msg);
 		meta( $nick, $channel, 'last-msg', $msg );
     },
     irc_ctcp_action => sub {
@@ -557,7 +662,7 @@
 		my $channel = $_[ARG1]->[0];
 		my $msg = $_[ARG2];
 
-		save_message( channel => $channel, me => 1, nick => $nick, msg => $msg);
+		save_message( channel => $channel, me => 1, nick => $nick, message => $msg);
 
 		if ( $use_twitter ) {
 			if ( my $twitter = meta( $nick, $NICK, 'twitter' ) ) {
@@ -570,7 +675,7 @@
 
     },
 	irc_ping => sub {
-		warn "pong ", $_[ARG0], $/;
+		_log( "pong ", $_[ARG0] );
 		$ping->{ $_[ARG0] }++;
 	},
 	irc_invite => sub {
@@ -776,10 +881,11 @@
                      Filename => $FOLLOWS{$trailing},
                      InputEvent => 'got_line',
                     );
+				warn "+++ following $trailing at $FOLLOWS{$trailing}\n";
             },
             got_line => sub {
-              $_[KERNEL]->post($session => my_tailed =>
-                               time, $trailing, $_[ARG0]);
+				warn "+++ $trailing : $_[ARG0]\n";
+				$_[KERNEL]->post($session => my_tailed => time, $trailing, $_[ARG0]);
             },
            },
           );
@@ -830,14 +936,16 @@
 # http server
 
 my $httpd = POE::Component::Server::HTTP->new(
-	Port => $NICK =~ m/-dev/ ? 8001 : 8000,
+	Port => $http_port,
+	PreHandler => {
+		'/' => sub {
+			$_[0]->header(Connection => 'close')
+		}
+	},
 	ContentHandler => { '/' => \&root_handler },
 	Headers        => { Server => 'irc-logger' },
 );
 
-my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
-my $escape_re  = join '|' => keys %escape;
-
 my $style = <<'_END_OF_STYLE_';
 p { margin: 0; padding: 0.1em; }
 .time, .channel { color: #808080; font-size: 60%; }
@@ -859,7 +967,7 @@
 .month { border: 0px; width: 100%; }
 _END_OF_STYLE_
 
-my $max_color = 4;
+$max_color = 0;
 
 my @cols = qw(
 	#ffcccc #ccffe6 #ccccff #e6ccff #ffccff #ffcce6 #ff9999 #ffcc99 #ffff99
@@ -869,19 +977,20 @@
 	#999900 #009900 #cc0066 #c0c0c0 #ccff99 #99ff33 #808080 #660033 #ffffff
 );
 
-$max_color = 0;
 foreach my $c (@cols) {
 	$style .= ".col-${max_color} { background: $c }\n";
 	$max_color++;
 }
 warn "defined $max_color colors for users...\n";
 
-my %nick_enumerator;
-
 sub root_handler {
 	my ($request, $response) = @_;
 	$response->code(RC_OK);
-	$response->content_type("text/html; charset=$ENCODING");
+
+	# this doesn't seem to work, so moved to PreHandler
+	#$response->header(Connection => 'close');
+
+	return RC_OK if $request->uri =~ m/favicon.ico$/;
 
 	my $q;
 
@@ -895,19 +1004,104 @@
 
 	my $search = $q->param('search') || $q->param('grep') || '';
 
+	if ($request->url =~ m#/rss(?:/(tags|last-tag)\w*(?:=(\d+))?)?#i) {
+		my $show = lc($1);
+		my $nr = $2;
+
+		my $type = 'RSS';	# Atom
+
+		$response->content_type( 'application/' . lc($type) . '+xml' );
+
+		my $html = '<!-- error -->';
+		#warn "create $type feed from ",dump( @last_tags );
+
+		my $feed = XML::Feed->new( $type );
+
+		if ( $show eq 'tags' ) {
+			$nr ||= 50;
+			$feed->title( "tags from $CHANNEL" );
+			$feed->link( "$url/tags" );
+			$feed->description( "tag cloud created from messages on channel $CHANNEL which have tags// in them" );
+			my $feed_entry = XML::Feed::Entry->new($type);
+			$feed_entry->title( "$nr tags from $CHANNEL" );
+			$feed_entry->author( $NICK );
+			$feed_entry->link( '/#tags'  );
+
+			$feed_entry->content(
+				qq{<![CDATA[<style type="text/css">}
+				. $cloud->css
+				. qq{</style>}
+				. $cloud->html( $nr )
+				. qq{]]>}
+			);
+			$feed->add_entry( $feed_entry );
+
+		} elsif ( $show eq 'last-tag' ) {
+
+			$nr ||= $last_x_tags;
+			$nr = $last_x_tags if $nr > $last_x_tags;
+
+			$feed->title( "last $nr tagged messages from $CHANNEL" );
+			$feed->link( $url );
+			$feed->description( "collects messages which have tags// in them" );
+
+			foreach my $m ( @last_tags ) {
+#				warn dump( $m );
+				#my $tags = join(' ', @{$m->{tags}} );
+				my $feed_entry = XML::Feed::Entry->new($type);
+				$feed_entry->title( $m->{nick} . '@' . $m->{time} );
+				$feed_entry->author( $m->{nick} );
+				$feed_entry->link( '/#' . $m->{id}  );
+				$feed_entry->issued( DateTime::Format::Flexible->build( $m->{time} ) );
+
+				my $message = $filter->{message}->( $m->{message} );
+				$message .= "<br/>\n" unless $message =~ m!<(/p|br/?)>!;
+#				warn "## message = $message\n";
+				from_to( $message, $ENCODING, 'UTF-8' );
+
+				#$feed_entry->summary(
+				$feed_entry->content(
+					"<![CDATA[$message]]>"
+				);
+				$feed_entry->category( join(', ', @{$m->{tags}}) );
+				$feed->add_entry( $feed_entry );
+
+				$nr--;
+				last if $nr <= 0;
+
+			}
+
+		} else {
+			warn "!! unknown rss request for $show\n";
+			return RC_DENY;
+		}
+
+		$response->content( $feed->as_xml );
+		return RC_OK;
+	}
+
+	if ( $@ ) {
+		warn "$@";
+	}
+
+	$response->content_type("text/html; charset=$ENCODING");
+
 	my $html =
-		qq{<html><head><title>$NICK</title><style type="text/css">$style} .
-		$cloud->css .
-		qq{</style></head><body>} .
-		qq{
+		qq{<html><head><title>$NICK</title><style type="text/css">$style}
+		. $cloud->css
+		. qq{</style></head><body>}
+		. qq{
 		<form method="post" class="search" action="/">
 		<input type="text" name="search" value="$search" size="10">
 		<input type="submit" value="search">
 		</form>
-		} .
-		$cloud->html(500) .
-		qq{<p>};
-	if ($request->url =~ m#/history#) {
+		}
+		. $cloud->html(500)
+		. qq{<p>};
+
+	if ($request->url =~ m#/tags?#) {
+		# nop
+	} elsif ($request->url =~ m#/history#) {
 		my $sth = $dbh->prepare(qq{
 			select date(time) as date,count(*) as nr,sum(length(message)) as len
 				from log
@@ -939,9 +1133,9 @@
 				$cal->weekdays('MON','TUE','WED','THU','FRI');
 				($l_yyyy,$l_mm) = ($yyyy,$mm);
 			}
-			$cal->setcontent($dd, qq{
-				<a href="/?date=$row->{date}">$row->{nr}</a><br/>$row->{len}
-			});
+			$cal->setcontent($dd, qq[
+				<a href="$url?date=$row->{date}">$row->{nr}</a><br/>$row->{len}
+			]);
 			
 		}
 		$html .= qq{<td valign="top">} . $cal->as_HTML() . qq{</td></tr></table>};
@@ -949,14 +1143,14 @@
 	} else {
 		$html .= join("</p><p>",
 			get_from_log(
-				limit => $q->param('last') || $q->param('date') ? undef : 100,
+				limit => ( $q->param('last') || $q->param('date') ) ? undef : 100,
 				search => $search || undef,
 				tag => $q->param('tag') || undef,
 				date => $q->param('date') || undef,
 				fmt => {
 					date => sub {
 						my $date = shift || return;
-						qq{<hr/><div class="date"><a href="/?date=$date">$date</a></div>};
+						qq{<hr/><div class="date"><a href="$url?date=$date">$date</a></div>};
 					},
 					time => '<span class="time">%s</span> ',
 					time_channel => '<span class="channel">%s %s</span> ',
@@ -964,37 +1158,7 @@
 					me_nick => '***%s&nbsp;',
 					message => '<span class="message">%s</span>',
 				},
-				filter => {
-					message => sub {
-						my $m = shift || return;
-
-						# protect HTML from wiki modifications
-						sub e {
-							my $t = shift;
-							return 'uri_unescape{' . uri_escape($t) . '}';
-						}
-
-						$m =~ s/($escape_re)/$escape{$1}/gs;
-						$m =~ s#($RE{URI}{HTTP})#e(qq{<a href="$1">$1</a>})#egs;
-						$m =~ s#$tag_regex#e(qq{<a href="?tag=$1" class="tag">$1</a>})#egs;
-						$m =~ s#\*(\w+)\*#<b>$1</b>#gs;
-						$m =~ s#_(\w+)_#<u>$1</u>#gs;
-						$m =~ s#\/(\w+)\/#<i>$1</i>#gs;
-
-						$m =~ s#uri_unescape{([^}]+)}#uri_unescape($1)#egs;
-						return $m;
-					},
-					nick => sub {
-						my $n = shift || return;
-						if (! $nick_enumerator{$n})  {
-							my $max = scalar keys %nick_enumerator;
-							$nick_enumerator{$n} = $max + 1;
-						}
-						return '<span class="nick col-' .
-							( $nick_enumerator{$n} % $max_color ) .
-							'">' . $n . '</span>';
-					},
-				},
+				filter => $filter,
 			)
 		);
 	}
@@ -1005,6 +1169,7 @@
 	</body></html>};
 
 	$response->content( $html );
+	warn "<< ", $request->method, " ", $request->uri, " created ", length($html), " bytes\n";
 	return RC_OK;
 }