Changeset 01585d0

Timestamp:

May 27, 2013, 2:10:17 PM (11 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Parents:

b58dea1 (diff), 6383920 (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 6383920fd2bf91655aa255c01f48608ecdca08fe into b58dea13aadcc1eee14a142336f8a331c8c7d2f5

Files:

• 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)

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)