X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsession.py;h=a50245ab5335aa17f29feb211ec2f68e1b0babfa;hb=51fac4abe1d256a58d3d62e41dc631eb58795d2b;hp=f867f0dd5911e46de5edcf2c69a3beebad4e6b85;hpb=c933cdb26b071bb6c7b5a2833eae73df35c4fe69;p=gc-dialer diff --git a/src/session.py b/src/session.py index f867f0d..a50245a 100644 --- a/src/session.py +++ b/src/session.py @@ -15,6 +15,7 @@ except ImportError: from PyQt4 import QtCore from util import qore_utils +from util import qui_utils from util import concurrent from util import misc as misc_utils @@ -24,15 +25,6 @@ import constants _moduleLogger = logging.getLogger(__name__) -@contextlib.contextmanager -def notify_busy(log, message): - log.push_busy(message) - try: - yield - finally: - log.pop(message) - - class _DraftContact(object): def __init__(self, title, description, numbersWithDescriptions): @@ -61,15 +53,18 @@ class Draft(QtCore.QObject): self._pool = pool self._backend = backend self._busyReason = None + self._message = "" - def send(self, text): + def send(self): assert 0 < len(self._contacts), "No contacts selected" + assert 0 < len(self._message), "No message to send" numbers = [misc_utils.make_ugly(contact.selectedNumber) for contact in self._contacts.itervalues()] le = concurrent.AsyncLinearExecution(self._pool, self._send) - le.start(numbers, text) + le.start(numbers, self._message) def call(self): assert len(self._contacts) == 1, "Must select 1 and only 1 contact" + assert len(self._message) == 0, "Cannot send message with call" (contact, ) = self._contacts.itervalues() number = misc_utils.make_ugly(contact.selectedNumber) le = concurrent.AsyncLinearExecution(self._pool, self._call) @@ -79,6 +74,14 @@ class Draft(QtCore.QObject): le = concurrent.AsyncLinearExecution(self._pool, self._cancel) le.start() + def _get_message(self): + return self._message + + def _set_message(self, message): + self._message = message + + message = property(_get_message, _set_message) + def add_contact(self, contactId, title, description, numbersWithDescriptions): if self._busyReason is not None: raise RuntimeError("Please wait for %r" % self._busyReason) @@ -130,6 +133,7 @@ class Draft(QtCore.QObject): def _clear(self): oldContacts = self._contacts self._contacts = {} + self._message = "" if oldContacts: self.recipientsChanged.emit() @@ -147,7 +151,7 @@ class Draft(QtCore.QObject): self.sendingMessage.emit() try: with self._busy("Sending Text"): - with notify_busy(self._errorLog, "Sending Text"): + with qui_utils.notify_busy(self._errorLog, "Sending Text"): yield ( self._backend[0].send_sms, (numbers, text), @@ -156,13 +160,14 @@ class Draft(QtCore.QObject): self.sentMessage.emit() self._clear() except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) def _call(self, number): self.calling.emit() try: with self._busy("Calling"): - with notify_busy(self._errorLog, "Calling"): + with qui_utils.notify_busy(self._errorLog, "Calling"): yield ( self._backend[0].call, (number, ), @@ -171,12 +176,13 @@ class Draft(QtCore.QObject): self.called.emit() self._clear() except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) def _cancel(self): self.cancelling.emit() try: - with notify_busy(self._errorLog, "Cancelling"): + with qui_utils.notify_busy(self._errorLog, "Cancelling"): yield ( self._backend[0].cancel, (), @@ -184,6 +190,7 @@ class Draft(QtCore.QObject): ) self.cancelled.emit() except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) @@ -262,10 +269,13 @@ class Session(QtCore.QObject): def logout(self): assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in (currently %s" % self.state + _moduleLogger.info("Logging out") self._pool.stop() self._loggedInTime = self._LOGGEDOUT_TIME self._backend[0].persist() self._save_to_cache() + self.stateChange.emit(self.LOGGEDOUT_STATE) + self.loggedOut.emit() def clear(self): assert self.state == self.LOGGEDOUT_STATE, "Can only clear when logged out (currently %s" % self.state @@ -276,9 +286,12 @@ class Session(QtCore.QObject): def logout_and_clear(self): assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in (currently %s" % self.state + _moduleLogger.info("Logging out and clearing the account") self._pool.stop() self._loggedInTime = self._LOGGEDOUT_TIME self.clear() + self.stateChange.emit(self.LOGGEDOUT_STATE) + self.loggedOut.emit() def update_contacts(self, force = True): if not force and self._contacts: @@ -325,18 +338,17 @@ class Session(QtCore.QObject): le.start(dnd) def _set_dnd(self, dnd): - # I'm paranoid about our state geting out of sync so we set no matter - # what but act as if we have the cannonical state - assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state oldDnd = self._dnd try: - with notify_busy(self._errorLog, "Setting DND Status"): + assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state + with qui_utils.notify_busy(self._errorLog, "Setting DND Status"): yield ( self._backend[0].set_dnd, (dnd, ), {}, ) except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) return self._dnd = dnd @@ -347,10 +359,13 @@ class Session(QtCore.QObject): return self._dnd def get_account_number(self): + if self.state != self.LOGGEDIN_STATE: + return "" return self._backend[0].get_account_number() def get_callback_numbers(self): - # @todo Remove evilness (might call is_authed which can block) + if self.state != self.LOGGEDIN_STATE: + return {} return self._backend[0].get_callback_numbers() def get_callback_number(self): @@ -361,17 +376,16 @@ class Session(QtCore.QObject): le.start(callback) def _set_callback_number(self, callback): - # I'm paranoid about our state geting out of sync so we set no matter - # what but act as if we have the cannonical state - assert self.state == self.LOGGEDIN_STATE, "Callbacks configurable only when logged in (currently %s" % self.state oldCallback = self._callback try: + assert self.state == self.LOGGEDIN_STATE, "Callbacks configurable only when logged in (currently %s" % self.state yield ( self._backend[0].set_callback_number, (callback, ), {}, ) except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) return self._callback = callback @@ -379,7 +393,7 @@ class Session(QtCore.QObject): self.callbackNumberChanged.emit(self._callback) def _login(self, username, password): - with notify_busy(self._errorLog, "Logging In"): + with qui_utils.notify_busy(self._errorLog, "Logging In"): self._loggedInTime = self._LOGGINGIN_TIME self.stateChange.emit(self.LOGGINGIN_STATE) finalState = self.LOGGEDOUT_STATE @@ -421,6 +435,8 @@ class Session(QtCore.QObject): needOps = True self.loggedIn.emit() + self.stateChange.emit(finalState) + finalState = None # Mark it as already set if needOps: loginOps = self._loginOps[:] @@ -434,9 +450,11 @@ class Session(QtCore.QObject): self.error.emit("Error logging in") except Exception, e: self._loggedInTime = self._LOGGEDOUT_TIME + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) finally: - self.stateChange.emit(finalState) + if finalState is not None: + self.stateChange.emit(finalState) if isLoggedIn and self._callback: self.set_callback_number(self._callback) @@ -545,11 +563,11 @@ class Session(QtCore.QObject): oldCallback = self._callback self._contacts = {} - self._contactUpdateTime = datetime.datetime(1, 1, 1) + self._contactUpdateTime = datetime.datetime(1971, 1, 1) self._messages = [] - self._messageUpdateTime = datetime.datetime(1, 1, 1) + self._messageUpdateTime = datetime.datetime(1971, 1, 1) self._history = [] - self._historyUpdateTime = datetime.datetime(1, 1, 1) + self._historyUpdateTime = datetime.datetime(1971, 1, 1) self._dnd = False self._callback = "" @@ -568,13 +586,15 @@ class Session(QtCore.QObject): def _update_contacts(self): try: - with notify_busy(self._errorLog, "Updating Contacts"): + 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, (), {}, ) except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) return self._contactUpdateTime = datetime.datetime.now() @@ -582,13 +602,15 @@ class Session(QtCore.QObject): def _update_messages(self): try: - with notify_busy(self._errorLog, "Updating Messages"): + assert self.state == self.LOGGEDIN_STATE, "Messages requires being logged in (currently %s" % self.state + with qui_utils.notify_busy(self._errorLog, "Updating Messages"): self._messages = yield ( self._backend[0].get_messages, (), {}, ) except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) return self._messageUpdateTime = datetime.datetime.now() @@ -596,13 +618,15 @@ class Session(QtCore.QObject): def _update_history(self): try: - with notify_busy(self._errorLog, "Updating History"): + assert self.state == self.LOGGEDIN_STATE, "History requires being logged in (currently %s" % self.state + with qui_utils.notify_busy(self._errorLog, "Updating History"): self._history = yield ( self._backend[0].get_recent, (), {}, ) except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) return self._historyUpdateTime = datetime.datetime.now() @@ -611,12 +635,14 @@ class Session(QtCore.QObject): def _update_dnd(self): oldDnd = self._dnd try: + assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state self._dnd = yield ( self._backend[0].is_dnd, (), {}, ) except Exception, e: + _moduleLogger.exception("Reporting error to user") self.error.emit(str(e)) return if oldDnd != self._dnd: