--- trunk/irc-logger.pl 2006/03/12 13:33:20 12 +++ trunk/irc-logger.pl 2006/03/13 17:07:40 18 @@ -35,13 +35,18 @@ my $DSN = 'DBI:Pg:dbname=irc-logger'; +my $ENCODING = 'ISO-8859-2'; + ## END CONFIG -use POE qw(Component::IRC Wheel::FollowTail); +use POE qw(Component::IRC Wheel::FollowTail Component::Server::HTTP); +use HTTP::Status; use DBI; use Encode qw/from_to/; +use Regexp::Common qw /URI/; +use CGI::Simple; my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr; @@ -77,6 +82,16 @@ my @messages = get_from_log( limit => 42, search => '%what to stuff in ilike%', + fmt => { + time => '{%s} ', + time_channel => '{%s %s} ', + nick => '%s: ', + message => '%s', + }, + message_filter => sub { + # modify message content + return shift; + } ); =cut @@ -86,6 +101,13 @@ $args->{limit} ||= 10; + $args->{fmt} ||= { + time => '{%s} ', + time_channel => '{%s %s} ', + nick => '%s: ', + message => '%s', + }; + my $sql = qq{ select time::date as date, @@ -101,7 +123,8 @@ my $sth = $dbh->prepare( $sql ); if ($args->{search}) { - $sth->execute( $args->{search} ); + $sth->execute( '%' . $args->{search} . '%' ); + warn "search for '$args->{search}' returned ", $sth->rows, " results\n"; } else { $sth->execute(); } @@ -118,7 +141,9 @@ unshift @rows, $row; } - my @msgs; + my @msgs = ( + "Showing " . ($#rows + 1) . " messages..." + ); foreach my $row (@rows) { @@ -130,18 +155,28 @@ my $msg = ''; - $msg .= "{$t"; - $msg .= ' ' . $row->{channel} if ($last_row->{channel} ne $row->{channel}); - $msg .= "} "; + if ($last_row->{channel} ne $row->{channel}) { + $msg .= sprintf($args->{fmt}->{time_channel}, $t, $row->{channel}); + } else { + $msg .= sprintf($args->{fmt}->{time}, $t); + } my $append = 1; if ($last_row->{nick} ne $row->{nick}) { - $msg .= $row->{nick} . ': '; + $msg .= sprintf($args->{fmt}->{nick}, $row->{nick}); $append = 0; } - $msg .= $row->{message}; + if (ref($args->{message_filter}) eq 'CODE') { + $msg .= sprintf($args->{fmt}->{message}, + $args->{message_filter}->( + $row->{message} + ) + ); + } else { + $msg .= sprintf($args->{fmt}->{message}, $row->{message}); + } if ($append && @msgs) { $msgs[$#msgs] .= " " . $msg; @@ -180,7 +215,7 @@ my $channel = $_[ARG1]->[0]; my $msg = $_[ARG2]; - from_to($msg, 'UTF-8', 'ISO-8859-2'); + from_to($msg, 'UTF-8', $ENCODING); print "$channel: <$nick> $msg\n"; $sth->execute($channel, $nick, $msg); @@ -189,7 +224,7 @@ my $kernel = $_[KERNEL]; my $nick = (split /!/, $_[ARG0])[0]; my $msg = $_[ARG2]; - from_to($msg, 'UTF-8', 'ISO-8859-2'); + from_to($msg, 'UTF-8', $ENCODING); my $res = "unknown command '$msg', try /msg $NICK help!"; my @out; @@ -224,7 +259,7 @@ foreach my $res (get_from_log( limit => $1 )) { print "last: $res\n"; - from_to($res, 'ISO-8859-2', 'UTF-8'); + from_to($res, $ENCODING, 'UTF-8'); $_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res ); } @@ -234,9 +269,9 @@ my $what = $2; - foreach my $res (get_from_log( limit => 20, search => "%${what}%" )) { + foreach my $res (get_from_log( limit => 20, search => $what )) { print "search [$what]: $res\n"; - from_to($res, 'ISO-8859-2', 'UTF-8'); + from_to($res, $ENCODING, 'UTF-8'); $_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res ); } @@ -246,7 +281,7 @@ if ($res) { print ">> [$nick] $res\n"; - from_to($res, 'ISO-8859-2', 'UTF-8'); + from_to($res, $ENCODING, 'UTF-8'); $_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res ); } @@ -359,4 +394,71 @@ }, ); +# http server + +my $httpd = POE::Component::Server::HTTP->new( + Port => $NICK =~ m/-dev/ ? 8001 : 8000, + ContentHandler => { '/' => \&root_handler }, + Headers => { Server => 'irc-logger' }, +); + +my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); +my $escape_re = join '|' => keys %escape; + +my $style = <<'_END_OF_STYLE_'; +p { margin: 0; padding: 0.1em; } +.time, .channel { color: #808080; font-size: 60%; } +.nick { color: #0000ff; font-size: 80%; } +.message { color: #000000; font-size: 100%; } +.search { float: right; } +_END_OF_STYLE_ + +sub root_handler { + my ($request, $response) = @_; + $response->code(RC_OK); + $response->content_type("text/html; charset=$ENCODING"); + + my $q; + + if ( $request->method eq 'POST' ) { + $q = new CGI::Simple( $request->content ); + } elsif ( $request->uri =~ /\?(.+)$/ ) { + $q = new CGI::Simple( $1 ); + } else { + $q = new CGI::Simple; + } + + my $search = $q->param('search') || $q->param('grep') || ''; + + $response->content( + qq{$NICK + +

+ } . + join("

", + get_from_log( + limit => $q->param('limit') || 100, + search => $q->param('search') || $q->param('grep') || undef, + fmt => { + time => '%s ', + time_channel => '%s %s ', + nick => '%s: ', + message => '%s', + }, + message_filter => sub { + my $m = shift || return; + $m =~ s/($escape_re)/$escape{$1}/gs; + $m =~ s#($RE{URI}{HTTP})#$1#gs; + return $m; + }, + ) + ) . + qq{

} + ); + return RC_OK; +} + POE::Kernel->run;