except ImportError:
import pickle
-from PyQt4 import QtCore
+import util.qt_compat as qt_compat
+QtCore = qt_compat.QtCore
from util import qore_utils
from util import qui_utils
class Draft(QtCore.QObject):
- sendingMessage = QtCore.pyqtSignal()
- sentMessage = QtCore.pyqtSignal()
- calling = QtCore.pyqtSignal()
- called = QtCore.pyqtSignal()
- cancelling = QtCore.pyqtSignal()
- cancelled = QtCore.pyqtSignal()
- error = QtCore.pyqtSignal(str)
+ sendingMessage = qt_compat.Signal()
+ sentMessage = qt_compat.Signal()
+ calling = qt_compat.Signal()
+ called = qt_compat.Signal()
+ cancelling = qt_compat.Signal()
+ cancelled = qt_compat.Signal()
+ error = qt_compat.Signal(str)
- recipientsChanged = QtCore.pyqtSignal()
+ recipientsChanged = qt_compat.Signal()
- def __init__(self, pool, backend, errorLog):
+ def __init__(self, asyncQueue, backend, errorLog):
QtCore.QObject.__init__(self)
self._errorLog = errorLog
self._contacts = {}
- self._pool = pool
+ self._asyncQueue = asyncQueue
self._backend = backend
self._busyReason = None
self._message = ""
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 = self._asyncQueue.add_async(self._send)
le.start(numbers, self._message)
def call(self):
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)
+ le = self._asyncQueue.add_async(self._call)
le.start(number)
def cancel(self):
- le = concurrent.AsyncLinearExecution(self._pool, self._cancel)
+ le = self._asyncQueue.add_async(self._cancel)
le.start()
def _get_message(self):
class Session(QtCore.QObject):
# @todo Somehow add support for csv contacts
+ # @BUG When loading without caches, downloads messages twice
- stateChange = QtCore.pyqtSignal(str)
- loggedOut = QtCore.pyqtSignal()
- loggedIn = QtCore.pyqtSignal()
- callbackNumberChanged = QtCore.pyqtSignal(str)
+ stateChange = qt_compat.Signal(str)
+ loggedOut = qt_compat.Signal()
+ loggedIn = qt_compat.Signal()
+ callbackNumberChanged = qt_compat.Signal(str)
- accountUpdated = QtCore.pyqtSignal()
- messagesUpdated = QtCore.pyqtSignal()
- newMessages = QtCore.pyqtSignal()
- historyUpdated = QtCore.pyqtSignal()
- dndStateChange = QtCore.pyqtSignal(bool)
- voicemailAvailable = QtCore.pyqtSignal(str, str)
+ accountUpdated = qt_compat.Signal()
+ messagesUpdated = qt_compat.Signal()
+ newMessages = qt_compat.Signal()
+ historyUpdated = qt_compat.Signal()
+ dndStateChange = qt_compat.Signal(bool)
+ voicemailAvailable = qt_compat.Signal(str, str)
- error = QtCore.pyqtSignal(str)
+ error = qt_compat.Signal(str)
LOGGEDOUT_STATE = "logged out"
LOGGINGIN_STATE = "logging in"
MESSAGE_VOICEMAILS = "Voicemail"
MESSAGE_ALL = "All"
+ HISTORY_RECEIVED = "Received"
+ HISTORY_MISSED = "Missed"
+ HISTORY_PLACED = "Placed"
+ HISTORY_ALL = "All"
+
_OLDEST_COMPATIBLE_FORMAT_VERSION = misc_utils.parse_version("1.3.0")
_LOGGEDOUT_TIME = -1
_LOGGINGIN_TIME = 0
- def __init__(self, errorLog, cachePath = None):
+ def __init__(self, errorLog, cachePath):
QtCore.QObject.__init__(self)
self._errorLog = errorLog
- self._pool = qore_utils.AsyncPool()
+ self._pool = qore_utils.FutureThread()
+ self._asyncQueue = concurrent.AsyncTaskQueue(self._pool)
self._backend = []
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._password = None
+ self._draft = Draft(self._asyncQueue, self._backend, self._errorLog)
+ self._delayedRelogin = QtCore.QTimer()
+ self._delayedRelogin.setInterval(0)
+ self._delayedRelogin.setSingleShot(True)
+ self._delayedRelogin.timeout.connect(self._on_delayed_relogin)
self._contacts = {}
self._accountUpdateTime = datetime.datetime(1971, 1, 1)
self._backend[0:0] = [gv_backend.GVDialer(cookiePath)]
self._pool.start()
- le = concurrent.AsyncLinearExecution(self._pool, self._login)
+ le = self._asyncQueue.add_async(self._login)
le.start(username, password)
def logout(self):
def update_account(self, force = True):
if not force and self._contacts:
return
- le = concurrent.AsyncLinearExecution(self._pool, self._update_account), (), {}
+ le = self._asyncQueue.add_async(self._update_account), (), {}
self._perform_op_while_loggedin(le)
+ def refresh_connection(self):
+ le = self._asyncQueue.add_async(self._refresh_authentication)
+ le.start()
+
def get_contacts(self):
return self._contacts
def update_messages(self, messageType, force = True):
if not force and self._messages:
return
- le = concurrent.AsyncLinearExecution(self._pool, self._update_messages), (messageType, ), {}
+ le = self._asyncQueue.add_async(self._update_messages), (messageType, ), {}
self._perform_op_while_loggedin(le)
def get_messages(self):
def get_when_messages_updated(self):
return self._messageUpdateTime
- def update_history(self, force = True):
+ def update_history(self, historyType, force = True):
if not force and self._history:
return
- le = concurrent.AsyncLinearExecution(self._pool, self._update_history), (), {}
+ le = self._asyncQueue.add_async(self._update_history), (historyType, ), {}
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 = self._asyncQueue.add_async(self._update_dnd), (), {}
self._perform_op_while_loggedin(le)
def set_dnd(self, dnd):
- le = concurrent.AsyncLinearExecution(self._pool, self._set_dnd)
+ le = self._asyncQueue.add_async(self._set_dnd)
le.start(dnd)
def is_available(self, messageId):
return actualPath
def download_voicemail(self, messageId):
- le = concurrent.AsyncLinearExecution(self._pool, self._download_voicemail)
+ le = self._asyncQueue.add_async(self._download_voicemail)
le.start(messageId)
def _set_dnd(self, dnd):
return self._callback
def set_callback_number(self, callback):
- le = concurrent.AsyncLinearExecution(self._pool, self._set_callback_number)
+ le = self._asyncQueue.add_async(self._set_callback_number)
le.start(callback)
def _set_callback_number(self, callback):
self._loggedInTime = int(time.time())
oldUsername = self._username
self._username = username
+ self._password = password
finalState = self.LOGGEDIN_STATE
if oldUsername != self._username:
needOps = not self._load()
if accountData is not None and self._callback:
self.set_callback_number(self._callback)
+ def _update_account(self):
+ try:
+ with qui_utils.notify_busy(self._errorLog, "Updating Account"):
+ accountData = yield (
+ self._backend[0].refresh_account_info,
+ (),
+ {},
+ )
+ except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
+ self.error.emit(str(e))
+ return
+ self._loggedInTime = int(time.time())
+ self._process_account_data(accountData)
+
+ def _refresh_authentication(self):
+ try:
+ with qui_utils.notify_busy(self._errorLog, "Updating Account"):
+ accountData = yield (
+ self._backend[0].refresh_account_info,
+ (),
+ {},
+ )
+ accountData = None
+ except Exception, e:
+ _moduleLogger.exception("Passing to user")
+ self.error.emit(str(e))
+ # refresh_account_info does not normally throw, so it is fine if we
+ # just quit early because something seriously wrong is going on
+ return
+
+ if accountData is not None:
+ self._loggedInTime = int(time.time())
+ self._process_account_data(accountData)
+ else:
+ self._delayedRelogin.start()
+
def _load(self):
updateMessages = len(self._messages) != 0
updateHistory = len(self._history) != 0
import shutil
shutil.rmtree(self._voicemailCachePath, True)
- 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 Account"):
- accountData = yield (
- self._backend[0].refresh_account_info,
- (),
- {},
- )
- except Exception, e:
- _moduleLogger.exception("Reporting error to user")
- self.error.emit(str(e))
- return
- self._process_account_data(accountData)
-
def _update_messages(self, messageType):
try:
assert self.state == self.LOGGEDIN_STATE, "Messages requires being logged in (currently %s" % self.state
self.messagesUpdated.emit()
self._alert_on_messages(self._messages)
- def _update_history(self):
+ def _update_history(self, historyType):
try:
assert self.state == self.LOGGEDIN_STATE, "History requires being logged in (currently %s" % self.state
- with qui_utils.notify_busy(self._errorLog, "Updating History"):
+ with qui_utils.notify_busy(self._errorLog, "Updating '%s' History" % historyType):
self._history = yield (
- self._backend[0].get_recent,
- (),
+ self._backend[0].get_call_history,
+ (historyType, ),
{},
)
except Exception, e:
self.historyUpdated.emit()
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:
- self.dndStateChange(self._dnd)
+ with qui_utils.notify_busy(self._errorLog, "Updating Do-Not-Disturb Status"):
+ 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:
+ self.dndStateChange(self._dnd)
def _download_voicemail(self, messageId):
actualPath = os.path.join(self._voicemailCachePath, "%s.mp3" % messageId)
{},
)
except Exception, e:
+ _moduleLogger.exception("Passing to user")
self.error.emit(str(e))
return
continue
yield cleaned
+
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_delayed_relogin(self):
+ try:
+ username = self._username
+ password = self._password
+ self.logout()
+ self.login(username, password)
+ except Exception, e:
+ _moduleLogger.exception("Passing to user")
+ self.error.emit(str(e))
+ return
projects / gc-dialer / blobdiff