diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-07-30 17:15:03 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-07-30 17:35:21 +0200 |
| commit | b0accad5c0e21a2fcec329af5169f000e7c51e7f (patch) | |
| tree | 1c32d141b528a3eb84dd3a02ca25ede4f3891ce6 /src/core/commands.py | |
| parent | 39c8319ec4c155e7323429ccbf56984d85a195a6 (diff) | |
| download | poezio-b0accad5c0e21a2fcec329af5169f000e7c51e7f.tar.gz poezio-b0accad5c0e21a2fcec329af5169f000e7c51e7f.tar.bz2 poezio-b0accad5c0e21a2fcec329af5169f000e7c51e7f.tar.xz poezio-b0accad5c0e21a2fcec329af5169f000e7c51e7f.zip | |
Make the bookmark stuff non-blocking
Diffstat (limited to 'src/core/commands.py')
| -rw-r--r-- | src/core/commands.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/core/commands.py b/src/core/commands.py index 5254464a..5f1af49c 100644 --- a/src/core/commands.py +++ b/src/core/commands.py @@ -6,6 +6,7 @@ import logging log = logging.getLogger(__name__) +import functools import sys from datetime import datetime from gettext import gettext as _ @@ -440,7 +441,7 @@ def command_bookmark_local(self, arg=''): new_bookmarks.extend(bookmark.bookmarks) bookmark.bookmarks = new_bookmarks bookmark.save_local() - bookmark.save_remote(self.xmpp) + bookmark.save_remote(self.xmpp, None) self.information('Bookmarks added and saved.', 'Info') return else: @@ -508,12 +509,13 @@ def command_bookmark(self, arg=''): new_bookmarks.append(b) new_bookmarks.extend(bookmark.bookmarks) bookmark.bookmarks = new_bookmarks - - if bookmark.save_remote(self.xmpp): - bookmark.save_local() - self.information("Bookmarks added.", "Info") - else: - self.information("Could not add the bookmarks.", "Info") + def _cb(self, iq): + if iq["type"] != "error": + bookmark.save_local() + self.information("Bookmarks added.", "Info") + else: + self.information("Could not add the bookmarks.", "Info") + bookmark.save_remote(self.xmpp, functools.partial(_cb, self)) return else: info = safeJID(args[0]) @@ -542,14 +544,16 @@ def command_bookmark(self, arg=''): if password: bm.password = password bm.autojoin = autojoin - if bookmark.save_remote(self.xmpp): - self.information('Bookmark added.', 'Info') + def _cb(self, iq): + if iq["type"] != "error": + self.information('Bookmark added.', 'Info') + else: + self.information("Could not add the bookmarks.", "Info") + bookmark.save_remote(self.xmpp, functools.partial(_cb, self)) remote = [] for each in bookmark.bookmarks: if each.method in ('pep', 'privatexml'): remote.append(each) - self.information(_('Your remote bookmarks are now: %s') % remote, - _('Info')) def command_bookmarks(self, arg=''): """/bookmarks""" |