--- trunk/irc-logger.pl	2006/06/25 16:37:39	36
+++ trunk/irc-logger.pl	2007/02/03 12:18:04	45
@@ -10,6 +10,20 @@
 
 ./irc-logger.pl
 
+=head2 Options
+
+=over 4
+
+=item --import-dircproxy=filename
+
+Import log from C<dircproxy> to C<irc-logger> database
+
+=item --log=irc-logger.log
+
+Name of log file
+
+=back
+
 =head1 DESCRIPTION
 
 log all conversation on irc channel
@@ -42,6 +56,8 @@
 my $ENCODING = 'ISO-8859-2';
 my $TIMESTAMP = '%Y-%m-%d %H:%M:%S';
 
+my $sleep_on_error = 5;
+
 ## END CONFIG
 
 
@@ -55,6 +71,22 @@
 use HTML::TagCloud;
 use POSIX qw/strftime/;
 use HTML::CalendarMonthSimple;
+use Getopt::Long;
+use DateTime;
+use Data::Dump qw/dump/;
+
+my $import_dircproxy;
+my $log_path;
+GetOptions(
+	'import-dircproxy:s' => \$import_dircproxy,
+	'log:s' => \$log_path,
+);
+
+open(STDOUT, '>', $log_path) || warn "can't redirect log to $log_path: $!";
+
+sub _log {
+	print strftime($TIMESTAMP,localtime()), ' ', join(" ",@_), $/;
+}
 
 my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
 
@@ -85,8 +117,8 @@
 
 my $sth = $dbh->prepare(qq{
 insert into log
-	(channel, me, nick, message)
-values (?,?,?,?)
+	(channel, me, nick, message, time)
+values (?,?,?,?,?)
 });
 
 my $tags;
@@ -111,6 +143,7 @@
 		}
 	},
 	context => 5,
+	full_rows => 1,
  );
 
 Order is important. Fields are first passed through C<filter> (if available) and
@@ -118,6 +151,9 @@
 
 C<context> defines number of messages around each search hit for display.
 
+C<full_rows> will return database rows for each result with C<date>, C<time>, C<channel>,
+C<me>, C<nick> and C<message> keys.
+
 =cut
 
 sub get_from_log {
@@ -164,13 +200,13 @@
 		$search =~ s/^\s+//;
 		$search =~ s/\s+$//;
 		$sth->execute( ( '%' . $search . '%' ) x 2 );
-		warn "search for '$search' returned ", $sth->rows, " results ", $context || '', "\n";
+		_log "search for '$search' returned ", $sth->rows, " results ", $context || '';
 	} elsif (my $tag = $args->{tag}) {
 		$sth->execute();
-		warn "tag '$tag' returned ", $sth->rows, " results ", $context || '', "\n";
+		_log "tag '$tag' returned ", $sth->rows, " results ", $context || '';
 	} elsif (my $date = $args->{date}) {
 		$sth->execute($date);
-		warn "found ", $sth->rows, " messages for date $date ", $context || '', "\n";
+		_log "found ", $sth->rows, " messages for date $date ", $context || '';
 	} else {
 		$sth->execute();
 	}
@@ -187,6 +223,13 @@
 		unshift @rows, $row;
 	}
 
+	# normalize nick names
+	map {
+		$_->{nick} =~ s/^_*(.*?)_*$/$1/
+	} @rows;
+
+	return @rows if ($args->{full_rows});
+
 	my @msgs = (
 		"Showing " . ($#rows + 1) . " messages..."
 	);
@@ -243,9 +286,9 @@
 		my $append = 1;
 
 		my $nick = $row->{nick};
-		if ($nick =~ s/^_*(.*?)_*$/$1/) {
-			$row->{nick} = $nick;
-		}
+#		if ($nick =~ s/^_*(.*?)_*$/$1/) {
+#			$row->{nick} = $nick;
+#		}
 
 		if ($last_row->{nick} ne $nick) {
 			# obfu way to find format for me_nick if needed or fallback to default
@@ -281,26 +324,132 @@
 	return @msgs;
 }
 
+# tags support
 
-my $SKIPPING = 0;               # if skipping, how many we've done
-my $SEND_QUEUE;                 # cache
+my $cloud = HTML::TagCloud->new;
+
+=head2 add_tag
+
+ add_tag( id => 42, message => 'irc message' );
+
+=cut
+
+sub add_tag {
+	my $arg = {@_};
+
+	return unless ($arg->{id} && $arg->{message});
+
+	my $m = $arg->{message};
+	from_to('UTF-8', 'iso-8859-2', $m) if (is_utf8($m));
+
+	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);
+	}
+}
+
+=head2 seed_tags
+
+Read all tags from database and create in-memory cache for tags
+
+=cut
+
+sub seed_tags {
+	my $sth = $dbh->prepare(qq{ select id,message from log where message like '%//%' });
+	$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);
+	}
+}
+
+seed_tags;
 
-POE::Component::IRC->new($IRC_ALIAS);
 
 =head2 save_message
 
-  save_message($channel,$me,$nick,$msg);
+  save_message(
+  	channel => '#foobar',
+	me => 0,
+	nick => 'dpavlin',
+	msg => 'test message',
+	time => '2006-06-25 18:57:18',
+  );
+
+C<time> is optional, it will use C<< now() >> if it's not available.
+
+C<me> if not specified will be C<0> (not C</me> message)
 
 =cut
 
 sub save_message {
-	my ($channel,$me,$nick,$msg) = @_;
-	$me ||= 0;
-	$sth->execute($channel, $me, $nick, $msg);
+	my $a = {@_};
+	$a->{me} ||= 0;
+	$a->{time} ||= strftime($TIMESTAMP,localtime());
+
+	_log
+		$a->{channel}, " ",
+		$a->{me} ? "***" . $a->{nick} : "<" . $a->{nick} . ">",
+		" " . $a->{msg};
+
+	from_to($a->{msg}, '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 => $msg);
+		message => $a->{msg});
 }
 
+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
+	while(<$l>) {
+		chomp;
+		if (/^@(\d+)\s(\S+)\s(.+)$/) {
+			my ($time, $nick, $msg) = ($1,$2,$3);
+
+			my $dt = DateTime->from_epoch( epoch => $time + $tz_offset );
+
+			my $me = 0;
+			$me = 1 if ($nick =~ m/^\[\S+]/);
+			$nick =~ s/^[\[<]([^!]+).*$/$1/;
+
+			$msg =~ s/^ACTION\s+// if ($me);
+
+			save_message(
+				channel => $CHANNEL,
+				me => $me,
+				nick => $nick,
+				msg => $msg,
+				time => $dt->ymd . " " . $dt->hms,
+			) if ($nick !~ m/^-/);
+
+		} else {
+			_log "can't parse: $_";
+		}
+	}
+	close($l);
+	warn "import over\n";
+	exit;
+}
+
+
+#
+# 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);
+
 POE::Session->create( inline_states =>
    {_start => sub {      
 		$_[KERNEL]->post($IRC_ALIAS => register => 'all');
@@ -319,10 +468,7 @@
 		my $channel = $_[ARG1]->[0];
 		my $msg = $_[ARG2];
 
-		from_to($msg, 'UTF-8', $ENCODING);
-
-		print "$channel: <$nick> $msg\n";
-		save_message($channel, 0, $nick, $msg);
+		save_message( channel => $channel, me => 0, nick => $nick, msg => $msg);
     },
     irc_ctcp_action => sub {
 		my $kernel = $_[KERNEL];
@@ -330,11 +476,24 @@
 		my $channel = $_[ARG1]->[0];
 		my $msg = $_[ARG2];
 
-		from_to($msg, 'UTF-8', $ENCODING);
-
-		print "$channel ***$nick $msg\n";
-		save_message($channel, 1, $nick, $msg);
+		save_message( channel => $channel, me => 1, nick => $nick, msg => $msg);
     },
+	irc_ping => sub {
+		warn "pong ", $_[ARG0], $/;
+		$ping->{$_[ARG0]++};
+	},
+	irc_invite => sub {
+		my $kernel = $_[KERNEL];
+		my $nick = (split /!/, $_[ARG0])[0];
+		my $channel = $_[ARG1];
+		
+
+		warn "invited to $channel by $nick";
+
+		$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, "how nice of you to invite me to $channel, I'll be right there..." );
+		$_[KERNEL]->post($IRC_ALIAS => join => $channel);
+
+	},
 	irc_msg => sub {
 		my $kernel = $_[KERNEL];
 		my $nick = (split /!/, $_[ARG0])[0];
@@ -344,7 +503,7 @@
 		my $res = "unknown command '$msg', try /msg $NICK help!";
 		my @out;
 
-		print "<< $msg\n";
+		_log "<< $msg";
 
 		if ($msg =~ m/^help/i) {
 
@@ -352,7 +511,7 @@
 
 		} elsif ($msg =~ m/^msg\s+(\S+)\s+(.*)$/i) {
 
-			print ">> /msg $1 $2\n";
+			_log ">> /msg $1 $2";
 			$_[KERNEL]->post( $IRC_ALIAS => privmsg => $1, $2 );
 			$res = '';
 
@@ -361,19 +520,26 @@
 			my $nr = $1 || 10;
 
 			my $sth = $dbh->prepare(qq{
-				select nick,count(*) from log group by nick order by count desc limit $nr
+				select
+					nick,
+					count(*) as count,
+					sum(length(message)) as len
+				from log
+				group by nick
+				order by len desc,count desc
+				limit $nr
 			});
 			$sth->execute();
 			$res = "Top $nr users: ";
 			my @users;
 			while (my $row = $sth->fetchrow_hashref) {
-				push @users,$row->{nick} . ': ' . $row->{count};
+				push @users,$row->{nick} . ': ' . $row->{count} . '/' . $row->{len} . '=' . sprintf("%.2f", $row->{len}/$row->{count});
 			}
 			$res .= join(" | ", @users);
 		} elsif ($msg =~ m/^last.*?\s*(\d*)/i) {
 
-			foreach my $res (get_from_log( limit => $1 )) {
-				print "last: $res\n";
+			foreach my $res (get_from_log( limit => ($1 || 100) )) {
+				_log "last: $res";
 				from_to($res, $ENCODING, 'UTF-8');
 				$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
 			}
@@ -388,36 +554,79 @@
 					limit => 20,
 					search => $what,
 				)) {
-				print "search [$what]: $res\n";
+				_log "search [$what]: $res";
 				from_to($res, $ENCODING, 'UTF-8');
 				$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
 			}
 
 			$res = '';
 
+		} elsif ($msg =~ m/^(?:count|poll)\s+(.*)(?:\s+(\d+))?\s*$/i) {
+
+			my ($what,$limit) = ($1,$2);
+			$limit ||= 100;
+
+			my $stat;
+
+			foreach my $res (get_from_log(
+					limit => $limit,
+					search => $what,
+					full_rows => 1,
+				)) {
+				while ($res->{message} =~ s/\Q$what\E(\+|\-)//) {
+					$stat->{vote}->{$1}++;
+					$stat->{from}->{ $res->{nick} }++;
+				}
+			}
+
+			my @nicks;
+			foreach my $nick (sort { $stat->{from}->{$a} <=> $stat->{from}->{$b} } keys %{ $stat->{from} }) {
+				push @nicks, $nick . ( $stat->{from}->{$nick} == 1 ? '' :
+					"(" . $stat->{from}->{$nick} . ")"
+				);
+			}
+
+			$res =
+				"$what ++ " . ( $stat->{vote}->{'+'} || 0 ) .
+				" : " . ( $stat->{vote}->{'-'} || 0 ) . " --" .
+				" from " . ( join(", ", @nicks) || 'nobody' );
+
+			$_[KERNEL]->post( $IRC_ALIAS => notice => $nick, $res );
+
+		} elsif ($msg =~ m/^ping/) {
+			$res = "ping = " . dump( $ping );
 		}
 
 		if ($res) {
-			print ">> [$nick] $res\n";
+			_log ">> [$nick] $res";
 			from_to($res, $ENCODING, 'UTF-8');
 			$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
 		}
 
 	},
 	irc_477 => sub {
-		print "# irc_477: ",$_[ARG1], "\n";
+		_log "# irc_477: ",$_[ARG1];
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "register $NICK" );
 	},
 	irc_505 => sub {
-		print "# irc_505: ",$_[ARG1], "\n";
+		_log "# irc_505: ",$_[ARG1];
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "register $NICK" );
 #		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "set hide email on" );
 #		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "set email dpavlin\@rot13.org" );
 	},
 	irc_registered => sub {
-		warn "## indetify $NICK\n";
+		_log "## registrated $NICK";
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "IDENTIFY $NICK" );
 	},
+	irc_disconnected => sub {
+		_log "## disconnected, reconnecting again";
+		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
+	},
+	irc_socketerr => sub {
+		_log "## socket error... sleeping for $sleep_on_error seconds and retry";
+		sleep($sleep_on_error);
+		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
+	},
 #	irc_433 => sub {
 #		print "# irc_433: ",$_[ARG1], "\n";
 #		warn "## indetify $NICK\n";
@@ -425,8 +634,8 @@
 #	},
     _child => sub {},
     _default => sub {
-		printf "%s #%s %s %s\n",
-			strftime($TIMESTAMP,localtime()), $_[SESSION]->ID, $_[ARG0],
+		_log sprintf "sID:%s %s %s",
+			$_[SESSION]->ID, $_[ARG0],
 			ref($_[ARG1]) eq "ARRAY"	?	join(",", map { ref($_) eq "ARRAY" ? join(";", @{$_}) : $_ } @{ $_[ARG1] })	:
 			$_[ARG1]					?	$_[ARG1]					:
 			"";
@@ -495,53 +704,6 @@
    },
   );
 
-# tags support
-
-my $cloud = HTML::TagCloud->new;
-
-=head2 add_tag
-
- add_tag( id => 42, message => 'irc message' );
-
-=cut
-
-sub add_tag {
-	my $arg = {@_};
-
-	return unless ($arg->{id} && $arg->{message});
-
-	my $m = $arg->{message};
-	from_to('UTF-8', 'iso-8859-2', $m) if (is_utf8($m));
-
-	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);
-	}
-}
-
-=head2 seed_tags
-
-Read all tags from database and create in-memory cache for tags
-
-=cut
-
-sub seed_tags {
-	my $sth = $dbh->prepare(qq{ select id,message from log where message like '%//%' });
-	$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);
-	}
-}
-
-seed_tags;
-
 # http server
 
 my $httpd = POE::Component::Server::HTTP->new(
@@ -638,7 +800,7 @@
 				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="/?date=$date">$date</a></div>};
 					},
 					time => '<span class="time">%s</span> ',
 					time_channel => '<span class="channel">%s %s</span> ',