Message type selection stuff

[gc-dialer] / src / gv_backend.py

diff --git a/src/gv_backend.py b/src/gv_backend.py
index 2ecbb58..3f28b29 100644 (file)
--- a/src/gv_backend.py
+++ b/src/gv_backend.py
@@ -195,8 +195,13 @@ class GVDialer(object):
                try:
                        self._grab_account_info(loginSuccessOrFailurePage)
                except Exception, e:
-                       _moduleLogger.exception(str(e))
-                       return False
+                       # Retry in case the redirect failed
+                       # luckily is_authed does everything we need for a retry
+                       loggedIn = self.is_authed(True)
+                       if not loggedIn:
+                               _moduleLogger.exception(str(e))
+                               return False
+                       _moduleLogger.info("Redirection failed on initial login attempt, auto-corrected for this")
 
                self._browser.cookies.save()
                self._lastAuthed = time.time()
@@ -366,6 +371,16 @@ class GVDialer(object):
        _voicemailURL = "https://www.google.com/voice/inbox/recent/voicemail/"
        _smsURL = "https://www.google.com/voice/inbox/recent/sms/"
 
+       @staticmethod
+       def _merge_messages(parsedMessages, json):
+               for message in parsedMessages:
+                       id = message["id"]
+                       jsonItem = json["messages"][id]
+                       message["isRead"] = jsonItem["isRead"]
+                       message["isSpam"] = jsonItem["isSpam"]
+                       message["isTrash"] = jsonItem["isTrash"]
+                       yield message
+
        def get_messages(self):
                try:
                        voicemailPage = self._browser.download(self._voicemailURL)
@@ -373,8 +388,10 @@ class GVDialer(object):
                        _moduleLogger.exception("Translating error: %s" % str(e))
                        raise NetworkError("%s is not accesible" % self._voicemailURL)
                voicemailHtml = self._grab_html(voicemailPage)
+               voicemailJson = self._grab_json(voicemailPage)
                parsedVoicemail = self._parse_voicemail(voicemailHtml)
-               decoratedVoicemails = self._decorate_voicemail(parsedVoicemail)
+               voicemails = self._merge_messages(parsedVoicemail, voicemailJson)
+               decoratedVoicemails = self._decorate_voicemail(voicemails)
 
                try:
                        smsPage = self._browser.download(self._smsURL)
@@ -382,8 +399,10 @@ class GVDialer(object):
                        _moduleLogger.exception("Translating error: %s" % str(e))
                        raise NetworkError("%s is not accesible" % self._smsURL)
                smsHtml = self._grab_html(smsPage)
+               smsJson = self._grab_json(smsPage)
                parsedSms = self._parse_sms(smsHtml)
-               decoratedSms = self._decorate_sms(parsedSms)
+               smss = self._merge_messages(parsedSms, smsJson)
+               decoratedSms = self._decorate_sms(smss)
 
                allMessages = itertools.chain(decoratedVoicemails, decoratedSms)
                return allMessages
@@ -512,6 +531,7 @@ class GVDialer(object):
                                "number": number,
                                "location": location,
                                "messageParts": messageParts,
+                               "type": "Voicemail",
                        }
 
        def _decorate_voicemail(self, parsedVoicemails):
@@ -573,6 +593,7 @@ class GVDialer(object):
                                "number": number,
                                "location": "",
                                "messageParts": messageParts,
+                               "type": "Texts",
                        }
 
        def _decorate_sms(self, parsedTexts):
@@ -747,8 +768,14 @@ def grab_debug_info(username, password):
        with open("loggingin.txt", "w") as f:
                print "\tWriting to file"
                f.write(loginSuccessOrFailurePage)
-       backend._grab_account_info(loginSuccessOrFailurePage)
-       assert backend.is_authed()
+       try:
+               backend._grab_account_info(loginSuccessOrFailurePage)
+       except Exception:
+               # Retry in case the redirect failed
+               # luckily is_authed does everything we need for a retry
+               loggedIn = backend.is_authed(True)
+               if not loggedIn:
+                       raise
 
        # Get Pages
        print "Grabbing post-login pages"