import os
import time
import datetime
+import contextlib
import logging
try:
_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):
recipientsChanged = QtCore.pyqtSignal()
- def __init__(self, pool, backend):
+ def __init__(self, pool, backend, errorLog):
QtCore.QObject.__init__(self)
+ self._errorLog = errorLog
self._contacts = {}
self._pool = pool
self._backend = backend
def send(self, text):
assert 0 < len(self._contacts)
- numbers = [contact.selectedNumber for contact in self._contacts.itervalues()]
+ 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()
def add_contact(self, contactId, title, description, numbersWithDescriptions):
- assert contactId not in self._contacts
+ if contactId in self._contacts:
+ _moduleLogger.info("Adding duplicate contact %r" % contactId)
+ # @todo Remove this evil hack to re-popup the dialog
+ self.recipientsChanged.emit()
+ return
contactDetails = _DraftContact(title, description, numbersWithDescriptions)
self._contacts[contactId] = contactDetails
self.recipientsChanged.emit()
def _send(self, numbers, text):
self.sendingMessage.emit()
try:
- yield (
- self._backend[0].send_sms,
- (numbers, text),
- {},
- )
+ with notify_busy(self._errorLog, "Sending Text"):
+ yield (
+ self._backend[0].send_sms,
+ (numbers, text),
+ {},
+ )
self.sentMessage.emit()
self.clear()
except Exception, e:
def _call(self, number):
self.calling.emit()
try:
- yield (
- self._backend[0].call,
- (number, ),
- {},
- )
+ with notify_busy(self._errorLog, "Calling"):
+ yield (
+ self._backend[0].call,
+ (number, ),
+ {},
+ )
self.called.emit()
self.clear()
except Exception, e:
def _cancel(self):
self.cancelling.emit()
try:
- yield (
- self._backend[0].cancel,
- (),
- {},
- )
+ with notify_busy(self._errorLog, "Cancelling"):
+ yield (
+ self._backend[0].cancel,
+ (),
+ {},
+ )
self.cancelled.emit()
except Exception, e:
self.error.emit(str(e))
class Session(QtCore.QObject):
+ # @todo Somehow add support for csv contacts
+
stateChange = QtCore.pyqtSignal(str)
loggedOut = QtCore.pyqtSignal()
loggedIn = QtCore.pyqtSignal()
LOGGINGIN_STATE = "logging in"
LOGGEDIN_STATE = "logged in"
- _OLDEST_COMPATIBLE_FORMAT_VERSION = misc_utils.parse_version("1.2.0")
+ _OLDEST_COMPATIBLE_FORMAT_VERSION = misc_utils.parse_version("1.1.90")
_LOGGEDOUT_TIME = -1
_LOGGINGIN_TIME = 0
- def __init__(self, cachePath = None):
+ def __init__(self, errorLog, cachePath = None):
QtCore.QObject.__init__(self)
+ self._errorLog = errorLog
self._pool = qore_utils.AsyncPool()
self._backend = []
self._loggedInTime = self._LOGGEDOUT_TIME
self._loginOps = []
self._cachePath = cachePath
self._username = None
- self._draft = Draft(self._pool, self._backend)
+ self._draft = Draft(self._pool, self._backend, self._errorLog)
self._contacts = {}
self._contactUpdateTime = datetime.datetime(1971, 1, 1)
self._perform_op_while_loggedin(le)
def set_dnd(self, dnd):
+ le = concurrent.AsyncLinearExecution(self._pool, self._set_dnd)
+ 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
oldDnd = self._dnd
try:
- yield (
- self._backend[0].set_dnd,
- (dnd),
- {},
- )
+ with notify_busy(self._errorLog, "Setting DND Status"):
+ yield (
+ self._backend[0].set_dnd,
+ (dnd, ),
+ {},
+ )
except Exception, e:
self.error.emit(str(e))
return
return self._callback
def set_callback_number(self, callback):
+ le = concurrent.AsyncLinearExecution(self._pool, self._set_callback_number)
+ 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
oldCallback = self._callback
try:
- yield (
- self._backend[0].set_callback_number,
- (callback),
- {},
- )
+ with notify_busy(self._errorLog, "Setting Callback"):
+ yield (
+ self._backend[0].set_callback_number,
+ (callback, ),
+ {},
+ )
except Exception, e:
self.error.emit(str(e))
return
self.callbackNumberChanged.emit(self._callback)
def _login(self, username, password):
- self._loggedInTime = self._LOGGINGIN_TIME
- self.stateChange.emit(self.LOGGINGIN_STATE)
- finalState = self.LOGGEDOUT_STATE
- try:
- isLoggedIn = False
-
- if not isLoggedIn and self._backend[0].is_quick_login_possible():
- isLoggedIn = yield (
- self._backend[0].is_authed,
- (),
- {},
- )
- if isLoggedIn:
- _moduleLogger.info("Logged in through cookies")
- else:
- # Force a clearing of the cookies
- yield (
- self._backend[0].logout,
+ with notify_busy(self._errorLog, "Logging In"):
+ self._loggedInTime = self._LOGGINGIN_TIME
+ self.stateChange.emit(self.LOGGINGIN_STATE)
+ finalState = self.LOGGEDOUT_STATE
+ try:
+ isLoggedIn = False
+
+ if not isLoggedIn and self._backend[0].is_quick_login_possible():
+ isLoggedIn = yield (
+ self._backend[0].is_authed,
(),
{},
)
+ if isLoggedIn:
+ _moduleLogger.info("Logged in through cookies")
+ else:
+ # Force a clearing of the cookies
+ yield (
+ self._backend[0].logout,
+ (),
+ {},
+ )
+
+ if not isLoggedIn:
+ isLoggedIn = yield (
+ self._backend[0].login,
+ (username, password),
+ {},
+ )
+ if isLoggedIn:
+ _moduleLogger.info("Logged in through credentials")
- if not isLoggedIn:
- isLoggedIn = yield (
- self._backend[0].login,
- (username, password),
- {},
- )
if isLoggedIn:
- _moduleLogger.info("Logged in through credentials")
-
- if isLoggedIn:
- self._loggedInTime = int(time.time())
- oldUsername = self._username
- self._username = username
- finalState = self.LOGGEDIN_STATE
- self.loggedIn.emit()
- if oldUsername != self._username:
- needOps = not self._load()
- else:
- needOps = True
- if needOps:
- loginOps = self._loginOps[:]
- else:
- loginOps = []
- del self._loginOps[:]
- for asyncOp in loginOps:
- asyncOp.start()
- except Exception, e:
- self.error.emit(str(e))
- finally:
- self.stateChange.emit(finalState)
+ self._loggedInTime = int(time.time())
+ oldUsername = self._username
+ self._username = username
+ finalState = self.LOGGEDIN_STATE
+ self.loggedIn.emit()
+ if oldUsername != self._username:
+ needOps = not self._load()
+ else:
+ needOps = True
+ if needOps:
+ loginOps = self._loginOps[:]
+ else:
+ loginOps = []
+ del self._loginOps[:]
+ for asyncOp in loginOps:
+ asyncOp.start()
+ except Exception, e:
+ self.error.emit(str(e))
+ finally:
+ self.stateChange.emit(finalState)
def _load(self):
updateContacts = len(self._contacts) != 0
def _update_contacts(self):
try:
- self._contacts = yield (
- self._backend[0].get_contacts,
- (),
- {},
- )
+ with notify_busy(self._errorLog, "Updating Contacts"):
+ self._contacts = yield (
+ self._backend[0].get_contacts,
+ (),
+ {},
+ )
except Exception, e:
self.error.emit(str(e))
return
def _update_messages(self):
try:
- self._messages = yield (
- self._backend[0].get_messages,
- (),
- {},
- )
+ with notify_busy(self._errorLog, "Updating Messages"):
+ self._messages = yield (
+ self._backend[0].get_messages,
+ (),
+ {},
+ )
except Exception, e:
self.error.emit(str(e))
return
def _update_history(self):
try:
- self._history = yield (
- self._backend[0].get_recent,
- (),
- {},
- )
+ with notify_busy(self._errorLog, "Updating History"):
+ self._history = yield (
+ self._backend[0].get_recent,
+ (),
+ {},
+ )
except Exception, e:
self.error.emit(str(e))
return
projects / gc-dialer / blobdiff