Added '.user' partial match.

* Added '.user' partial match, to match against
  the part before the @ in email address.
git-archimport-id: frederic@jolliton.com--2004-private/mail-filter--main--0.1.1--patch-4

diff --git a/mailfilter.py b/mailfilter.py
index 6738ca0..5fbde34 100644 (file)
--- a/mailfilter.py
+++ b/mailfilter.py
@@ -643,9 +643,10 @@ def testRule( rule ) :
                        #
                        # 'From.name'    -> [ 'Frederic Jolliton' , 'Foo' ]
                        # 'From.address' -> [ 'frederic@jolliton.com' , 'a@b.c' ]
                        #
                        # 'From.name'    -> [ 'Frederic Jolliton' , 'Foo' ]
                        # 'From.address' -> [ 'frederic@jolliton.com' , 'a@b.c' ]

+                       # 'From.user'    -> [ 'frederic' , 'a' ]

                        # 'From.domain'  -> [ 'jolliton.com' , 'b.c' ]
                        #
                        # 'From.domain'  -> [ 'jolliton.com' , 'b.c' ]
                        #

-                       if partName not in [ 'name' , 'address' , 'domain' ] :
+                       if partName not in [ 'name' , 'address' , 'user' , 'domain' ] :

                                logMessage( 'Unknown header part %r' % partName )
                                return False
                        adrs = email.Utils.getaddresses( headers )
                                logMessage( 'Unknown header part %r' % partName )
                                return False
                        adrs = email.Utils.getaddresses( headers )


@@ -653,6 +654,8 @@ def testRule( rule ) :
                                headers = [ adr[ 0 ] for adr in adrs ]
                        elif partName == 'address' :
                                headers = [ adr[ 1 ] for adr in adrs ]
                                headers = [ adr[ 0 ] for adr in adrs ]
                        elif partName == 'address' :
                                headers = [ adr[ 1 ] for adr in adrs ]

+                       elif partName == 'user' :
+                               headers = [ adr[ 1 ].split( '@' )[ 0 ] for adr in adrs ]

                        elif partName == 'domain' :
                                headers = [ adr[ 1 ].split( '@' )[ -1 ] for adr in adrs ]
 
                        elif partName == 'domain' :
                                headers = [ adr[ 1 ].split( '@' )[ -1 ] for adr in adrs ]