X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fbackends%2Fgvoice%2Fgvoice.py;h=f73600e1bc59f76f928ddb418378500fd5d8f350;hb=0ba0b153f9787ab64daead531eb0a71d1ecfbe14;hp=3cfd53f6a3bccc5dfa4e9660bf1f41704be97bb5;hpb=21efd5652e154f7b7e0bbe91eed34bde770043f8;p=gc-dialer diff --git a/src/backends/gvoice/gvoice.py b/src/backends/gvoice/gvoice.py index 3cfd53f..f73600e 100755 --- a/src/backends/gvoice/gvoice.py +++ b/src/backends/gvoice/gvoice.py @@ -170,7 +170,6 @@ class GVoiceBackend(object): SECURE_URL_BASE = "https://www.google.com/voice/" SECURE_MOBILE_URL_BASE = SECURE_URL_BASE + "mobile/" - self._forwardURL = SECURE_MOBILE_URL_BASE + "phones" self._tokenURL = SECURE_URL_BASE + "m" self._callUrl = SECURE_URL_BASE + "call/connect" self._callCancelURL = SECURE_URL_BASE + "call/cancel" @@ -211,9 +210,6 @@ class GVoiceBackend(object): self._XML_MISSED_URL = SECURE_URL_BASE + "inbox/recent/missed/" self._galxRe = re.compile(r"""""", re.MULTILINE | re.DOTALL) - self._tokenRe = re.compile(r"""""") - self._accountNumRe = re.compile(r"""(.{14})""") - self._callbackRe = re.compile(r"""\s+(.*?):\s*(.*?)\s*$""", re.M) self._seperateVoicemailsRegex = re.compile(r"""^\s*
""", re.MULTILINE | re.DOTALL) self._exactVoicemailTimeRegex = re.compile(r"""(.*?)""", re.MULTILINE) @@ -230,32 +226,21 @@ class GVoiceBackend(object): def is_quick_login_possible(self): """ - @returns True then is_authed might be enough to login, else full login is required + @returns True then refresh_account_info might be enough to login, else full login is required """ return self._loadedFromCookies or 0.0 < self._lastAuthed - def is_authed(self, force = False): - """ - Attempts to detect a current session - @note Once logged in try not to reauth more than once a minute. - @returns If authenticated - @blocks - """ - isRecentledAuthed = (time.time() - self._lastAuthed) < 120 - isPreviouslyAuthed = self._token is not None - if isRecentledAuthed and isPreviouslyAuthed and not force: - return True - + def refresh_account_info(self): try: - page = self._get_page(self._forwardURL) - self._grab_account_info(page) + page = self._get_page(self._JSON_CONTACTS_URL) + accountData = self._grab_account_info(page) except Exception, e: _moduleLogger.exception(str(e)) - return False + return None self._browser.save_cookies() self._lastAuthed = time.time() - return True + return accountData def _get_token(self): tokenPage = self._get_page(self._tokenURL) @@ -277,7 +262,7 @@ class GVoiceBackend(object): "btmpl": "mobile", "PersistentCookie": "yes", "GALX": token, - "continue": self._forwardURL, + "continue": self._JSON_CONTACTS_URL, } loginSuccessOrFailurePage = self._get_page(self._loginURL, loginData) @@ -294,19 +279,19 @@ class GVoiceBackend(object): loginSuccessOrFailurePage = self._login(username, password, galxToken) try: - self._grab_account_info(loginSuccessOrFailurePage) + accountData = self._grab_account_info(loginSuccessOrFailurePage) except Exception, e: # Retry in case the redirect failed - # luckily is_authed does everything we need for a retry - loggedIn = self.is_authed(True) - if not loggedIn: + # luckily refresh_account_info does everything we need for a retry + accountData = self.refresh_account_info() + if accountData is None: _moduleLogger.exception(str(e)) - return False + return None _moduleLogger.info("Redirection failed on initial login attempt, auto-corrected for this") self._browser.save_cookies() self._lastAuthed = time.time() - return True + return accountData def persist(self): self._browser.save_cookies() @@ -429,20 +414,21 @@ class GVoiceBackend(object): return json - def download(self, messageId, adir): + def recording_url(self, messageId): + url = self._downloadVoicemailURL+messageId + return url + + def download(self, messageId, targetPath): """ Download a voicemail or recorded call MP3 matching the given ``msg`` which can either be a ``Message`` instance, or a SHA1 identifier. - Saves files to ``adir`` (defaults to current directory). Message hashes can be found in ``self.voicemail().messages`` for example. @returns location of saved file. @blocks """ - page = self._get_page(self._downloadVoicemailURL, {"id": messageId}) - fn = os.path.join(adir, '%s.mp3' % messageId) - with open(fn, 'wb') as fo: + page = self._get_page(self.recording_url(messageId)) + with open(targetPath, 'wb') as fo: fo.write(page) - return fn def is_valid_syntax(self, number): """ @@ -493,14 +479,6 @@ class GVoiceBackend(object): ] return self._parse_recent(recentPages) - def get_contacts(self): - """ - @returns Iterable of (contact id, contact name) - @blocks - """ - page = self._get_page(self._JSON_CONTACTS_URL) - return self._process_contacts(page) - def get_csv_contacts(self): data = { "groupToExport": "mine", @@ -578,30 +556,18 @@ class GVoiceBackend(object): return flatHtml def _grab_account_info(self, page): - tokenGroup = self._tokenRe.search(page) - if tokenGroup is None: - raise RuntimeError("Could not extract authentication token from GoogleVoice") - self._token = tokenGroup.group(1) - - anGroup = self._accountNumRe.search(page) - if anGroup is not None: - self._accountNum = anGroup.group(1) - else: - _moduleLogger.debug("Could not extract account number from GoogleVoice") - - self._callbackNumbers = {} - for match in self._callbackRe.finditer(page): - callbackNumber = match.group(2) - callbackName = match.group(1) - self._callbackNumbers[callbackNumber] = callbackName + accountData = parse_json(page) + self._token = accountData["r"] + self._accountNum = accountData["number"]["raw"] + for callback in accountData["phones"].itervalues(): + self._callbackNumbers[callback["phoneNumber"]] = callback["name"] if len(self._callbackNumbers) == 0: _moduleLogger.debug("Could not extract callback numbers from GoogleVoice (the troublesome page follows):\n%s" % page) + return accountData def _send_validation(self, number): if not self.is_valid_syntax(number): raise ValueError('Number is not valid: "%s"' % number) - elif not self.is_authed(): - raise RuntimeError("Not Authenticated") return number def _parse_recent(self, recentPages): @@ -612,13 +578,6 @@ class GVoiceBackend(object): recentCallData["action"] = action yield recentCallData - def _process_contacts(self, page): - accountData = parse_json(page) - for contactId, contactDetails in accountData["contacts"].iteritems(): - # A zero contact id is the catch all for unknown contacts - if contactId != "0": - yield contactId, contactDetails - def _parse_history(self, historyHtml): splitVoicemail = self._seperateVoicemailsRegex.split(historyHtml) for messageId, messageHtml in itergroup(splitVoicemail[1:], 2): @@ -986,7 +945,6 @@ def grab_debug_info(username, password): browser = backend._browser _TEST_WEBPAGES = [ - ("forward", backend._forwardURL), ("token", backend._tokenURL), ("login", backend._loginURL), ("isdnd", backend._isDndURL), @@ -1029,8 +987,8 @@ def grab_debug_info(username, password): 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) + # luckily refresh_account_info does everything we need for a retry + loggedIn = backend.refresh_account_info() is not None if not loggedIn: raise @@ -1056,6 +1014,21 @@ def grab_debug_info(username, password): ) +def grab_voicemails(username, password): + cookieFile = os.path.join(".", "raw_cookies.txt") + try: + os.remove(cookieFile) + except OSError: + pass + + backend = GVoiceBackend(cookieFile) + backend.login(username, password) + voicemails = list(backend.get_voicemails()) + for voicemail in voicemails: + print voicemail.id + backend.download(voicemail.id, ".") + + def main(): import sys logging.basicConfig(level=logging.DEBUG) @@ -1065,6 +1038,7 @@ def main(): password = args[2] grab_debug_info(username, password) + grab_voicemails(username, password) if __name__ == "__main__":