X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=blobdiff_plain;f=src%2Falarm_notify.py;h=7b7e93f27ed2f9c4f6977cdc65041f039060c7f4;hp=4fb30bc37e43e5781989df98839862f7426c2f25;hb=0320d6d2086ce89fe554d8f902531f5b00dbec94;hpb=ae19a0ff3281405d64aa02a5098d3666d9a17b14

diff --git a/src/alarm_notify.py b/src/alarm_notify.py
index 4fb30bc..7b7e93f 100755
--- a/src/alarm_notify.py
+++ b/src/alarm_notify.py
@@ -4,25 +4,26 @@ import os
 import filecmp
 import ConfigParser
 import pprint
+import logging
 
 import constants
-from backends import gv_backend
+from backends import gvoice
 
 
 def get_missed(backend):
-	missedPage = backend._browser.download(backend._missedCallsURL)
+	missedPage = backend._browser.download(backend._XML_MISSED_URL)
 	missedJson = backend._grab_json(missedPage)
 	return missedJson
 
 
 def get_voicemail(backend):
-	voicemailPage = backend._browser.download(backend._voicemailURL)
+	voicemailPage = backend._browser.download(backend._XML_VOICEMAIL_URL)
 	voicemailJson = backend._grab_json(voicemailPage)
 	return voicemailJson
 
 
 def get_sms(backend):
-	smsPage = backend._browser.download(backend._smsURL)
+	smsPage = backend._browser.download(backend._XML_SMS_URL)
 	smsJson = backend._grab_json(smsPage)
 	return smsJson
 
@@ -30,6 +31,11 @@ def get_sms(backend):
 def remove_reltime(data):
 	for messageData in data["messages"].itervalues():
 		del messageData["relativeStartTime"]
+		del messageData["labels"]
+		del messageData["isRead"]
+		del messageData["isSpam"]
+		del messageData["isTrash"]
+		del messageData["star"]
 
 
 def is_type_changed(backend, type, get_material):
@@ -71,7 +77,7 @@ def is_type_changed(backend, type, get_material):
 
 def create_backend(config):
 	gvCookiePath = os.path.join(constants._data_path_, "gv_cookies.txt")
-	backend = gv_backend.GVDialer(gvCookiePath)
+	backend = gvoice.GVoiceBackend(gvCookiePath)
 
 	loggedIn = False
 
@@ -113,6 +119,9 @@ def is_changed(config, backend):
 		notifyOnMissed = False
 		notifyOnVoicemail = False
 		notifyOnSms = False
+	logging.debug(
+		"Missed: %s, Voicemail: %s, SMS: %s" % (notifyOnMissed, notifyOnVoicemail, notifyOnSms)
+	)
 
 	notifySources = []
 	if notifyOnMissed:
@@ -136,15 +145,22 @@ def notify_on_change():
 	notifyUser = is_changed(config, backend)
 
 	if notifyUser:
+		logging.info("Changed")
 		import led_handler
 		led = led_handler.LedHandler()
 		led.on()
-		print "Notify!"
 	else:
-		print "Nothing to report"
+		logging.info("No Change")
 
 
 if __name__ == "__main__":
-	import logging
-	logging.basicConfig(level=logging.DEBUG)
-	notify_on_change()
+	logging.basicConfig(level=logging.WARNING, filename=constants._notifier_logpath_)
+	logging.info("Notifier %s-%s" % (constants.__version__, constants.__build__))
+	logging.info("OS: %s" % (os.uname()[0], ))
+	logging.info("Kernel: %s (%s) for %s" % os.uname()[2:])
+	logging.info("Hostname: %s" % os.uname()[1])
+	try:
+		notify_on_change()
+	except:
+		logging.exception("Error")
+		raise