Adding the ignore file

[gc-dialer] / src / alarm_notify.py

diff --git a/src/alarm_notify.py b/src/alarm_notify.py
index 9cb42b8..7b7e93f 100755 (executable)
--- 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
-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):
@@ -69,17 +75,15 @@ def is_type_changed(backend, type, get_material):
        return not seemEqual
 
 
-def is_changed():
+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
 
        if not loggedIn:
                loggedIn = backend.is_authed()
 
-       config = ConfigParser.SafeConfigParser()
-       config.read(constants._user_settings_)
        if not loggedIn:
                import base64
                try:
@@ -98,6 +102,11 @@ def is_changed():
                except ConfigParser.NoSectionError, e:
                        pass
 
+       assert loggedIn
+       return backend
+
+
+def is_changed(config, backend):
        try:
                notifyOnMissed = config.getboolean("2 - Account Info", "notifyOnMissed")
                notifyOnVoicemail = config.getboolean("2 - Account Info", "notifyOnVoicemail")
@@ -110,8 +119,10 @@ def is_changed():
                notifyOnMissed = False
                notifyOnVoicemail = False
                notifyOnSms = False
+       logging.debug(
+               "Missed: %s, Voicemail: %s, SMS: %s" % (notifyOnMissed, notifyOnVoicemail, notifyOnSms)
+       )
 
-       assert loggedIn
        notifySources = []
        if notifyOnMissed:
                notifySources.append(("missed", get_missed))
@@ -128,13 +139,28 @@ def is_changed():
 
 
 def notify_on_change():
-       notifyUser = is_changed()
+       config = ConfigParser.SafeConfigParser()
+       config.read(constants._user_settings_)
+       backend = create_backend(config)
+       notifyUser = is_changed(config, backend)
 
        if notifyUser:
+               logging.info("Changed")
                import led_handler
                led = led_handler.LedHandler()
                led.on()
+       else:
+               logging.info("No Change")
 
 
 if __name__ == "__main__":
-       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