Added get_core_nick_counters to Onis::Plugins::Core

Changed Onis::Plugins::Bignumbers for new data layout

diff --git a/lib/Onis/Plugins/Bignumbers.pm b/lib/Onis/Plugins/Bignumbers.pm
new file mode 100644 (file)
index 0000000..66d0ef5
--- /dev/null
+++ b/lib/Onis/Plugins/Bignumbers.pm
@@ -0,0 +1,378 @@
+package Onis::Plugins::Bignumbers;
+
+use strict;
+use warnings;
+
+use Onis::Config (qw(get_config));
+use Onis::Html (qw(html_escape get_filehandle));
+use Onis::Language (qw(translate));
+use Onis::Data::Core (qw(get_main_nick register_plugin));
+use Onis::Data::Persistent ();
+use Onis::Users (qw(nick_to_name));
+use Onis::Plugins::Core (qw(get_core_nick_counters));
+
+our $BigNumbers = Onis::Data::Persistent->new ('BigNumbers', 'nick', qw(questions uppercase smiley_happy smiley_sad));
+our $CalcData = {};
+
+register_plugin ('TEXT', \&add);
+register_plugin ('ACTION', \&add);
+register_plugin ('OUTPUT', \&output);
+
+my $VERSION = '$Id$';
+print STDERR $/, __FILE__, ": $VERSION" if ($::DEBUG);
+
+return (1);
+
+sub add
+{
+       my $data = shift;
+
+       my $nick = $data->{'nick'};
+       my $text = $data->{'text'};
+
+       my $mod = 0;
+
+       my @nums = $BigNumbers->get ($nick);
+       if (!@nums)
+       {
+               @nums = (0, 0, 0, 0);
+               $mod++;
+       }
+
+       if ($text =~ m/\b\?/)
+       {
+               $nums[0]++;
+               $mod++;
+       }
+
+       if ((uc ($text) eq $text) and ($text =~ m/[A-Z]/))
+       {
+               $nums[1]++;
+               $mod++;
+       }
+
+       if ($text =~ m/( |^)[;:]-?\)( |$)/)
+       {
+               $nums[2]++;
+               $mod++;
+       }
+
+       if ($text =~ m/( |^):-?\(( |$)/)
+       {
+               $nums[3]++;
+               $mod++;
+       }
+
+       if ($mod)
+       {
+               $BigNumbers->put ($nick, @nums);
+       }
+
+       return (1);
+}
+
+sub calculate
+{
+       for ($BigNumbers->keys ())
+       {
+               my $nick = $_;
+               my $main = get_main_nick ($nick);
+               my ($questions, $uppercase, $smiley_happy, $smiley_sad) = $BigNumbers->get ($nick);
+
+               next unless (defined ($smiley_sad));
+               
+               if (!defined ($CalcData->{$main}))
+               {
+                       my ($lines, $words, $chars) = get_core_nick_counters ($main);
+                       next unless (defined ($chars));
+
+                       $CalcData->{$main} =
+                       {
+                               lines => $lines,
+                               words => $words,
+                               chars => $chars,
+                               questions    => 0,
+                               uppercase    => 0,
+                               smiley_happy => 0,
+                               smiley_sad   => 0
+                       };
+               }
+
+               $CalcData->{$main}{'questions'}    += $questions;
+               $CalcData->{$main}{'uppercase'}    += $uppercase;
+               $CalcData->{$main}{'smiley_happy'} += $smiley_happy;
+               $CalcData->{$main}{'smiley_sad'}   += $smiley_sad;
+       }
+}
+
+sub output
+{
+       my $first;
+       my $second;
+       my $trans;
+
+       my $fh = get_filehandle ();
+       
+       $trans = translate ('Big Numbers');
+       print $fh <<EOF;
+<table class="plugin bignumbers">
+  <tr>
+    <th>$trans</th>
+  </tr>
+EOF
+       ($first, $second) = sort_by_field ('questions');
+       if ($first)
+       {
+               my $percent = 100 * $CalcData->{$first}{'questions'} / $CalcData->{$first}{'lines'};
+               my $trans = translate ('questions0: %s %2.1f%%');
+
+               print $fh "  <tr>\n    <td>";
+               printf $fh ($trans, $first, $percent);
+               
+               if ($second)
+               {
+                       $percent = 100 * $CalcData->{$second}{'questions'} / $CalcData->{$second}{'lines'};
+                       $trans = translate ('questions1: %s %2.1f%%');
+
+                       print $fh "<br />\n",
+                       qq#      <span class="small">#;
+                       printf $fh ($trans, $second, $percent);
+                       print $fh '</span>';
+               }
+               
+               print $fh "</td>\n  </tr>\n";
+       }
+
+       ($first, $second) = sort_by_field ('uppercase');
+       if ($first)
+       {
+               my $percent = 100 * $CalcData->{$first}{'uppercase'} / $CalcData->{$first}{'lines'};
+               my $trans = translate ('yells0: %s %2.1f%%');
+
+               print $fh "  <tr>\n    <td>";
+               printf $fh ($trans, $first, $percent);
+
+               if ($second)
+               {
+                       $percent = 100 * $CalcData->{$second}{'uppercase'} / $CalcData->{$second}{'lines'};
+                       $trans = translate ('yells1: %s %2.1f%%');
+
+                       print $fh "<br />\n",
+                       qq#      <span class="small">#;
+                       printf $fh ($trans, $second, $percent);
+                       print $fh "</span>";
+               }
+
+               print $fh "</td>\n  </tr>\n";
+       }
+
+       ($first, $second) = sort_by_field ('smiley_happy');
+       if ($first)
+       {
+               my $percent = 100 * $CalcData->{$first}{'smiley_happy'} / $CalcData->{$first}{'lines'};
+               my $trans = translate ('happy0: %s %2.1f%%');
+
+               print $fh "  <tr>\n    <td>";
+               printf $fh ($trans, $first, $percent);
+               
+               if ($second)
+               {
+                       $percent = 100 * $CalcData->{$second}{'smiley_happy'} / $CalcData->{$second}{'lines'};
+                       $trans = translate ('happy1: %s %2.1f%%');
+
+                       print $fh "<br />\n",
+                       qq#      <span class="small">#;
+                       printf $fh ($trans, $second, $percent);
+                       print $fh "</span>";
+               }
+               
+               print $fh "</td>\n  </tr>\n";
+       }
+
+       ($first, $second) = sort_by_field ('smiley_sad');
+       if ($first)
+       {
+               my $percent = 100 * $CalcData->{$first}{'smiley_sad'} / $CalcData->{$first}{'lines'};
+               my $trans = translate ('sad0: %s %2.1f%%');
+
+               print $fh "  <tr>\n    <td>";
+               printf $fh ($trans, $first, $percent);
+               
+               if ($second)
+               {
+                       $percent = 100 * $CalcData->{$second}{'smiley_sad'} / $CalcData->{$second}{'lines'};
+                       $trans = translate ('sad1: %s %2.1f%%');
+
+                       print $fh "<br />\n",
+                       qq#      <span class="small">#;
+                       printf $fh ($trans, $second, $percent);
+                       print $fh "</span>";
+               }
+               
+               print $fh "</td>\n  </tr>\n";
+       }
+
+       {
+               my @names = sort_by_field ('chars');
+               
+               my $longest = '';
+               my $longest2 = '';
+               my $shortest = '';
+               my $shortest2 = '';
+               
+               my $chan_chars = 0;
+               my $chan_lines = 0;
+               
+               for (@names)
+               {
+                       $chan_chars += $CalcData->{$_}{'chars'} || 0;
+                       $chan_lines += $CalcData->{$_}{'lines'} || 0;
+               }
+
+               if (@names)
+               {
+                       $longest = shift (@names);
+               }
+               if (@names)
+               {
+                       $longest2 = shift (@names);
+               }
+               if (@names)
+               {
+                       $shortest = pop (@names);
+               }
+               if (@names)
+               {
+                       $shortest2 = pop (@names);
+               }
+               
+               if ($longest)
+               {
+                       my $avg = $CalcData->{$longest}{'chars'} / $CalcData->{$longest}{'lines'};
+                       my $trans = translate ('max chars0: %s %1.1f');
+                       
+                       print $fh "  <tr>\n    <td>";
+                       printf $fh ($trans, $longest, $avg);
+                       
+                       if ($longest2)
+                       {
+                               $avg = $CalcData->{$longest2}{'chars'} / $CalcData->{$longest2}{'lines'};
+                               $trans = translate ('max chars1: %s %1.1f');
+
+                               print $fh "<br />\n",
+                               qq#      <span class="small">#;
+                               printf $fh ($trans, $longest2, $avg);
+                               print $fh "</span>";
+                       }
+
+                       $avg = $chan_chars / $chan_lines;
+                       $trans = translate ('chars avg: %1.1f');
+
+                       print $fh "<br />\n",
+                       qq#      <span class="small">#;
+                       printf $fh ($trans, $avg);
+                       print $fh "</span></td>\n  </tr>\n";
+               }
+
+               if ($shortest)
+               {
+                       my $avg = $CalcData->{$shortest}{'chars'} / $CalcData->{$shortest}{'lines'};
+                       my $trans = translate ('min chars0: %s %1.1f');
+                       
+                       print $fh "  <tr>\n    <td>";
+                       printf $fh ($trans, $shortest, $avg);
+                       
+                       if ($shortest2)
+                       {
+                               $avg = $CalcData->{$shortest2}{'chars'} / $CalcData->{$shortest2}{'lines'};
+                               $trans = translate ('min chars1: %s %1.1f');
+
+                               print $fh "<br />\n",
+                               qq#      <span class="small">#;
+                               printf $fh ($trans, $shortest2, $avg);
+                               print $fh "</span>";
+                       }
+                       print $fh "</td>\n  </tr>\n";
+               }
+       }
+       
+       {
+               my @names = sort_by_field ('words');
+
+               $first = '';
+               $second = '';
+
+               my $chan_words = 0;
+               my $chan_lines = 0;
+               
+               for (@names)
+               {
+                       $chan_words += $CalcData->{$_}{'words'} || 0;
+                       $chan_lines += $CalcData->{$_}{'lines'} || 0;
+               }
+               
+               if (@names)
+               {
+                       $first = shift (@names);
+               }
+               if (@names)
+               {
+                       $second = shift (@names);
+               }
+
+               if ($first)
+               {
+                       my $avg = $CalcData->{$first}{'words'} / $CalcData->{$first}{'lines'};
+                       my $trans = translate ('max words0: %s %1.1f');
+                       
+                       print $fh "  <tr>\n    <td>";
+                       printf $fh ($trans, $first, $avg);
+
+                       if ($second)
+                       {
+                               $avg = $CalcData->{$second}{'words'} / $CalcData->{$second}{'lines'};
+                               $trans = translate ('max words1: %s %1.1f');
+
+                               print $fh "<br />\n",
+                               qq#      <span class="small">#;
+                               printf $fh ($trans, $second, $avg);
+                               print $fh "</span>";
+                       }
+
+                       $avg = $chan_words / $chan_lines;
+                       $trans = translate ('words avg: %1.1f');
+                       
+                       print $fh "<br />\n",
+                       qq#      <span class="small">#;
+                       printf $fh ($trans, $avg);
+                       print $fh "</span></td>\n  </tr>\n";
+               }
+       }
+
+       print $fh "</table>\n\n";
+}
+
+sub sort_by_field
+{
+       my $field = shift;
+
+       my @retval = sort
+       {
+               ($CalcData->{$b}{$field} / $CalcData->{$b}{'lines'})
+               <=>
+               ($CalcData->{$a}{$field} / $CalcData->{$a}{'lines'})
+       } grep
+       {
+               defined ($CalcData->{$_}{'lines'})
+                       and ($CalcData->{$_}{'lines'} != 0)
+                       and defined ($CalcData->{$_}{$field})
+       }
+       (keys (%{$CalcData->}));
+       
+       while (scalar (@retval) < 2)
+       {
+               push (@retval, '');
+       }
+
+       return (@retval);
+}

diff --git a/lib/Onis/Plugins/Core.pm b/lib/Onis/Plugins/Core.pm
index 3f01666..5294483 100644 (file)
--- a/lib/Onis/Plugins/Core.pm
+++ b/lib/Onis/Plugins/Core.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Carp (qw(confess));
 use warnings;
 
 use Carp (qw(confess));

+use Exporter;

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -23,6 +24,9 @@ use Onis::Users (qw(get_realname get_link get_image ident_to_name));
 use Onis::Data::Core qw#get_all_nicks nick_to_ident ident_to_nick get_main_nick register_plugin#;
 use Onis::Data::Persistent;
 
 use Onis::Data::Core qw#get_all_nicks nick_to_ident ident_to_nick get_main_nick register_plugin#;
 use Onis::Data::Persistent;
 

+@Onis::Plugins::Core::EXPORT_OK = (qw(get_core_nick_counters));
+@Onis::Plugins::Core::ISA = ('Exporter');
+

 our $NickLinesCounter = Onis::Data::Persistent->new ('NickLinesCounter', 'nick',
        qw(
                lines00 lines01 lines02 lines03 lines04 lines05 lines06 lines07 lines08 lines09 lines10 lines11
 our $NickLinesCounter = Onis::Data::Persistent->new ('NickLinesCounter', 'nick',
        qw(
                lines00 lines01 lines02 lines03 lines04 lines05 lines06 lines07 lines08 lines09 lines10 lines11


@@ -821,6 +825,33 @@ sub bar
        return ($retval);
 }
 
        return ($retval);
 }
 

+=head1 EXPORTED FUNCTIONS
+
+=over 4
+
+=item B<get_core_nick_counters> (I<$nick>)
+
+Returns the total I<lines>, I<words> and I<characters> written by the given
+nick.
+
+=cut
+
+sub get_core_nick_counters
+{
+       my $nick = shift;
+
+       if (defined ($NickData->{$nick}))
+       {
+               return ($NickData->{$nick}{'lines_total'},
+                       $NickData->{$nick}{'words_total'},
+                       $NickData->{$nick}{'chars_total'});
+       }
+
+       return (qw());
+}
+
+=back
+

 =head1 AUTHOR
 
 Florian octo Forster, E<lt>octo at verplant.orgE<gt>
 =head1 AUTHOR
 
 Florian octo Forster, E<lt>octo at verplant.orgE<gt>