stuff

1 files changed, 67 insertions, 50 deletions

diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc
index 381ce8f..0252c74 100644
--- a/.config/maildirproc/att.rc
+++ b/.config/maildirproc/att.rc
@@ -46,7 +46,7 @@ def bogofilter_spam(mail):
 
 def handle_incoming_spam_training(mail):
 	bogofilter_spam(mail)
-	mail.move(".Bulk Mail")
+	mail.move("FOLDERS.Spam")
 
 def handle_incoming_ham_training(mail):
 	bogofilter_ham(mail)
@@ -55,10 +55,26 @@ def handle_incoming_ham_training(mail):
 def handle_incoming_ham(mail):
 	my_filters(mail)
 def handle_incoming_spam(mail):
-	mail.move(".Bulk Mail")
+	mail.move("FOLDERS.Spam")
 
 def handle_incoming_unknown(mail):
 	# Filter spam
+
+	if (
+		False
+		or mail["Subject"].contains("[systemd-devel]")
+		or mail["Subject"].contains("[PATCH")
+		or mail["Subject"].contains("[Dev]")
+		or mail["Subject"].contains("[Maintenance]")
+		or is_to_or_from(mail, "gnu.org")
+		or is_to_or_from(mail, "fsf.org")
+		or mail["From"].contains("@parabola.nu")
+		or mail["From"].contains("parabolagnulinux.org")
+		or mail["From"].contains("@facebookmail.com>")
+		or mail["List-Id"].matches(".*\.(gnu|archlinux|parabolagnulinuxlibre)\.org")
+		):
+		handle_incoming_ham_training(mail)
+		return
 	
 	spam = bogofilter_auto(mail)
 	if spam == 0:
@@ -68,10 +84,10 @@ def handle_incoming_unknown(mail):
 		handle_incoming_ham(mail)
 		return
 	elif spam == 2:
-		# maybe spam
+		mail.move("Inbox")
 		return
 	else:
-		mail.move(".Error")
+		mail.move("FOLDERS.Error")
 		return
 
 def my_filters(mail):
@@ -82,7 +98,7 @@ def my_filters(mail):
 			or mail["List-Id"].matches(list+"\.gnu\.org")
 			or mail["Subject"].contains('['+list+']')
 			):
-			mail.move(".software."+list)
+			mail.move("FOLDERS.software."+list)
 			return
 	
 	# Sort mail from other software mailing lists
@@ -91,36 +107,36 @@ def my_filters(mail):
 		or mail["List-Id"].matches("social-discuss\.gnu\.org")
 		or mail["Subject"].contains("social-discuss")
 		):			
-		mail.move(".software.social")
+		mail.move("FOLDERS.software.social")
 		return
 
 	if mail["List-Id"].matches("networkmanager-list\.gnome\.org"):
-		mail.move(".software.networkmanager")
+		mail.move("FOLDERS.software.networkmanager")
 		return
 
 	if mail["List-Id"].matches("maintenance.lists.parabolagnulinux.org"):
 		if mail["From"].contains("monit@"):
 			if mail["Message-Id"].contains("@repo.parabolagnulinux.org"):
 				if mail["Subject"].matches("^\[Maintenance\] monit alert --  (Execution|Connection) (succeeded|failed) sshd$"):
-					mail.move(".software.parabola-maintenance.monit-repo.sshd")
+					mail.move("FOLDERS.software.parabola-maintenance.monit-repo.sshd")
 					return
-				mail.move(".software.parabola-maintenance.monit-repo")
+				mail.move("FOLDERS.software.parabola-maintenance.monit-repo")
 				return
 			if mail["Message-Id"].contains("@rshg054.dnsready.net"):
-				mail.move(".software.parabola-maintenance.monit-rshg054")
+				mail.move("FOLDERS.software.parabola-maintenance.monit-rshg054")
 				return
 		if mail["Subject"].matches("Cron <.*@repo>"):
-			mail.move(".software.parabola-maintenance.cron-repo")
+			mail.move("FOLDERS.software.parabola-maintenance.cron-repo")
 			return
 		if mail["Subject"].matches("Cron <.*@rshg054>"):
-			mail.move(".software.parabola-maintenance.cron-rshg054")
+			mail.move("FOLDERS.software.parabola-maintenance.cron-rshg054")
 			return
-		mail.move(".software.parabola-maintenance")
+		mail.move("FOLDERS.software.parabola-maintenance")
 		return
 
-	if is_to_or_from(mail, "parabola.nu"):
-		mail.move(".software.parabola-labs")
-		return
+	#if is_to_or_from(mail, "parabola.nu"):
+	#	mail.move("FOLDERS.software.parabola-labs")
+	#	return
 
 	if (
 		False
@@ -129,29 +145,29 @@ def my_filters(mail):
 		or is_to_or_from(mail,     "kiwwwi.com.ar")
 		):
 		if mail["Subject"].contains("[Django]"):
-			mail.move(".software.parabola-maintenance.django")
+			mail.move("FOLDERS.software.parabola-maintenance.django")
 			return
-		mail.move(".software.parabola-dev")
+		mail.move("FOLDERS.software.parabola-dev")
 		return
 
 	if (mail["List-Id"].matches("pacman-dev.archlinux.org")):
-		mail.move(".software.pacman-dev")
+		mail.move("FOLDERS.software.pacman-dev")
 		return
 
-	if (mail["List-Id"].matches("systemd-devel.lists.freedesktop.org")):
-		mail.move(".software.systemd-devel")
+	if (mail["List-Id"].matches("systemd-devel.lists.freedesktop.org") or is_to_or_from(mail, "systemd-devel@lists.freedesktop.org")):
+		mail.move("FOLDERS.software.systemd-devel")
 		return
 
 	for subject_re in [
 		"\[Stow-[^\]]*\].*",
 		]:
 		if mail["Subject"].matches(subject_re):
-			mail.move(".software")
+			mail.move("FOLDERS.software")
 			return
 	
 	# Sort mail from some social websites
 	if mail["From"].matches("facebook(|mail)\.com"):
-		mail.move(".Social.Facebook")
+		mail.move("FOLDERS.Social.Facebook")
 		return
 	
 	if (
@@ -159,15 +175,15 @@ def my_filters(mail):
 		or mail["From"].matches("identi\.ca")
 		or mail["From"].matches("statusnet")
 		):
-		mail.move(".Social.Identica")
+		mail.move("FOLDERS.Social.Identica")
 		return
 	
 	if mail["From"].matches("twitter\.com"):
-		mail.move(".Social.Twitter")
+		mail.move("FOLDERS.Social.Twitter")
 		return
 	
 	if mail["From"].matches("@xkcd\.com"):
-		mail.move(".Social.xkcd")
+		mail.move("FOLDERS.Social.xkcd")
 		return
 	
 	# Sort mail related to Troop 276
@@ -191,12 +207,12 @@ def my_filters(mail):
 		or is_to_or_from(mail,"mytroop.us")
 		or is_to_or_from(mail,"crossroadsbsa.org")
 		):
-		mail.move(".Troop276")
+		mail.move("FOLDERS.BoyScouts")
 		return
 
 	# Sort mail from misc people
 	if mail["From"].matches("margieshu@sbcglobal\.net"):
-		mail.move(".misc.Mom")
+		mail.move("FOLDERS.misc.Mom")
 		return
 
 	for address in [
@@ -206,7 +222,7 @@ def my_filters(mail):
 		"jadparso@umail.iu.edu",
 		]:
 		if is_to_or_from(mail,address):
-			mail.move(".misc.Jade")
+			mail.move("FOLDERS.misc.Jade")
 			return
 
 	for address in [
@@ -214,7 +230,7 @@ def my_filters(mail):
 		"nintendo-news.com",
 		]:
 		if mail["From"].contains(address):
-			mail.move(".misc.Nintendo")
+			mail.move("FOLDERS.misc.Nintendo")
 			return
 
 	for address in [
@@ -223,7 +239,7 @@ def my_filters(mail):
 		"CompTIA",
 		]:
 		if mail["From"].contains(address):
-			mail.move(".misc.CompTIA")
+			mail.move("FOLDERS.misc.CompTIA")
 			return
 	
 	# Sort mail from FRC people
@@ -248,7 +264,7 @@ def my_filters(mail):
 		"william.walk@gmail.com",
 		]:
 		if is_to_or_from(mail,address):
-			mail.move(".School.Robotics")
+			mail.move("FOLDERS.School.Robotics")
 			return
 	for subject_re in [
 		"robotics",
@@ -256,7 +272,7 @@ def my_filters(mail):
 		"kil-?a-?bytes",
 		]:
 		if mail["Subject"].matches(subject_re):
-			mail.move(".School.Robotics")
+			mail.move("FOLDERS.School.Robotics")
 			return
 
 	# Sort mail from software people
@@ -278,7 +294,7 @@ def my_filters(mail):
 		"trustees@core3.amsl.com",
 		]:
 		if is_to_or_from(mail,address):
-			mail.move(".software")
+			mail.move("FOLDERS.software")
 			return
 
 
@@ -288,16 +304,16 @@ def my_filters(mail):
 		or is_to_or_from(mail, "@lnnorthstar.org")
 		or is_to_or_from(mail, "lnnorthstar.org@tigertech.net")
 		):
-		mail.move(".School.Newspaper")
+		mail.move("FOLDERS.School.Newspaper")
 		return
 
 	# Sort mail from various employers/people who pay me
 	if is_to_or_from(mail, "@precisepath.com"):
-		mail.move(".Work.PrecisePath")
+		mail.move("FOLDERS.Work.PrecisePath")
 		return
 
 	if is_to_or_from(mail,"susyphil@aol.com"):
-		mail.move(".Work.PMCH")
+		mail.move("FOLDERS.Work.PMCH")
 
 	for address in [
 		"d.farrar@comcast.net",
@@ -305,7 +321,7 @@ def my_filters(mail):
 		"@vmware.com",
 		]:
 		if is_to_or_from(mail,address):
-			mail.move(".Work.FAST")
+			mail.move("FOLDERS.Work.FAST")
 			return
 
 	# Sort misc newsletters
@@ -319,12 +335,13 @@ def my_filters(mail):
 		or mail["From"].contains("info@demandprogress.org")
 		or (mail["From"].contains("@sparkfun.com") and mail["Message-Id"].contains("rsgsv.net"))
 		):
-		mail.move(".misc.Newsletters")
+		mail.move("FOLDERS.misc.Newsletters")
 		return
 
 	if (
 		False
 		or mail["From"].contains("@msdlt.k12.in.us")
+		or mail["From"].contains("ltschoolfoundation@gmail.com")
 		or mail["From"].contains("naviance.com")
 		or is_to_or_from(mail,"ibwhite@comcast.net")
 		or mail["Subject"].contains("IOA")
@@ -334,7 +351,7 @@ def my_filters(mail):
 		or mail["Subject"].contains("NHS")
 		or mail["Subject"].contains("National Honor Society")
 		):
-		mail.move(".School")
+		mail.move("FOLDERS.School")
 		return
 	
 	# from college stuff
@@ -343,7 +360,7 @@ def my_filters(mail):
 		or mail["Subject"].contains("NYLF") # National Youth Leadership Conference
 		or mail["Subject"].contains("NSHSS")
 		):
-		mail.move(".College.Societies")
+		mail.move("FOLDERS.College.Societies")
 		return	
 	if (
 		False
@@ -356,11 +373,11 @@ def my_filters(mail):
 		or mail["From"].contains("@dreamitdoitindiana.com")
 		or mail["From"].contains("@indianatechinfo.org")
 		):
-		mail.move(".College")
+		mail.move("FOLDERS.College")
 		return
 	
 	if mail["From"].contains("@projectwonderful.com"):
-		mail.move(".ProjectWonderful")
+		mail.move("FOLDERS.misc.ProjectWonderful")
 		return
 
 	if (
@@ -370,23 +387,23 @@ def my_filters(mail):
 		or mail["From"].matches("@[^,>]*\.lukeshu\.ath\.cx")
 		or mail["To"].matches("luke@")
 		):
-		mail.move(".LocalSystems")
+		mail.move("FOLDERS.LocalSystems")
 		return
 	if (
 		False
 		or mail["Subject"].contains("password")
 		or mail["Subject"].contains("account")
 		):
-		mail.move(".misc.accounts")
+		mail.move("FOLDERS.misc.accounts")
 		return
 
-	mail.move(".Ham")
+	mail.move("FOLDERS.Ham")
 
 handle_mapping = {
-	".":              handle_incoming_unknown,
-	".spam-training": handle_incoming_spam_training,
-	".ham-training":  handle_incoming_ham_training,
-	#".Ham":           handle_incoming_ham,
+	"Inbox":                 handle_incoming_unknown,
+	"Bulk Mail":             handle_incoming_unknown,
+	"FOLDERS.Spam.training": handle_incoming_spam_training,
+	"FOLDERS.Ham.training":  handle_incoming_ham_training,
 	}
 processor.maildirs = handle_mapping.keys()
 for mail in processor: