From f7724e40ec232fcefaa2e0173734721eddb482b0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 2 Dec 2011 17:04:03 -0500 Subject: Fix email things --- .maildirproc/default.rc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 7ea1ef0..6644b9b 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -85,7 +85,13 @@ def my_filters(mail): mail.move(".software.social") return - if mail["List-ID"].matches("dev.lists.parabolagnulinux.org"): + if ( + False + or mail["List-ID"].matches( "dev.list.parabolagnulinux.org") + or is_to_or_from(mail, "dev@list.parabolagnulinux.org") + or mail["List-ID"].matches("dev.lists.parabolagnulinux.org") + or is_to_or_from(mail, "dev@lists.parabolagnulinux.org") + ): mail.move(".software.parabola-dev") return @@ -95,7 +101,11 @@ def my_filters(mail): mail.move(".Social.Facebook") return - if mail["From"].matches("identi\.ca"): + if ( + False + or mail["From"].matches("identi\.ca") + or mail["From"].matches("statusnet") + ): mail.move(".Social.Identica") return -- cgit v1.2.3-2-g168b From 5d5254db67843e7f57bc7d7dec6128f1e566ba2c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 4 Dec 2011 19:28:27 -0500 Subject: Change Inbox handling in maildirproc and offlineimap --- .maildirproc/default.rc | 1 - 1 file changed, 1 deletion(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 6644b9b..15ea01c 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -304,7 +304,6 @@ def my_filters(mail): handle_mapping = { ".": handle_incoming_unknown, - ".Inbox": handle_incoming_unknown, ".spam-training": handle_incoming_spam_training, ".ham-training": handle_incoming_ham_training, ".Ham": handle_incoming_ham, -- cgit v1.2.3-2-g168b From 4a1dbb6dcf0b5efc26d366b164707311332354c9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 31 Dec 2011 18:31:57 -0500 Subject: update --- .maildirproc/default.rc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 15ea01c..cbb3e18 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -6,10 +6,17 @@ processor.maildir_base = "~/Maildir" processor.auto_reload_rcfile = True def is_to_or_from(mail,address): + """ + Return true if [mail] is to or from an address that contains [address]. + """ return ( mail["From"].contains(address) or mail.target.contains(address)) def is_to_or_from_re(mail,address): + """ + Return true if [mail] is to or from an address that matches the + regex [address]. + """ return ( mail["From"].matches(address) or mail.target.matches(address)) @@ -87,10 +94,8 @@ def my_filters(mail): if ( False - or mail["List-ID"].matches( "dev.list.parabolagnulinux.org") - or is_to_or_from(mail, "dev@list.parabolagnulinux.org") - or mail["List-ID"].matches("dev.lists.parabolagnulinux.org") - or is_to_or_from(mail, "dev@lists.parabolagnulinux.org") + or mail["List-ID"].matches( "parabolagnulinux.org") + or is_to_or_from(mail, "parabolagnulinux.org") ): mail.move(".software.parabola-dev") return @@ -248,6 +253,7 @@ def my_filters(mail): if ( False or mail["From"].contains("@msdlt.k12.in.us") + or mail["From"].contains("naviance.com") or is_to_or_from(mail,"ibwhite@comcast.net") or mail["Subject"].contains("IOA") or mail["From"].contains("nths.org") -- cgit v1.2.3-2-g168b From 3d5c297366bbb2e40cf26c74bd6bafe933c499d5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 27 Feb 2012 00:01:38 -0500 Subject: live on my laptop for a while --- .maildirproc/default.rc | 2 ++ 1 file changed, 2 insertions(+) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index cbb3e18..4994d2d 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -140,6 +140,7 @@ def my_filters(mail): or is_to_or_from(mail,"solorzano.luis@rocketmail.com") or is_to_or_from(mail,"eldredmac@comcast.net")# MacDonell or is_to_or_from(mail,"mitchprather@sbcglobal.net") + or is_to_or_from(mail,"oa_wap@yahoo.com") ): mail.move(".Troop276") return @@ -167,6 +168,7 @@ def my_filters(mail): "justicejade10@aol.com", "silioso@gmail.com", "cdewalt3@yahoo.com", + "bryanbonahoom@gmail.com", ]: if is_to_or_from(mail,address): mail.move(".School.Robotics") -- cgit v1.2.3-2-g168b From a842b162bb2b5bceb3a7c26e2162b599ae289896 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 3 Mar 2012 09:33:01 -0500 Subject: update mail filter --- .maildirproc/default.rc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 4994d2d..a0f1af8 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -92,10 +92,13 @@ def my_filters(mail): mail.move(".software.social") return + if mail["List-ID"].matches("maintenance.lists.parabolagnulinux.org"): + mail.move(".software.parabola-maintenance") + return if ( False - or mail["List-ID"].matches( "parabolagnulinux.org") - or is_to_or_from(mail, "parabolagnulinux.org") + or mail["List-ID"].matches("parabolagnulinux.org") + or is_to_or_from(mail, "parabolagnulinux.org") ): mail.move(".software.parabola-dev") return @@ -163,6 +166,7 @@ def my_filters(mail): "dave.nelson@ecolab.com", "@ni.com", "@precisepath.com", + "@usfirst.org", "gamefreak207@gmail.com", # Brett Leedy "tswilson4801@att.net", "justicejade10@aol.com", -- cgit v1.2.3-2-g168b From 67a217962dcff14e70ca3ca696b2b45372259403 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 28 Mar 2012 21:02:47 -0400 Subject: tweak mail filters --- .maildirproc/default.rc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index a0f1af8..05efbcb 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -92,13 +92,18 @@ def my_filters(mail): mail.move(".software.social") return - if mail["List-ID"].matches("maintenance.lists.parabolagnulinux.org"): + if mail["List-Id"].matches("help-grub.gnu.org"): + mail.move(".software.help-grub") + return + + if mail["List-Id"].matches("maintenance.lists.parabolagnulinux.org"): mail.move(".software.parabola-maintenance") return if ( False - or mail["List-ID"].matches("parabolagnulinux.org") + or mail["List-Id"].matches("parabolagnulinux.org") or is_to_or_from(mail, "parabolagnulinux.org") + or is_to_or_from(mail, "parabola.nu") ): mail.move(".software.parabola-dev") return @@ -197,7 +202,6 @@ def my_filters(mail): "esr@thyrsus.com", "canonical.org", "foocorp.net", - "parabolagnulinux.org", "cnuk.org", ]: if is_to_or_from(mail,address): @@ -227,11 +231,11 @@ def my_filters(mail): mail.move(".CompTIA") return - if mail["From"].contains("@lnnorthstar.org"): + if is_to_or_from(mail, "@lnnorthstar.org"): mail.move(".School.Newspaper") return - if mail["From"].contains("susyphil@aol.com"): + if is_to_or_from(mail,"susyphil@aol.com"): mail.move(".PMCH") for address in [ -- cgit v1.2.3-2-g168b From 6aeb41f4ce96f92e0c86810025554ed6ab97dec4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 11 Apr 2012 22:30:36 -0400 Subject: broaden the facebook mail filter --- .maildirproc/default.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 05efbcb..d7351c5 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -110,7 +110,7 @@ def my_filters(mail): # Sort email from some social websites - if mail["From"].matches("@facebook(|mail)\.com"): + if mail["From"].matches("facebook(|mail)\.com"): mail.move(".Social.Facebook") return -- cgit v1.2.3-2-g168b From 8e5ee10f6fe9f9a756b4530091e05adea7eb6f51 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 17 May 2012 22:28:56 -0400 Subject: tweak maildirproc filters to do fewer writes --- .maildirproc/default.rc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index d7351c5..1661527 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -46,24 +46,25 @@ def handle_incoming_spam_training(mail): def handle_incoming_ham_training(mail): bogofilter_ham(mail) - mail.move(".Ham") + handle_incoming_ham(mail) def handle_incoming_ham(mail): my_filters(mail) +def handle_incoming_spam(mail): + mail.move(".Bulk Mail") def handle_incoming_unknown(mail): # Filter spam spam = bogofilter_auto(mail) if spam == 0: - mail.move(".Bulk Mail") + handle_incoming_spam(mail) return elif spam == 1: - mail.move(".Ham") + handle_incoming_ham(mail) return elif spam == 2: # maybe spam - my_filters(mail) return else: mail.move(".Error") @@ -318,11 +319,13 @@ def my_filters(mail): mail.move(".misc.accounts") return + mail.move(".Ham") + handle_mapping = { ".": handle_incoming_unknown, ".spam-training": handle_incoming_spam_training, ".ham-training": handle_incoming_ham_training, - ".Ham": handle_incoming_ham, + #".Ham": handle_incoming_ham, } processor.maildirs = handle_mapping.keys() for mail in processor: -- cgit v1.2.3-2-g168b From 58f1e1467c2b68a7d734c457aaa815377226f01c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 22 May 2012 23:37:33 -0400 Subject: tweak mail filter --- .maildirproc/default.rc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '.maildirproc/default.rc') diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 1661527..f49fb9b 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -232,7 +232,11 @@ def my_filters(mail): mail.move(".CompTIA") return - if is_to_or_from(mail, "@lnnorthstar.org"): + if ( + False + or is_to_or_from(mail, "@lnnorthstar.org") + or is_to_or_from(mail, "lnnorthstar.org@tigertech.net") + ): mail.move(".School.Newspaper") return -- cgit v1.2.3-2-g168b