Changeset 3247e21

Timestamp:

Jun 9, 2013, 12:07:35 PM (11 years ago)

Author:

Robert Jacobs <github@eamp.org>

Parents:

80c0fc7 (diff), 590466b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 590466bd0b606fc50dc489d946089bf50a837dec into 80c0fc7442dbbcdb248b6b588246470d35b6f8ec

Files:

• t/variable.t (modified) (5 diffs)
• .gitignore (modified) (1 diff)
• AUTHORS (modified) (2 diffs)
• global.c (modified) (1 diff)
• perl/lib/BarnOwl.pm (modified) (2 diffs)
• perl/lib/BarnOwl/Message.pm (modified) (1 diff)
• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (1 diff)
• perlglue.xs (modified) (1 diff)

t/variable.t

@@ -17 +17 @@
 BarnOwl::unset("-q", "intvar");
 is(BarnOwl::getvar("intvar"), "24", "intvar unset bogus");
+BarnOwl::new_variable_int("intvar", { default => 7 });
+isnt(BarnOwl::getvar("intvar"), "7", "intvar reinit shouldn't override preexisting value");
 
 BarnOwl::new_variable_bool("boolvar", { default => 1 });
@@ -28 +30 @@
 BarnOwl::unset("-q", "boolvar");
 is(BarnOwl::getvar("boolvar"), "off", "boolvar unset");
+BarnOwl::new_variable_bool("boolvar", { default => 1 });
+isnt(BarnOwl::getvar("boolvar"), "on", "boolvar reinit shouldn't override preexisting value");
 
 BarnOwl::new_variable_string("strvar", { default => "monkey" });
@@ -37 +41 @@
 BarnOwl::unset("-q", "strvar");
 is(BarnOwl::getvar("strvar"), "cuttlefish", "strvar unset bogus");
+BarnOwl::new_variable_string("strvar", { default => "monkey" });
+isnt(BarnOwl::getvar("strvar"), "monkey", "strvar reinit overrode set value");
 
 BarnOwl::new_variable_enum("enumvar", { validsettings => [qw/foo bar baz/], default => "bar" });
@@ -46 +52 @@
 BarnOwl::unset("-q", "enumvar");
 is(BarnOwl::getvar("enumvar"), "baz", "enumvar unset bogus");
+BarnOwl::new_variable_enum("enumvar", { validsettings => [qw/foo bar baz/], default => "bar" });
+isnt(BarnOwl::getvar("enumvar"), "bar", "enumvar reinit overrode set value");
 
 BarnOwl::new_variable_int("intvar2");
@@ -78 +86 @@
 $value = "something really long";
 is(BarnOwl::getvar("fullvar"), "value is something really long", "fullvar set out-of-band");
+# Kinda verbose, but better to test all forms
+my $value = "foo";
+BarnOwl::new_variable_full("fullvar", {
+    validsettings => '<short-words>',
+    get_tostring => sub { "value is " . $value },
+    set_fromstring => sub {
+        die "Too long" unless $_[0] =~ /^...?$/;
+        $value = $_[0];
+    },
+    takes_on_off => 1
+});
+isnt(BarnOwl::getvar("fullvar"), "value is foo", "fullvar reinit overrode set value");
 
 1;

.gitignore

@@ -4 +4 @@
 .deps
 META.yml
+MYMETA.yml
 Makefile
 Makefile.in

AUTHORS

@@ -3 +3 @@
 
 The following people have provided patches or other contributions:
+  Alex Vandiver
+  Kevin Chen
+  Arun Tharuvai
   Sam Hartman
-  Alex Vandiver
-  Geoffrey Thomas
   Derrick Brashear
   David Glasser
+  Eric Price
   Matthew Goldstein
-  Arun Tharuvai
-  Kevin Chen
-  Eric Price
+  Geoffrey Thomas
+  Anders Kaseorg
+  Greg Price
+  Chris Lesniewski-Laas
+  Alex Dehnert
+  Edward Z. Yang
+  Karl Ramm
+  Evan Broder
+  David Benjamin
+  Cathy Zhang
+  Joshua Oreman
+  Leonid Grinberg
+  Kevin Riggle
+  Brian Sniffen
+  William Throwe
+  Jason Gross
+  Adam Glasgall
+  Tim Hill
+  DD Liu
+  Betsy Riley
+  Robert Jacobs
 
-BarnOwl is based on code from Owl, which was originally primarly
+BarnOwl is based on code from Owl, which was originally primarily
 written by James Kretchmar.  Erik Nygren also made substantial
-contributions and improvemnts to the program.
+contributions and improvements to the program.
 
-The following people provided patches and other techincal support for
+The following people provided patches and other technical support for
 Owl:
 
@@ -30 +50 @@
   Mark Eichin
 
-Mark Eichin is also maintaining the debian package of Owl.
+Mark Eichin is also maintaining the Debian package of Owl.
 
 The following people helped with beta testing the earliest versions of

global.c

@@ -849 +849 @@
   } filters[] = {
     { "personal",
-      "isprivate ^true$ and ( not type ^zephyr$ or ( class ^message  ) )" },
+      "isprivate ^true$ and ( not type ^zephyr$ or ( class ^message$ ) )" },
     { "trash",
       "class ^mail$ or opcode ^ping$ or type ^admin$ or ( not login ^none$ )" },

perl/lib/BarnOwl.pm

@@ -14 +14 @@
                     error debug
                     create_style getnumcolors wordwrap
+                    message_matches_filter
                     add_dispatch remove_dispatch
                     add_io_dispatch remove_io_dispatch
@@ -239 +240 @@
 
 Returns the number of colors this BarnOwl is capable of displaying
+
+=head2 message_matches_filter MESSAGE FILTER_NAME [QUIET = 0]
+
+Returns 1 if C<FILTER_NAME> is the name of a valid filter, and
+C<MESSAGE> matches that filter.  Returns 0 otherwise.  If
+C<QUIET> is false, this method displays an error message if
+if C<FILTER_NAME> does not name a valid filter.
 
 =head2 add_dispatch FD CALLBACK

perl/lib/BarnOwl/Message.pm

@@ -51 +51 @@
 sub is_ping     { return 0; }
 sub is_mail     { return 0; }
-sub is_personal { return shift->is_private; }
+sub is_personal { return BarnOwl::message_matches_filter(shift, "personal"); }
 sub class       { return undef; }
 sub instance    { return undef; }

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -65 +65 @@
 
 sub is_ping     { return (lc(shift->opcode) eq "ping"); }
-
-sub is_personal {
-    my ($m) = @_;
-    return ((lc($m->class) eq "message")
-            && $m->is_private);
-}
 
 sub is_mail {

perlglue.xs

@@ -256 +256 @@
         }
 
+bool
+message_matches_filter(message, filter_name, quiet = false)
+        SV *message
+        const char *filter_name
+        bool quiet
+        PREINIT:
+                owl_message *m;
+                const owl_filter *f;
+        CODE:
+        {
+                if (!SvROK(message) || SvTYPE(SvRV(message)) != SVt_PVHV) {
+                        croak("Usage: BarnOwl::message_matches_filter($message, $filter_name[, $quiet])");
+                }
+
+                m = owl_perlconfig_hashref2message(message);
+                f = owl_global_get_filter(&g, filter_name);
+                if (!f && !quiet) {
+                        owl_function_error("%s filter is not defined", filter_name);
+                }
+                RETVAL = f && owl_filter_message_match(f, m);
+        }
+        OUTPUT:
+                RETVAL
+        CLEANUP:
+                owl_message_delete(m);
+
 const utf8 *
 wordwrap(in, cols)