Add support for psybnc logfiles

Makefile

@@ -52,6 +52,7 @@ FORMAT_MODULES = $(MODULESDIR)/Pisg/Parser/Format/bxlog.pm \
 		 $(MODULESDIR)/Pisg/Parser/Format/irssi.pm \
 		 $(MODULESDIR)/Pisg/Parser/Format/mbot.pm \
 		 $(MODULESDIR)/Pisg/Parser/Format/mIRC.pm \
+		 $(MODULESDIR)/Pisg/Parser/Format/psybnc.pm \
 		 $(MODULESDIR)/Pisg/Parser/Format/Template.pm \
 		 $(MODULESDIR)/Pisg/Parser/Format/xchat.pm \
 

docs/Changelog

@@ -1,5 +1,6 @@
 pisg (0.23)
    * Support irssi logfiles
+   * Support psybnc logfiles
    * Topics in mIRC format wasn't being recognized. Fixed.
    * Don't go beserk when the logfile doesn't contain any data; just tell it
      to the user.

docs/FORMATS

@@ -72,3 +72,12 @@ also includes a sample line for these formats.
 
   Example:
         17:40 <@John> Hello world
+        
+* psybnc:
+  - IRC bouncer (http://www.psychoid.lam3rz.de/)
+
+  - In order to use this, format must be set to 'psybnc'
+
+  Example:
+  2001-08-19-23-14-06:#LINUX.DE::stelb!user@host.org PRIVMSG #linux.de :hi!
+    

modules/Pisg/Parser/Format/psybnc.pm

@@ -0,0 +1,106 @@
+package Pisg::Parser::Format::psybnc;
+
+use strict;
+$^W = 1;
+
+sub new
+{
+    my $type = shift;
+    my $self = {
+        debug => $_[0],
+        normalline => '^\d+-\d+-\d+-(\d+)-\d+-\d+:[^:]+::([^!]+)[^:]+:(.*)',
+        actionline => '^\d+-\d+-\d+-(\d+)-\d+-\d+:[^:]+::([^!]+)[^:]+:\001ACTION (.*)',
+        thirdline  => '^\d+-\d+-\d+-(\d+)-(\d+)-\d+:[^:]+::([^!]+)[^ ]+ (\w+) (.*)',
+    };
+
+    bless($self, $type);
+    return $self;
+}
+
+sub normalline
+{
+    # Parse a normal line - returns a hash with 'hour', 'nick' and 'saying'
+    my ($self, $line, $lines) = @_;
+    my %hash;
+
+    if ($line =~ /$self->{normalline}/) {
+        $self->{debug}->("[$lines] Normal: $1 $2 $3");
+
+        $hash{hour}   = $1;
+        $hash{nick}   = $2;
+        $hash{saying} = $3;
+
+        return \%hash;
+    } else {
+        return;
+    }
+}
+
+sub actionline
+{
+    # Parse an action line - returns a hash with 'hour', 'nick' and 'saying'
+    my ($self, $line, $lines) = @_;
+    my %hash;
+
+    if ($line =~ /$self->{actionline}/) {
+        $self->{debug}->("[$lines] Action: $1 $2 $3");
+
+        $hash{hour}   = $1;
+        $hash{nick}   = $2;
+        $hash{saying} = $3;
+
+        return \%hash;
+    } else {
+        return;
+    }
+}
+
+sub thirdline
+{
+    # Parses the 'third' line - (the third line is everything else, like
+    # topic changes, mode changes, kicks, etc.)
+    # thirdline() have to return a hash with the following keys, for
+    # every format:
+    #   hour            - the hour we're in (for timestamp loggin)
+    #   min             - the minute we're in (for timestamp loggin)
+    #   nick            - the nick
+    #   kicker          - the nick which were kicked (if any)
+    #   newtopic        - the new topic (if any)
+    #   newmode         - deops or ops, must be '+o' or '-o', or '+ooo'
+    #   newjoin         - a new nick which has joined the channel
+    #   newnick         - a person has changed nick and this is the new nick
+    my ($self, $line, $lines) = @_;
+    my %hash;
+
+    if ($line =~ /$self->{thirdline}/) {
+        $self->{debug}->("[$lines] ***: $1 $2 $3 $4 $5");
+
+        $hash{hour} = $1;
+        $hash{min}  = $2;
+        $hash{nick} = $3;
+
+        my @arr = split(" ", $5);
+        if ($4 eq 'KICK') {
+            $hash{kicker} = $arr[1];
+
+        } elsif ($4 eq 'changes') {
+            $hash{newtopic} = "$7 $8";
+
+        } elsif ($4 eq 'MODE') {
+            $hash{newmode} = $arr[1];
+
+        } elsif ($4 eq 'JOIN') {
+            $hash{newjoin} = $3;
+
+        } elsif ($4 eq 'NICK') {
+            $hash{newnick} = $arr[1];;
+        }
+
+        return \%hash;
+
+    } else {
+        return;
+    }
+}
+
+1;