Mercurial > libervia-backend
annotate frontends/src/jp/base.py @ 1598:b144babc2658
core, plugin file: fixed progress id + data is now returned by getProgress, instead of being an argument to fill
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sat, 14 Nov 2015 19:20:33 +0100 |
| parents | 313f2bb7841b |
| children | 8d41cd4da2f6 |
| rev | line source |
|---|---|
| 0 | 1 #! /usr/bin/python |
| 2 # -*- coding: utf-8 -*- | |
| 3 | |
|
609
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
4 # jp: a SAT command line tool |
| 1396 | 5 # Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Jérôme Poisson (goffi@goffi.org) |
| 0 | 6 |
|
609
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
7 # This program is free software: you can redistribute it and/or modify |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
8 # it under the terms of the GNU Affero General Public License as published by |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
9 # the Free Software Foundation, either version 3 of the License, or |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
10 # (at your option) any later version. |
| 0 | 11 |
|
609
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
12 # This program is distributed in the hope that it will be useful, |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
15 # GNU Affero General Public License for more details. |
| 0 | 16 |
|
609
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
17 # You should have received a copy of the GNU Affero General Public License |
|
84a6e83157c2
fixed licences in docstrings (they are now in comments)
Goffi <goffi@goffi.org>
parents:
601
diff
changeset
|
18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 0 | 19 |
| 771 | 20 from sat.core.i18n import _ |
|
402
f03688bdb858
jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents:
401
diff
changeset
|
21 |
| 0 | 22 global pbar_available |
| 23 pbar_available = True #checked before using ProgressBar | |
| 24 | |
| 25 ### logging ### | |
| 26 import logging | |
| 27 from logging import debug, info, error, warning | |
| 28 logging.basicConfig(level=logging.DEBUG, | |
| 29 format='%(message)s') | |
| 30 ### | |
| 31 | |
| 32 import sys | |
| 817 | 33 import locale |
| 34 import os.path | |
| 35 import argparse | |
| 964 | 36 from gi.repository import GLib, GObject |
| 817 | 37 from glob import iglob |
| 38 from importlib import import_module | |
|
1139
75025461141f
move sat.tools.jid to sat_frontends.tools.jid
souliane <souliane@mailoo.org>
parents:
1033
diff
changeset
|
39 from sat_frontends.tools.jid import JID |
|
627
d207c2186519
core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised:
Goffi <goffi@goffi.org>
parents:
613
diff
changeset
|
40 from sat_frontends.bridge.DBus import DBusBridgeFrontend |
| 817 | 41 from sat.core import exceptions |
| 42 import sat_frontends.jp | |
|
970
2e052998c7eb
jp: using C.APP_URL for application url
Goffi <goffi@goffi.org>
parents:
965
diff
changeset
|
43 from sat_frontends.jp.constants import Const as C |
| 0 | 44 try: |
| 817 | 45 import progressbar |
| 46 except ImportError: | |
| 47 info (_('ProgressBar not available, please download it at http://pypi.python.org/pypi/progressbar')) | |
| 48 info (_('Progress bar deactivated\n--\n')) | |
| 49 progressbar=None | |
| 50 | |
| 51 #consts | |
| 52 prog_name = u"jp" | |
| 53 description = """This software is a command line tool for XMPP. | |
|
970
2e052998c7eb
jp: using C.APP_URL for application url
Goffi <goffi@goffi.org>
parents:
965
diff
changeset
|
54 Get the latest version at """ + C.APP_URL |
| 817 | 55 |
| 1396 | 56 copyleft = u"""Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Jérôme Poisson (aka Goffi) |
| 817 | 57 This program comes with ABSOLUTELY NO WARRANTY; |
| 58 This is free software, and you are welcome to redistribute it under certain conditions. | |
| 59 """ | |
| 0 | 60 |
| 61 | |
| 817 | 62 def unicode_decoder(arg): |
| 63 # Needed to have unicode strings from arguments | |
| 64 return arg.decode(locale.getpreferredencoding()) | |
| 814 | 65 |
| 0 | 66 |
| 817 | 67 class Jp(object): |
| 814 | 68 """ |
| 69 This class can be use to establish a connection with the | |
| 70 bridge. Moreover, it should manage a main loop. | |
| 71 | |
| 72 To use it, you mainly have to redefine the method run to perform | |
| 73 specify what kind of operation you want to perform. | |
| 74 | |
| 75 """ | |
| 817 | 76 def __init__(self): |
|
165
8a2053de6f8c
Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
77 try: |
| 817 | 78 self.bridge = DBusBridgeFrontend() |
| 79 except exceptions.BridgeExceptionNoService: | |
|
165
8a2053de6f8c
Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
80 print(_(u"Can't connect to SàT backend, are you sure it's launched ?")) |
|
627
d207c2186519
core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised:
Goffi <goffi@goffi.org>
parents:
613
diff
changeset
|
81 sys.exit(1) |
|
864
241f6baa6687
frontends: fix typos, do not use logging in the xmlui tools:
souliane <souliane@mailoo.org>
parents:
823
diff
changeset
|
82 except exceptions.BridgeInitError: |
|
627
d207c2186519
core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised:
Goffi <goffi@goffi.org>
parents:
613
diff
changeset
|
83 print(_(u"Can't init bridge")) |
|
165
8a2053de6f8c
Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
84 sys.exit(1) |
| 814 | 85 |
| 817 | 86 self.parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, |
| 87 description=description) | |
| 88 | |
| 89 self._make_parents() | |
| 90 self.add_parser_options() | |
| 91 self.subparsers = self.parser.add_subparsers(title=_('Available commands'), dest='subparser_name') | |
| 92 self._auto_loop = False # when loop is used for internal reasons | |
| 93 self.need_loop = False # to set by commands when loop is needed | |
| 94 self._progress_id = None # TODO: manage several progress ids | |
| 95 self.quit_on_progress_end = True # set to False if you manage yourself exiting, or if you want the user to stop by himself | |
| 96 | |
| 97 @property | |
| 98 def version(self): | |
| 99 return self.bridge.getVersion() | |
| 814 | 100 |
| 817 | 101 @property |
| 102 def progress_id(self): | |
| 103 return self._progress_id | |
| 104 | |
| 105 @progress_id.setter | |
| 106 def progress_id(self, value): | |
| 107 self._progress_id = value | |
| 108 | |
| 109 def _make_parents(self): | |
| 110 self.parents = {} | |
| 111 | |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
112 # we have a special case here as the start-session option is present only if connection is not needed, |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
113 # so we create two similar parents, one with the option, the other one without it |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
114 for parent_name in ('profile', 'profile_session'): |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
115 parent = self.parents[parent_name] = argparse.ArgumentParser(add_help=False) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
116 parent.add_argument("-p", "--profile", action="store", type=str, default='@DEFAULT@', help=_("Use PROFILE profile key (default: %(default)s)")) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
117 parent.add_argument("--pwd", action="store", type=unicode, default='', metavar='PASSWORD', help=_("Password used to connect profile, if necessary")) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
118 |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
119 profile_parent, profile_session_parent = self.parents['profile'], self.parents['profile_session'] |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
120 |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
121 connect_short, connect_long, connect_action, connect_help = "-c", "--connect", "store_true", _(u"Connect the profile before doing anything else") |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
122 profile_parent.add_argument(connect_short, connect_long, action=connect_action, help=connect_help) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
123 |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
124 profile_session_connect_group = profile_session_parent.add_mutually_exclusive_group() |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
125 profile_session_connect_group.add_argument(connect_short, connect_long, action=connect_action, help=connect_help) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
126 profile_session_connect_group.add_argument("--start-session", action="store_true", help=_("Start a profile session without connecting")) |
| 817 | 127 |
| 128 progress_parent = self.parents['progress'] = argparse.ArgumentParser(add_help=False) | |
| 129 if progressbar: | |
|
823
300b4de701a6
jp: short option for progress is now -P instead of -g, so -g can be used for groups
Goffi <goffi@goffi.org>
parents:
817
diff
changeset
|
130 progress_parent.add_argument("-P", "--progress", action="store_true", help=_("Show progress bar")) |
| 0 | 131 |
| 817 | 132 def add_parser_options(self): |
| 133 self.parser.add_argument('--version', action='version', version=("%(name)s %(version)s %(copyleft)s" % {'name': prog_name, 'version': self.version, 'copyleft': copyleft})) | |
| 134 | |
| 135 def import_commands(self): | |
| 136 """ Automaticaly import commands to jp | |
| 137 looks from modules names cmd_*.py in jp path and import them | |
| 138 | |
| 139 """ | |
| 140 path = os.path.dirname(sat_frontends.jp.__file__) | |
| 141 modules = (os.path.splitext(module)[0] for module in map(os.path.basename, iglob(os.path.join(path, "cmd_*.py")))) | |
| 142 for module_name in modules: | |
| 143 module = import_module("sat_frontends.jp."+module_name) | |
| 144 try: | |
| 145 self.import_command_module(module) | |
| 146 except ImportError: | |
| 147 continue | |
| 0 | 148 |
| 817 | 149 def import_command_module(self, module): |
| 150 """ Add commands from a module to jp | |
| 151 @param module: module containing commands | |
| 152 | |
| 153 """ | |
| 154 try: | |
| 155 for classname in module.__commands__: | |
| 156 cls = getattr(module, classname) | |
| 157 except AttributeError: | |
| 158 warning(_("Invalid module %s") % module) | |
| 159 raise ImportError | |
| 160 cls(self) | |
| 161 | |
| 162 | |
| 163 def run(self, args=None): | |
| 164 self.args = self.parser.parse_args(args) | |
| 165 self.args.func() | |
| 166 if self.need_loop or self._auto_loop: | |
| 167 self._start_loop() | |
| 168 | |
| 169 def _start_loop(self): | |
|
898
9720d3d0a764
jp: updated main loop to gobject 3
Matteo Cypriani <mcy@lm7.fr>
parents:
864
diff
changeset
|
170 self.loop = GLib.MainLoop() |
| 814 | 171 try: |
| 172 self.loop.run() | |
| 173 except KeyboardInterrupt: | |
| 174 info(_("User interruption: good bye")) | |
| 0 | 175 |
| 817 | 176 def stop_loop(self): |
| 177 try: | |
| 178 self.loop.quit() | |
| 179 except AttributeError: | |
| 180 pass | |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
181 |
| 817 | 182 def quit(self, errcode=0): |
| 183 self.stop_loop() | |
| 184 if errcode: | |
| 185 sys.exit(errcode) | |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
186 |
| 814 | 187 def check_jids(self, jids): |
| 188 """Check jids validity, transform roster name to corresponding jids | |
|
110
cb904fa7de3c
jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents:
70
diff
changeset
|
189 |
| 817 | 190 @param profile: profile name |
| 191 @param jids: list of jids | |
| 192 @return: List of jids | |
| 193 | |
| 814 | 194 """ |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
195 names2jid = {} |
|
493
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
196 nodes2jid = {} |
| 393 | 197 |
| 814 | 198 for contact in self.bridge.getContacts(self.profile): |
|
1395
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
199 jid_s, attr, groups = contact |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
200 _jid = JID(jid_s) |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
201 try: |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
202 names2jid[attr["name"].lower()] = jid_s |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
203 except KeyError: |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
204 pass |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
205 |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
206 if _jid.node: |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
207 nodes2jid[_jid.node.lower()] = jid_s |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
208 |
| 817 | 209 def expand_jid(jid): |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
210 _jid = jid.lower() |
|
493
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
211 if _jid in names2jid: |
|
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
212 expanded = names2jid[_jid] |
|
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
213 elif _jid in nodes2jid: |
|
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
214 expanded = nodes2jid[_jid] |
|
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
215 else: |
|
b7c4bb2c0668
jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents:
480
diff
changeset
|
216 expanded = jid |
| 965 | 217 return expanded.decode('utf-8') |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
218 |
|
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
219 def check(jid): |
|
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
220 if not jid.is_valid: |
| 814 | 221 error (_("%s is not a valid JID !"), jid) |
| 817 | 222 self.quit(1) |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
223 |
| 814 | 224 dest_jids=[] |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
225 try: |
| 814 | 226 for i in range(len(jids)): |
| 817 | 227 dest_jids.append(expand_jid(jids[i])) |
| 814 | 228 check(dest_jids[i]) |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
229 except AttributeError: |
|
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
230 pass |
| 0 | 231 |
| 814 | 232 return dest_jids |
| 0 | 233 |
| 817 | 234 def connect_profile(self, callback): |
|
1588
823a385235ef
jp: fixed bad --connect option check
Goffi <goffi@goffi.org>
parents:
1544
diff
changeset
|
235 """ Check if the profile is connected and do it if requested |
|
1401
265ff2bd8d67
jp: fixed crash on commands using profile without "connect" option
Goffi <goffi@goffi.org>
parents:
1396
diff
changeset
|
236 |
| 817 | 237 @param callback: method to call when profile is connected |
| 238 @exit: - 1 when profile is not connected and --connect is not set | |
| 239 - 1 when the profile doesn't exists | |
| 240 - 1 when there is a connection error | |
| 241 """ | |
| 242 # FIXME: need better exit codes | |
| 243 | |
|
971
8ca5c990ed92
jp: "disco" subcommand, moved into a new "info" subcommand + added "version" subcommand which get software version
Goffi <goffi@goffi.org>
parents:
970
diff
changeset
|
244 def cant_connect(failure): |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
245 error(_(u"Can't connect profile: {reason}").format(reason=failure)) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
246 self.quit(1) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
247 |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
248 def cant_start_session(failure): |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
249 error(_(u"Can't start {profile}'s session: {reason}").format(profile=self.profile, reason=failure)) |
| 817 | 250 self.quit(1) |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
251 |
| 817 | 252 self.profile = self.bridge.getProfileName(self.args.profile) |
| 0 | 253 |
| 817 | 254 if not self.profile: |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
255 error(_("The profile [{profile}] doesn't exist").format(profile=self.args.profile)) |
| 817 | 256 self.quit(1) |
| 257 | |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
258 try: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
259 start_session = self.args.start_session |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
260 except AttributeError: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
261 pass |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
262 else: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
263 if start_session: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
264 self.bridge.profileStartSession(self.args.pwd, self.profile, lambda dummy: callback(), cant_start_session) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
265 self._auto_loop = True |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
266 return |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
267 elif not self.bridge.profileIsSessionStarted(self.profile): |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
268 if not self.args.connect: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
269 error(_(u"Session for [{profile}] is not started, please start it before using jp, or use either --start-session or --connect option").format(profile=self.profile)) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
270 self.quit(1) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
271 else: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
272 callback() |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
273 return |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
274 |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
275 |
|
1401
265ff2bd8d67
jp: fixed crash on commands using profile without "connect" option
Goffi <goffi@goffi.org>
parents:
1396
diff
changeset
|
276 if not hasattr(self.args, 'connect'): |
|
1588
823a385235ef
jp: fixed bad --connect option check
Goffi <goffi@goffi.org>
parents:
1544
diff
changeset
|
277 # a profile can be present without connect option (e.g. on profile creation/deletion) |
|
1401
265ff2bd8d67
jp: fixed crash on commands using profile without "connect" option
Goffi <goffi@goffi.org>
parents:
1396
diff
changeset
|
278 return |
|
1588
823a385235ef
jp: fixed bad --connect option check
Goffi <goffi@goffi.org>
parents:
1544
diff
changeset
|
279 elif self.args.connect is True: # if connection is asked, we connect the profile |
|
1544
3d5193b4c582
jp: separate password and connection of profile in --connect and --pwd arguments
Goffi <goffi@goffi.org>
parents:
1401
diff
changeset
|
280 self.bridge.asyncConnect(self.profile, self.args.pwd, lambda dummy: callback(), cant_connect) |
| 817 | 281 self._auto_loop = True |
| 814 | 282 return |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
283 else: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
284 if not self.bridge.isConnected(self.profile): |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
285 error(_(u"Profile [{profile}] is not connected, please connect it before using jp, or use --connect option").format(profile=self.profile)) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
286 self.quit(1) |
| 0 | 287 |
| 817 | 288 callback() |
| 289 | |
| 290 def get_full_jid(self, param_jid): | |
|
1290
faa1129559b8
core, frontends: refactoring to base Libervia on QuickFrontend (big mixed commit):
Goffi <goffi@goffi.org>
parents:
1139
diff
changeset
|
291 """Return the full jid if possible (add main resource when find a bare jid)""" |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
292 _jid = JID(param_jid) |
|
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
293 if not _jid.resource: |
|
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
294 #if the resource is not given, we try to add the last known resource |
|
1290
faa1129559b8
core, frontends: refactoring to base Libervia on QuickFrontend (big mixed commit):
Goffi <goffi@goffi.org>
parents:
1139
diff
changeset
|
295 last_resource = self.bridge.getMainResource(param_jid, self.profile) |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
296 if last_resource: |
|
688
f7878ad3c846
tools: renamed tools.jid.JID attribute "short" to "bare"
souliane <souliane@mailoo.org>
parents:
657
diff
changeset
|
297 return "%s/%s" % (_jid.bare, last_resource) |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
298 return param_jid |
|
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
299 |
| 817 | 300 def watch_progress(self): |
| 301 self.pbar = None | |
|
898
9720d3d0a764
jp: updated main loop to gobject 3
Matteo Cypriani <mcy@lm7.fr>
parents:
864
diff
changeset
|
302 GObject.timeout_add(10, self._progress_cb) |
| 0 | 303 |
| 817 | 304 def _progress_cb(self): |
| 305 if self.progress_id: | |
| 306 data = self.bridge.getProgress(self.progress_id, self.profile) | |
| 307 if data: | |
| 308 if not data['position']: | |
| 309 data['position'] = '0' | |
| 310 if not self.pbar: | |
| 311 #first answer, we must construct the bar | |
| 312 self.pbar = progressbar.ProgressBar(int(data['size']), | |
| 313 [_("Progress: "),progressbar.Percentage(), | |
| 314 " ", | |
| 315 progressbar.Bar(), | |
| 316 " ", | |
| 317 progressbar.FileTransferSpeed(), | |
| 318 " ", | |
| 319 progressbar.ETA()]) | |
| 320 self.pbar.start() | |
| 321 | |
| 322 self.pbar.update(int(data['position'])) | |
| 323 | |
| 324 elif self.pbar: | |
| 325 self.pbar.finish() | |
| 326 if self.quit_on_progress_end: | |
| 327 self.quit() | |
| 328 return False | |
| 329 | |
| 330 return True | |
| 814 | 331 |
| 332 | |
| 817 | 333 class CommandBase(object): |
| 814 | 334 |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
335 def __init__(self, host, name, use_profile=True, use_progress=False, need_connect=None, help=None, **kwargs): |
| 817 | 336 """ Initialise CommandBase |
| 337 @param host: Jp instance | |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
338 @param name(unicode): name of the new command |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
339 @param use_profile(bool): if True, add profile selection/connection commands |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
340 @param use_progress(bool): if True, add progress bar activation commands |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
341 @param need_connect(bool, None): True if profile connection is needed |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
342 False else (profile session must still be started) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
343 None to set auto value (i.e. True if use_profile is set) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
344 Can't be set if use_profile is False |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
345 @param help(unicode): help message to display |
| 817 | 346 @param **kwargs: args passed to ArgumentParser |
| 347 | |
| 814 | 348 """ |
| 817 | 349 try: # If we have subcommands, host is a CommandBase and we need to use host.host |
| 350 self.host = host.host | |
| 351 except AttributeError: | |
| 352 self.host = host | |
| 353 | |
| 354 parents = kwargs.setdefault('parents', set()) | |
| 355 if use_profile: | |
| 356 #self.host.parents['profile'] is an ArgumentParser with profile connection arguments | |
|
1594
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
357 if need_connect is None: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
358 need_connect = True |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
359 parents.add(self.host.parents['profile' if need_connect else 'profile_session']) |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
360 else: |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
361 assert need_connect is None |
|
313f2bb7841b
jp: profile session can now be started without connection:
Goffi <goffi@goffi.org>
parents:
1588
diff
changeset
|
362 |
| 817 | 363 if use_progress: |
| 364 parents.add(self.host.parents['progress']) | |
| 365 | |
| 366 self.parser = host.subparsers.add_parser(name, help=help, **kwargs) | |
| 367 if hasattr(self, "subcommands"): | |
| 368 self.subparsers = self.parser.add_subparsers() | |
| 369 else: | |
| 370 self.parser.set_defaults(func=self.run) | |
| 371 self.add_parser_options() | |
| 372 | |
| 373 @property | |
| 374 def args(self): | |
| 375 return self.host.args | |
| 376 | |
| 377 @property | |
| 378 def need_loop(self): | |
| 379 return self.host.need_loop | |
| 380 | |
| 381 @need_loop.setter | |
| 382 def need_loop(self, value): | |
| 383 self.host.need_loop = value | |
| 384 | |
| 385 @property | |
| 386 def profile(self): | |
| 387 return self.host.profile | |
| 388 | |
| 389 @property | |
| 390 def progress_id(self): | |
| 391 return self.host.progress_id | |
| 814 | 392 |
| 817 | 393 @progress_id.setter |
| 394 def progress_id(self, value): | |
| 395 self.host.progress_id = value | |
| 396 | |
| 397 def add_parser_options(self): | |
| 398 try: | |
| 399 subcommands = self.subcommands | |
| 400 except AttributeError: | |
| 401 # We don't have subcommands, the class need to implements add_parser_options | |
| 402 raise NotImplementedError | |
| 403 | |
| 404 # now we add subcommands to ourself | |
| 405 for cls in subcommands: | |
| 406 cls(self) | |
| 814 | 407 |
| 817 | 408 def run(self): |
| 409 try: | |
| 410 if self.args.profile: | |
|
1395
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
411 connect_profile = self.host.connect_profile |
| 817 | 412 except AttributeError: |
| 413 # the command doesn't need to connect profile | |
| 414 pass | |
|
1395
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
415 else: |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
416 connect_profile(self.connected) |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
417 |
| 817 | 418 try: |
| 419 if self.args.progress: | |
|
1395
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
420 watch_progress = self.host.watch_progress |
| 817 | 421 except AttributeError: |
| 422 # the command doesn't use progress bar | |
| 423 pass | |
|
1395
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
424 else: |
|
1ae9aa94c351
jp: fixed bad try/except hidding errors + fixed bad management of jids without node
Goffi <goffi@goffi.org>
parents:
1290
diff
changeset
|
425 watch_progress() |
| 817 | 426 |
| 427 def connected(self): | |
| 428 if not self.need_loop: | |
| 429 self.host.stop_loop() | |
| 430 | |
| 431 | |
| 432 class CommandAnswering(CommandBase): | |
| 433 #FIXME: temp, will be refactored when progress_bar/confirmations will be refactored | |
| 434 | |
| 435 def _ask_confirmation(self, confirm_id, confirm_type, data, profile): | |
| 436 """ Callback used for file transfer, accept files depending on parameters""" | |
|
538
2c4016921403
core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents:
493
diff
changeset
|
437 if profile != self.profile: |
|
2c4016921403
core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents:
493
diff
changeset
|
438 debug("Ask confirmation ignored: not our profile") |
|
2c4016921403
core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents:
493
diff
changeset
|
439 return |
| 817 | 440 if confirm_type == self.confirm_type: |
| 441 if self.dest_jids and not JID(data['from']).bare in [JID(_jid).bare for _jid in self.dest_jids()]: | |
| 0 | 442 return #file is not sent by a filtered jid |
| 443 else: | |
| 817 | 444 self.ask(data, confirm_id) |
| 0 | 445 |
| 814 | 446 def ask(self): |
| 447 """ | |
| 448 The return value is used to answer to the bridge. | |
| 817 | 449 @return: bool or dict |
| 814 | 450 """ |
| 451 raise NotImplementedError | |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
452 |
| 817 | 453 def connected(self): |
|
401
b2caa2615c4c
jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents:
393
diff
changeset
|
454 """Auto reply to confirmations requests""" |
| 817 | 455 self.need_loop = True |
| 456 super(CommandAnswering, self).connected() | |
| 457 # we watch confirmation signals | |
| 458 self.host.bridge.register("ask_confirmation", self._ask_confirmation) | |
|
587
952322b1d490
Remove trailing whitespaces.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
572
diff
changeset
|
459 |
|
542
3eeb6c865e4d
frontends: incoming files transfer management:
Goffi <goffi@goffi.org>
parents:
538
diff
changeset
|
460 #and we ask those we have missed |
| 817 | 461 for confirm_id, confirm_type, data in self.host.bridge.getWaitingConf(self.profile): |
| 462 self._ask_confirmation(confirm_id, confirm_type, data, self.profile) |