--- trunk/irc-logger.pl	2006/06/25 16:37:39	36
+++ trunk/irc-logger.pl	2006/06/25 17:40:59	37
@@ -10,6 +10,14 @@
 
 ./irc-logger.pl
 
+=head2 Options
+
+=over 4
+
+=item --import-dircproxy=filename
+
+Import log from C<dircproxy> to C<irc-logger> database
+
 =head1 DESCRIPTION
 
 log all conversation on irc channel
@@ -55,6 +63,13 @@
 use HTML::TagCloud;
 use POSIX qw/strftime/;
 use HTML::CalendarMonthSimple;
+use Getopt::Long;
+use DateTime;
+
+my $import_dircproxy;
+GetOptions(
+	'import-dircproxy:s' => \$import_dircproxy,
+);
 
 my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
 
@@ -85,8 +100,8 @@
 
 my $sth = $dbh->prepare(qq{
 insert into log
-	(channel, me, nick, message)
-values (?,?,?,?)
+	(channel, me, nick, message, time)
+values (?,?,?,?,?)
 });
 
 my $tags;
@@ -281,26 +296,131 @@
 	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;
+
+	print
+		$a->{time} ? $a->{time} . " " : strftime($TIMESTAMP,localtime()),
+		$a->{channel}, " ",
+		$a->{me} ? "***" . $a->{nick} : "<" . $a->{nick} . ">",
+		" " . $a->{msg} . "\n";
+
+	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 {
+			warn "can't parse: $_\n";
+		}
+	}
+	close($l);
+	warn "import over\n";
+	exit;
 }
 
+
+#
+# POE handing part
+#
+
+my $SKIPPING = 0;               # if skipping, how many we've done
+my $SEND_QUEUE;                 # cache
+
+POE::Component::IRC->new($IRC_ALIAS);
+
 POE::Session->create( inline_states =>
    {_start => sub {      
 		$_[KERNEL]->post($IRC_ALIAS => register => 'all');
@@ -319,10 +439,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,10 +447,7 @@
 		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_msg => sub {
 		my $kernel = $_[KERNEL];
@@ -495,53 +609,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 +705,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> ',