renamed some classes

Mailnag/daemon/idlers.py

@@ -157,9 +157,9 @@ class Idler(object):
 
 
 #
-# Idlers class
+# IdlerRunner class
 #
-class Idlers:
+class IdlerRunner:
 	def __init__(self, accounts, sync_callback):
 		self._idlerlist = []
 		self._accounts = accounts

Mailnag/daemon/mails.py

@@ -46,15 +46,15 @@ class Mail:
 
 
 #
-# Mails class
+# MailCollector class
 #
-class Mails:
+class MailCollector:
 	def __init__(self, cfg, accounts):
 		self._cfg = cfg
 		self._accounts = accounts
 		
 		
-	def get_mail(self, sort_order = None):
+	def collect_mail(self, sort_order = None):
 		mail_list = []
 		mail_ids = []
 		
@@ -327,8 +327,8 @@ class MailSyncer:
 	def sync(self, accounts):
 		needs_rebuild = False
 		
-		# get mails from given accounts
-		rcv_lst = Mails(self._cfg, accounts).get_mail()
+		# collect mails from given accounts
+		rcv_lst = MailCollector(self._cfg, accounts).collect_mail()
 	
 		# group received mails by account
 		tmp = {}
@@ -365,7 +365,7 @@ class MailSyncer:
 			for acc_id in self._mails_by_account:
 				for mail_id in self._mails_by_account[acc_id]:
 					self._mail_list.append(self._mails_by_account[acc_id][mail_id])
-			self._mail_list = Mails.sort_mails(self._mail_list, 'desc')
+			self._mail_list = MailCollector.sort_mails(self._mail_list, 'desc')
 		
 		return self._mail_list
 

Mailnag/mailnag.py

@@ -35,10 +35,10 @@ from common.utils import set_procname, is_online, shutdown_existing_instance
 from common.accounts import AccountList
 from common.plugins import Plugin, HookRegistry, MailnagController
 from daemon.mailchecker import MailChecker
-from daemon.idlers import Idlers
+from daemon.idlers import IdlerRunner
 
 mainloop = None
-idlers = None
+idlrunner = None
 plugins = []
 hook_registry = HookRegistry()
 start_thread = None
@@ -93,8 +93,8 @@ def cleanup():
 		poll_thread.join()
 		print "Polling thread exited successfully"
 	
-	if idlers != None:
-		idlers.dispose()
+	if idlrunner != None:
+		idlrunner.dispose()
 
 	# Clear vars used in the MailnagController 
 	# so plugins can't perform unwanted calls to 
@@ -182,7 +182,7 @@ def main():
 
 
 def start(cfg, hookreg):
-	global poll_thread, idlers
+	global poll_thread, idlrunner
 	
 	try:
 		accounts = AccountList()
@@ -228,8 +228,8 @@ def start(cfg, hookreg):
 					traceback.print_exc()
 
 		
-			idlers = Idlers(idle_accounts, sync_func)
-			idlers.run()
+			idlrunner = IdlerRunner(idle_accounts, sync_func)
+			idlrunner.run()
 	except:
 		traceback.print_exc()
 		mainloop.quit()