From 53ef91d3f438582f2473fc54eac58c746760a971 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Mon, 5 Sep 2011 16:27:01 -0500
Subject: [PATCH 1/1] Adding some consistency and fixing some bugs

---
 dialcentral/alarm_handler.py |   33 +++++++++++++++++++++++++++++----
 dialcentral/alarm_notify.py  |    6 +++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/dialcentral/alarm_handler.py b/dialcentral/alarm_handler.py
index 31c0361..ce19e58 100644
--- a/dialcentral/alarm_handler.py
+++ b/dialcentral/alarm_handler.py
@@ -106,6 +106,10 @@ class _FremantleAlarmHandler(object):
 		self._alarmCookie = self._INVALID_COOKIE
 		self._launcher = self._LAUNCHER
 
+	@property
+	def alarmCookie(self):
+		return self._alarmCookie
+
 	def load_settings(self, config, sectionName):
 		try:
 			self._recurrence = config.getint(sectionName, "recurrence")
@@ -191,6 +195,10 @@ class _DiabloAlarmHandler(object):
 		self._alarmCookie = self._INVALID_COOKIE
 		self._launcher = self._LAUNCHER
 
+	@property
+	def alarmCookie(self):
+		return self._alarmCookie
+
 	def load_settings(self, config, sectionName):
 		try:
 			self._recurrence = config.getint(sectionName, "recurrence")
@@ -276,6 +284,10 @@ class _ApplicationAlarmHandler(object):
 		self._timer.setSingleShot(False)
 		self._timer.setInterval(5 * self._MIN_TO_MS_FACTORY)
 
+	@property
+	def alarmCookie(self):
+		return 0
+
 	def load_settings(self, config, sectionName):
 		try:
 			self._timer.setInterval(config.getint(sectionName, "recurrence") * self._MIN_TO_MS_FACTORY)
@@ -314,6 +326,10 @@ class _NoneAlarmHandler(object):
 		self._enabled = False
 		self._recurrence = 5
 
+	@property
+	def alarmCookie(self):
+		return 0
+
 	def load_settings(self, config, sectionName):
 		try:
 			self._recurrence = config.getint(sectionName, "recurrence")
@@ -415,12 +431,16 @@ class AlarmHandler(object):
 	def isEnabled(self):
 		return self._currentAlarmType != self.ALARM_NONE
 
+	@property
+	def alarmCookie(self):
+		return self._alarms[self._currentAlarmType].alarmCookie
+
 	def _init_alarm(self, t):
 		if t not in self._alarms and self.ALARM_FACTORY[t] is not None:
 			self._alarms[t] = self.ALARM_FACTORY[t]()
 
 
-def main():
+def run():
 	logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
 	logging.basicConfig(level=logging.DEBUG, format=logFormat)
 	from dialcentral import constants
@@ -445,14 +465,19 @@ def main():
 
 	if commandOptions.display:
 		print "Alarm (%s) is %s for every %d minutes" % (
-			alarmHandler._alarmCookie,
+			alarmHandler.alarmCookie,
 			"enabled" if alarmHandler.isEnabled else "disabled",
 			alarmHandler.recurrence,
 		)
 	else:
 		isEnabled = commandOptions.enabled
 		recurrence = commandOptions.recurrence
-		alarmHandler.apply_settings(AlarmHandler.ALARM_BACKGROUND if isEnabled else AlarmHandler.ALARM_NONE, recurrence)
+
+		if alarmHandler.backgroundNotificationsSupported:
+			enableType = AlarmHandler.ALARM_BACKGROUND
+		else:
+			enableType = AlarmHandler.ALARM_APPLICATION
+		alarmHandler.apply_settings(enableType if isEnabled else AlarmHandler.ALARM_NONE, recurrence)
 
 		alarmHandler.save_settings(config, "alarm")
 		with open(settingsPath, "wb") as configFile:
@@ -460,4 +485,4 @@ def main():
 
 
 if __name__ == "__main__":
-	main()
+	run()
diff --git a/dialcentral/alarm_notify.py b/dialcentral/alarm_notify.py
index 548fd47..084127c 100755
--- a/dialcentral/alarm_notify.py
+++ b/dialcentral/alarm_notify.py
@@ -170,7 +170,7 @@ def notify_on_change():
 		logging.info("No Change")
 
 
-if __name__ == "__main__":
+def run():
 	notifierPath = os.path.join(CACHE_PATH, "notifier.log")
 
 	logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
@@ -188,3 +188,7 @@ if __name__ == "__main__":
 	except:
 		logging.exception("Error")
 		raise
+
+
+if __name__ == "__main__":
+	run()
-- 
1.7.9.5