Просмотр исходного кода

* The irssi logformat now also works when the timestamping includes
seconds.

Morten Brix Pedersen 23 лет назад
Родитель
Сommit
b5b0513dde
2 измененных файлов с 5 добавлено и 3 удалено
  1. 2 0
      docs/Changelog
  2. 3 3
      modules/Pisg/Parser/Format/irssi.pm

+ 2 - 0
docs/Changelog

@@ -8,6 +8,8 @@ pisg (x.xx)
    * Quote < and > to &lt; and &gt; even in non-default character set
    * Ignore more 'actions' in mIRC6 format that are actually status messages
    * Fix problem with muh format and action lines (thanks, Kevin Bralten)
+   * The irssi logformat now also works when the timestamping includes
+     seconds.
 
 pisg (0.47) - Wed Feb, 26th 2003
    * Fix bug where multiple URLs in same line would have save name as first URL

+ 3 - 3
modules/Pisg/Parser/Format/irssi.pm

@@ -10,9 +10,9 @@ sub new
     my ($type, %args) = @_;
     my $self = {
         cfg => $args{cfg},
-        normalline => '^(\d+):\d+ <[@%+ ]?([^>]+)> (.*)',
-        actionline => '^(\d+):\d+ +\* (\S+) (.*)',
-        thirdline  => '^(\d+):(\d+) -\!- (\S+) (\S+) (\S+) (\S+) (\S+)(.*)',
+        normalline => '^(\d+):\d+[^<]+<[@%+ ]?([^>]+)> (.*)',
+        actionline => '^(\d+):\d+[^ ]+ +\* (\S+) (.*)',
+        thirdline  => '^(\d+):(\d+)[^-]+-\!- (\S+) (\S+) (\S+) (\S+) (\S+)(.*)',
     };
 
     bless($self, $type);