Changeset 811ad93

Timestamp:

Apr 30, 2008, 1:29:45 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f094fc4, 61abb18

Parents:

2650a10

Message:

Refactor default style code somewhat to be more easily extensible

File:

• perlwrap.pm (modified) (7 diffs)

perlwrap.pm

@@ -774 +774 @@
 {
     my $self = shift;
-    my $m = shift;
+    my $m    = shift;
+    my $fmt;
 
     if ( $m->is_loginout) {
-        return $self->format_login($m);
+        $fmt = $self->format_login($m);
     } elsif($m->is_ping && $m->is_personal) {
-        return $self->format_ping($m);
+        $fmt = $self->format_ping($m);
     } elsif($m->is_admin) {
-        return $self->format_admin($m);
+        $fmt = $self->format_admin($m);
     } else {
-        return $self->format_chat($m);
-    }
+        $fmt = $self->format_chat($m);
+    }
+    $fmt = BarnOwl::Style::boldify($fmt) if $self->should_bold($m);
+    return $fmt;
+}
+
+sub should_bold {
+    my $self = shift;
+    my $m = shift;
+    return $m->is_personal && $m->direction eq "in";
 }
 
@@ -821 +830 @@
     my $self = shift;
     my $m = shift;
-    return "\@bold(OWL ADMIN)\n" . indentBody($m);
+    return "\@bold(OWL ADMIN)\n" . $self->indent_body($m);
 }
 
 sub format_chat($) {
+    my $self = shift;
+    my $m = shift;
+    my $header = $self->chat_header($m);
+    return $header . "\n". $self->indent_body($m);
+}
+
+sub chat_header {
     my $self = shift;
     my $m = shift;
@@ -846 +862 @@
     }
     $header .= "  " . time_hhmm($m);
+    $header .= $self->format_sender($m);
+    return $header;
+}
+
+sub format_sender {
+    my $self = shift;
+    my $m = shift;
     my $sender = $m->long_sender;
     $sender =~ s/\n.*$//s;
-    $header .= " " x (4 - ((length $header) % 4));
-    $header .= "(" . $sender . '@color[default]' . ")";
-    my $message = $header . "\n". indentBody($m);
-    if($m->is_personal && $m->direction eq "in") {
-        $message = BarnOwl::Style::boldify($message);
-    }
-    return $message;
-}
-
-sub indentBody($)
+    return "  (" . $sender . '@color[default]' . ")";
+}
+
+sub indent_body($)
 {
+    my $self = shift;
     my $m = shift;
 
@@ -874 +892 @@
 
 package BarnOwl::Style::Basic;
-
 our @ISA=qw(BarnOwl::Style::Default);
 
@@ -882 +899 @@
 
 package BarnOwl::Style::OneLine;
-################################################################################
-# Branching point for various formatting functions in this style.
-################################################################################
+# Inherit format_message to dispatch
+our @ISA = qw(BarnOwl::Style::Default);
+
 use constant BASE_FORMAT => '%s %-13.13s %-11.11s %-12.12s ';
-sub format_message($) {
-  my $self = shift;
-  my $m = shift;
-
-  if ( $m->is_loginout ) {
-    return $self->format_login($m);
-  }
-  elsif ( $m->is_ping) {
-    return $self->format_ping($m);
-  }
-  elsif ( $m->is_admin || $m->is_loopback) {
-    return $self->format_local($m);
-  }
-  else {
-    return $self->format_chat($m);
-  }
-}
 
 sub description {"Formats for one-line-per-message"}
@@ -948 +948 @@
   if ($m->is_personal) {
     $line= sprintf(BASE_FORMAT,
-                   $dirsym,
-                   $m->type,
-                   '',
-                   ($dir eq 'out'
-                      ? $m->pretty_recipient
-                      : $m->pretty_sender));
+                   $dirsym,
+                   $m->type,
+                   '',
+                   ($dir eq 'out'
+                    ? $m->pretty_recipient
+                    : $m->pretty_sender));
   }
   else {
     $line = sprintf(BASE_FORMAT,
-                    $dirsym,
-                    $m->context,
-                    $m->subcontext,
-                    ($dir eq 'out'
-                       ? $m->pretty_recipient
-                       : $m->pretty_sender));
+                    $dirsym,
+                    $m->context,
+                    $m->subcontext,
+                    ($dir eq 'out'
+                     ? $m->pretty_recipient
+                     : $m->pretty_sender));
   }
 
@@ -968 +968 @@
   $body =~ tr/\n/ /;
   $line .= $body;
-  $line = BarnOwl::Style::boldify($line) if ($m->is_personal && lc($m->direction) eq 'in');
   return $line;
 }
 
-# Format locally generated messages
-sub format_local($)
+# Format owl admin messages
+sub format_admin($)
 {
   my $self = shift;
   my $m = shift;
-  my $type = uc($m->{type});
-  my $line = sprintf(BASE_FORMAT, '<', $type, '', '');
+  my $line = sprintf(BASE_FORMAT, '<', 'ADMIN', '', '');
   my $body = $m->{body};
   $body =~ tr/\n/ /;