Bump to 1.3.6

[gc-dialer] / src / alarm_notify.py

diff --git a/src/alarm_notify.py b/src/alarm_notify.py
index c56e2ba..bc6240e 100755 (executable)
--- a/src/alarm_notify.py
+++ b/src/alarm_notify.py
@@ -4,31 +4,55 @@ import os
 import filecmp
 import ConfigParser
 import pprint
+import logging
+import logging.handlers
 
 import constants
-import gv_backend
+from backends.gvoice import gvoice
 
 
 def get_missed(backend):
-       missedPage = backend._browser.download(backend._missedCallsURL)
-       missedJson = pprint.pformat(backend._grab_json(missedPage))
+       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)
-       voicemailJson = pprint.pformat(backend._grab_json(voicemailPage))
+       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)
-       smsJson = pprint.pformat(backend._grab_json(smsPage))
+       smsPage = backend._browser.download(backend._XML_SMS_URL)
+       smsJson = backend._grab_json(smsPage)
        return smsJson
 
 
-def is_changed(backend, type, get_material):
-       currentMaterial = get_material(backend)
+def remove_reltime(data):
+       for messageData in data["messages"].itervalues():
+               for badPart in [
+                       "relTime",
+                       "relativeStartTime",
+                       "time",
+                       "star",
+                       "isArchived",
+                       "isRead",
+                       "isSpam",
+                       "isTrash",
+                       "labels",
+               ]:
+                       if badPart in messageData:
+                               del messageData[badPart]
+       for globalBad in ["unreadCounts", "totalSize", "resultsPerPage"]:
+               if globalBad in data:
+                       del data[globalBad]
+
+
+def is_type_changed(backend, type, get_material):
+       jsonMaterial = get_material(backend)
+       unreadCount = jsonMaterial["unreadCounts"][type]
+
        previousSnapshotPath = os.path.join(constants._data_path_, "snapshot_%s.old.json" % type)
        currentSnapshotPath = os.path.join(constants._data_path_, "snapshot_%s.json" % type)
 
@@ -42,35 +66,35 @@ def is_changed(backend, type, get_material):
                os.rename(currentSnapshotPath, previousSnapshotPath)
                previousExists = True
        except OSError, e:
-               # check if failed purely because the old file didn't exist, which is fine
+               # check if failed purely because the new old file didn't exist, which is fine
                if e.errno != 2:
                        raise
                previousExists = False
 
+       remove_reltime(jsonMaterial)
+       textMaterial = pprint.pformat(jsonMaterial)
        currentSnapshot = file(currentSnapshotPath, "w")
        try:
-               currentSnapshot.write(currentMaterial)
+               currentSnapshot.write(textMaterial)
        finally:
                currentSnapshot.close()
 
-       if not previousExists:
+       if unreadCount == 0 or not previousExists:
                return False
 
        seemEqual = filecmp.cmp(previousSnapshotPath, currentSnapshotPath)
        return not seemEqual
 
 
-def notify():
+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()
+               loggedIn = backend.refresh_account_info() is not None
 
-       config = ConfigParser.SafeConfigParser()
-       config.read(constants._user_settings_)
        if not loggedIn:
                import base64
                try:
@@ -83,12 +107,17 @@ def notify():
                                for blob in blobs
                        )
                        username, password = tuple(creds)
-                       loggedIn = backend.login(username, password)
+                       loggedIn = backend.login(username, password) is not None
                except ConfigParser.NoOptionError, e:
                        pass
                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")
@@ -101,8 +130,10 @@ def notify():
                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))
@@ -113,14 +144,39 @@ def notify():
 
        notifyUser = False
        for type, get_material in notifySources:
-               if is_changed(backend, type, get_material):
+               if is_type_changed(backend, type, get_material):
                        notifyUser = True
+       return notifyUser
+
+
+def notify_on_change():
+       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()
+       logFormat = '(%(relativeCreated)5d) %(levelname)-5s %(threadName)s.%(name)s.%(funcName)s: %(message)s'
+       logging.basicConfig(level=logging.DEBUG, format=logFormat)
+       rotating = logging.handlers.RotatingFileHandler(constants._notifier_logpath_, maxBytes=512*1024, backupCount=1)
+       rotating.setFormatter(logging.Formatter(logFormat))
+       root = logging.getLogger()
+       root.addHandler(rotating)
+       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