class _DraftContact(object):
- def __init__(self, title, description, numbersWithDescriptions):
+ def __init__(self, messageId, title, description, numbersWithDescriptions):
+ self.messageId = messageId
self.title = title
self.description = description
self.numbers = numbersWithDescriptions
message = property(_get_message, _set_message)
- def add_contact(self, contactId, title, description, numbersWithDescriptions):
+ def add_contact(self, contactId, messageId, title, description, numbersWithDescriptions):
if self._busyReason is not None:
raise RuntimeError("Please wait for %r" % self._busyReason)
# Allow overwriting of contacts so that the message can be updated and the SMS dialog popped back up
- contactDetails = _DraftContact(title, description, numbersWithDescriptions)
+ contactDetails = _DraftContact(messageId, title, description, numbersWithDescriptions)
self._contacts[contactId] = contactDetails
self.recipientsChanged.emit()
def get_num_contacts(self):
return len(self._contacts)
+ def get_message_id(self, cid):
+ return self._contacts[cid].messageId
+
def get_title(self, cid):
return self._contacts[cid].title
loggedIn = QtCore.pyqtSignal()
callbackNumberChanged = QtCore.pyqtSignal(str)
- contactsUpdated = QtCore.pyqtSignal()
+ accountUpdated = QtCore.pyqtSignal()
messagesUpdated = QtCore.pyqtSignal()
+ newMessages = QtCore.pyqtSignal()
historyUpdated = QtCore.pyqtSignal()
dndStateChange = QtCore.pyqtSignal(bool)
+ voicemailAvailable = QtCore.pyqtSignal(str, str)
error = QtCore.pyqtSignal(str)
LOGGINGIN_STATE = "logging in"
LOGGEDIN_STATE = "logged in"
- _OLDEST_COMPATIBLE_FORMAT_VERSION = misc_utils.parse_version("1.1.90")
+ MESSAGE_TEXTS = "Text"
+ MESSAGE_VOICEMAILS = "Voicemail"
+ MESSAGE_ALL = "All"
+
+ _OLDEST_COMPATIBLE_FORMAT_VERSION = misc_utils.parse_version("1.3.0")
_LOGGEDOUT_TIME = -1
_LOGGINGIN_TIME = 0
self._loggedInTime = self._LOGGEDOUT_TIME
self._loginOps = []
self._cachePath = cachePath
+ self._voicemailCachePath = None
self._username = None
self._draft = Draft(self._pool, self._backend, self._errorLog)
self._contacts = {}
- self._contactUpdateTime = datetime.datetime(1971, 1, 1)
+ self._accountUpdateTime = datetime.datetime(1971, 1, 1)
self._messages = []
+ self._cleanMessages = []
self._messageUpdateTime = datetime.datetime(1971, 1, 1)
self._history = []
self._historyUpdateTime = datetime.datetime(1971, 1, 1)
self._loggedInTime = self._LOGGEDOUT_TIME
self._backend[0].persist()
self._save_to_cache()
+ self._clear_voicemail_cache()
self.stateChange.emit(self.LOGGEDOUT_STATE)
self.loggedOut.emit()
self.stateChange.emit(self.LOGGEDOUT_STATE)
self.loggedOut.emit()
- def update_contacts(self, force = True):
+ def update_account(self, force = True):
if not force and self._contacts:
return
- le = concurrent.AsyncLinearExecution(self._pool, self._update_contacts)
+ le = concurrent.AsyncLinearExecution(self._pool, self._update_account), (), {}
self._perform_op_while_loggedin(le)
def get_contacts(self):
return self._contacts
def get_when_contacts_updated(self):
- return self._contactUpdateTime
+ return self._accountUpdateTime
- def update_messages(self, force = True):
+ def update_messages(self, messageType, force = True):
if not force and self._messages:
return
- le = concurrent.AsyncLinearExecution(self._pool, self._update_messages)
+ le = concurrent.AsyncLinearExecution(self._pool, self._update_messages), (messageType, ), {}
self._perform_op_while_loggedin(le)
def get_messages(self):
def update_history(self, force = True):
if not force and self._history:
return
- le = concurrent.AsyncLinearExecution(self._pool, self._update_history)
+ le = concurrent.AsyncLinearExecution(self._pool, self._update_history), (), {}
self._perform_op_while_loggedin(le)
def get_history(self):
return self._historyUpdateTime
def update_dnd(self):
- le = concurrent.AsyncLinearExecution(self._pool, self._update_dnd)
+ le = concurrent.AsyncLinearExecution(self._pool, self._update_dnd), (), {}
self._perform_op_while_loggedin(le)
def set_dnd(self, dnd):
le = concurrent.AsyncLinearExecution(self._pool, self._set_dnd)
le.start(dnd)
+ def is_available(self, messageId):
+ actualPath = os.path.join(self._voicemailCachePath, "%s.mp3" % messageId)
+ return os.path.exists(actualPath)
+
+ def voicemail_path(self, messageId):
+ actualPath = os.path.join(self._voicemailCachePath, "%s.mp3" % messageId)
+ if not os.path.exists(actualPath):
+ raise RuntimeError("Voicemail not available")
+ return actualPath
+
+ def download_voicemail(self, messageId):
+ le = concurrent.AsyncLinearExecution(self._pool, self._download_voicemail)
+ le.start(messageId)
+
def _set_dnd(self, dnd):
oldDnd = self._dnd
try:
self._loggedInTime = self._LOGGINGIN_TIME
self.stateChange.emit(self.LOGGINGIN_STATE)
finalState = self.LOGGEDOUT_STATE
- isLoggedIn = False
+ accountData = None
try:
- if not isLoggedIn and self._backend[0].is_quick_login_possible():
- isLoggedIn = yield (
- self._backend[0].is_authed,
+ if accountData is None and self._backend[0].is_quick_login_possible():
+ accountData = yield (
+ self._backend[0].refresh_account_info,
(),
{},
)
- if isLoggedIn:
+ if accountData is not None:
_moduleLogger.info("Logged in through cookies")
else:
# Force a clearing of the cookies
{},
)
- if not isLoggedIn:
- isLoggedIn = yield (
+ if accountData is None:
+ accountData = yield (
self._backend[0].login,
(username, password),
{},
)
- if isLoggedIn:
+ if accountData is not None:
_moduleLogger.info("Logged in through credentials")
- if isLoggedIn:
+ if accountData is not None:
self._loggedInTime = int(time.time())
oldUsername = self._username
self._username = username
else:
needOps = True
+ self._voicemailCachePath = os.path.join(self._cachePath, "%s.voicemail.cache" % self._username)
+ try:
+ os.makedirs(self._voicemailCachePath)
+ except OSError, e:
+ if e.errno != 17:
+ raise
+
self.loggedIn.emit()
self.stateChange.emit(finalState)
finalState = None # Mark it as already set
+ self._process_account_data(accountData)
if needOps:
loginOps = self._loginOps[:]
else:
loginOps = []
del self._loginOps[:]
- for asyncOp in loginOps:
- asyncOp.start()
+ for asyncOp, args, kwds in loginOps:
+ asyncOp.start(*args, **kwds)
else:
self._loggedInTime = self._LOGGEDOUT_TIME
self.error.emit("Error logging in")
except Exception, e:
+ _moduleLogger.exception("Booh")
self._loggedInTime = self._LOGGEDOUT_TIME
_moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
finally:
if finalState is not None:
self.stateChange.emit(finalState)
- if isLoggedIn and self._callback:
+ if accountData is not None and self._callback:
self.set_callback_number(self._callback)
def _load(self):
- updateContacts = len(self._contacts) != 0
updateMessages = len(self._messages) != 0
updateHistory = len(self._history) != 0
oldDnd = self._dnd
oldCallback = self._callback
- self._contacts = {}
self._messages = []
+ self._cleanMessages = []
self._history = []
self._dnd = False
self._callback = ""
loadedFromCache = self._load_from_cache()
if loadedFromCache:
- updateContacts = True
updateMessages = True
updateHistory = True
- if updateContacts:
- self.contactsUpdated.emit()
if updateMessages:
self.messagesUpdated.emit()
if updateHistory:
try:
with open(cachePath, "rb") as f:
dumpedData = pickle.load(f)
- except (pickle.PickleError, IOError, EOFError, ValueError):
+ except (pickle.PickleError, IOError, EOFError, ValueError, ImportError):
_moduleLogger.exception("Pickle fun loading")
return False
except:
return False
try:
- (
- version, build,
- contacts, contactUpdateTime,
- messages, messageUpdateTime,
- history, historyUpdateTime,
- dnd, callback
- ) = dumpedData
+ version, build = dumpedData[0:2]
except ValueError:
_moduleLogger.exception("Upgrade/downgrade fun")
return False
except:
_moduleLogger.exception("Weirdlings")
+ return False
if misc_utils.compare_versions(
self._OLDEST_COMPATIBLE_FORMAT_VERSION,
misc_utils.parse_version(version),
) <= 0:
+ try:
+ (
+ version, build,
+ messages, messageUpdateTime,
+ history, historyUpdateTime,
+ dnd, callback
+ ) = dumpedData
+ except ValueError:
+ _moduleLogger.exception("Upgrade/downgrade fun")
+ return False
+ except:
+ _moduleLogger.exception("Weirdlings")
+ return False
+
_moduleLogger.info("Loaded cache")
- self._contacts = contacts
- self._contactUpdateTime = contactUpdateTime
self._messages = messages
+ self._alert_on_messages(self._messages)
self._messageUpdateTime = messageUpdateTime
self._history = history
self._historyUpdateTime = historyUpdateTime
try:
dataToDump = (
constants.__version__, constants.__build__,
- self._contacts, self._contactUpdateTime,
self._messages, self._messageUpdateTime,
self._history, self._historyUpdateTime,
self._dnd, self._callback
_moduleLogger.exception("While saving")
def _clear_cache(self):
- updateContacts = len(self._contacts) != 0
updateMessages = len(self._messages) != 0
updateHistory = len(self._history) != 0
oldDnd = self._dnd
oldCallback = self._callback
- self._contacts = {}
- self._contactUpdateTime = datetime.datetime(1971, 1, 1)
self._messages = []
self._messageUpdateTime = datetime.datetime(1971, 1, 1)
self._history = []
self._dnd = False
self._callback = ""
- if updateContacts:
- self.contactsUpdated.emit()
if updateMessages:
self.messagesUpdated.emit()
if updateHistory:
self.callbackNumberChanged.emit(self._callback)
self._save_to_cache()
+ self._clear_voicemail_cache()
+
+ def _clear_voicemail_cache(self):
+ import shutil
+ shutil.rmtree(self._voicemailCachePath, True)
- def _update_contacts(self):
+ def _update_account(self):
try:
- assert self.state == self.LOGGEDIN_STATE, "Contacts requires being logged in (currently %s" % self.state
- with qui_utils.notify_busy(self._errorLog, "Updating Contacts"):
- self._contacts = yield (
- self._backend[0].get_contacts,
+ assert self.state == self.LOGGEDIN_STATE, "Contacts requires being logged in (currently %s)" % self.state
+ with qui_utils.notify_busy(self._errorLog, "Updating Account"):
+ accountData = yield (
+ self._backend[0].refresh_account_info,
(),
{},
)
_moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
return
- self._contactUpdateTime = datetime.datetime.now()
- self.contactsUpdated.emit()
+ self._process_account_data(accountData)
- def _update_messages(self):
+ def _update_messages(self, messageType):
try:
assert self.state == self.LOGGEDIN_STATE, "Messages requires being logged in (currently %s" % self.state
- with qui_utils.notify_busy(self._errorLog, "Updating Messages"):
+ with qui_utils.notify_busy(self._errorLog, "Updating %s Messages" % messageType):
self._messages = yield (
self._backend[0].get_messages,
- (),
+ (messageType, ),
{},
)
except Exception, e:
return
self._messageUpdateTime = datetime.datetime.now()
self.messagesUpdated.emit()
+ self._alert_on_messages(self._messages)
def _update_history(self):
try:
if oldDnd != self._dnd:
self.dndStateChange(self._dnd)
+ def _download_voicemail(self, messageId):
+ actualPath = os.path.join(self._voicemailCachePath, "%s.mp3" % messageId)
+ targetPath = "%s.%s.part" % (actualPath, time.time())
+ if os.path.exists(actualPath):
+ self.voicemailAvailable.emit(messageId, actualPath)
+ return
+ with qui_utils.notify_busy(self._errorLog, "Downloading Voicemail"):
+ try:
+ yield (
+ self._backend[0].download,
+ (messageId, targetPath),
+ {},
+ )
+ except Exception, e:
+ self.error.emit(str(e))
+ return
+
+ if os.path.exists(actualPath):
+ try:
+ os.remove(targetPath)
+ except:
+ _moduleLogger.exception("Ignoring file problems with cache")
+ self.voicemailAvailable.emit(messageId, actualPath)
+ return
+ else:
+ os.rename(targetPath, actualPath)
+ self.voicemailAvailable.emit(messageId, actualPath)
+
def _perform_op_while_loggedin(self, op):
if self.state == self.LOGGEDIN_STATE:
- op.start()
+ op, args, kwds = op
+ op.start(*args, **kwds)
else:
self._push_login_op(op)
_moduleLogger.info("Skipping queueing duplicate op: %r" % asyncOp)
return
self._loginOps.append(asyncOp)
+
+ def _process_account_data(self, accountData):
+ self._contacts = dict(
+ (contactId, contactDetails)
+ for contactId, contactDetails in accountData["contacts"].iteritems()
+ # A zero contact id is the catch all for unknown contacts
+ if contactId != "0"
+ )
+
+ self._accountUpdateTime = datetime.datetime.now()
+ self.accountUpdated.emit()
+
+ def _alert_on_messages(self, messages):
+ cleanNewMessages = list(self._clean_messages(messages))
+ cleanNewMessages.sort(key=lambda m: m["contactId"])
+ if self._cleanMessages:
+ if self._cleanMessages != cleanNewMessages:
+ self.newMessages.emit()
+ self._cleanMessages = cleanNewMessages
+
+ def _clean_messages(self, messages):
+ for message in messages:
+ cleaned = dict(
+ kv
+ for kv in message.iteritems()
+ if kv[0] not in
+ [
+ "relTime",
+ "time",
+ "isArchived",
+ "isRead",
+ "isSpam",
+ "isTrash",
+ ]
+ )
+
+ # Don't let outbound messages cause alerts, especially if the package has only outbound
+ cleaned["messageParts"] = [
+ tuple(part[0:-1]) for part in cleaned["messageParts"] if part[0] != "Me:"
+ ]
+ if not cleaned["messageParts"]:
+ continue
+
+ yield cleaned
projects / gc-dialer / blobdiff