Mercurial > libervia-backend

annotate frontends/src/jp/jp @ 538:2c4016921403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles - added profile argument to askConfirmation, actionResult, actionResultExt, entityDataUpdated, confirmationAnswer, getProgress - core, frontends: fixed calls/signals according to new bridge API - user of proper profile namespace for progression indicators and dialogs - memory: getParam* now return bool when param type is bool - memory: added getStringParam* to return string instead of typed value - core, memory, storage, quick_frontend: getHistory now manage properly multi-profiles - plugins XEP-0047, XEP-0054, XEP-0065, XEP-0077, XEP-0096; multi-profiles proper handling
author Goffi <goffi@goffi.org>
date Sat, 10 Nov 2012 16:38:16 +0100
parents b7c4bb2c0668
children 3eeb6c865e4d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
goffi@necton2
parents:
diff changeset
1 #! /usr/bin/python
goffi@necton2
parents:
diff changeset
2 # -*- coding: utf-8 -*-
goffi@necton2
parents:
diff changeset
3
goffi@necton2
parents:
diff changeset
4 """
goffi@necton2
parents:
diff changeset
5 jp: a SAT command line tool
459
cf005701624b copyleft date update
Goffi <goffi@goffi.org>
parents: 402
diff changeset
6 Copyright (C) 2009, 2010, 2011, 2012 Jérôme Poisson (goffi@goffi.org)
0
goffi@necton2
parents:
diff changeset
7
goffi@necton2
parents:
diff changeset
8 This program is free software: you can redistribute it and/or modify
480
2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+
Goffi <goffi@goffi.org>
parents: 459
diff changeset
9 it under the terms of the GNU Affero General Public License as published by
0
goffi@necton2
parents:
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
goffi@necton2
parents:
diff changeset
11 (at your option) any later version.
goffi@necton2
parents:
diff changeset
12
goffi@necton2
parents:
diff changeset
13 This program is distributed in the hope that it will be useful,
goffi@necton2
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
goffi@necton2
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
480
2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+
Goffi <goffi@goffi.org>
parents: 459
diff changeset
16 GNU Affero General Public License for more details.
0
goffi@necton2
parents:
diff changeset
17
480
2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+
Goffi <goffi@goffi.org>
parents: 459
diff changeset
18 You should have received a copy of the GNU Affero General Public License
0
goffi@necton2
parents:
diff changeset
19 along with this program. If not, see <http://www.gnu.org/licenses/>.
goffi@necton2
parents:
diff changeset
20 """
goffi@necton2
parents:
diff changeset
21
402
f03688bdb858 jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents: 401
diff changeset
22 from __future__ import with_statement
f03688bdb858 jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents: 401
diff changeset
23
0
goffi@necton2
parents:
diff changeset
24 #consts
191
1438a1337732 About added/updated for Wix & Jp
Goffi <goffi@goffi.org>
parents: 165
diff changeset
25 name = u"jp"
459
cf005701624b copyleft date update
Goffi <goffi@goffi.org>
parents: 402
diff changeset
26 about = name+u""" v%s (c) Jérôme Poisson (aka Goffi) 2009, 2010, 2011, 2012
0
goffi@necton2
parents:
diff changeset
27
goffi@necton2
parents:
diff changeset
28 ---
459
cf005701624b copyleft date update
Goffi <goffi@goffi.org>
parents: 402
diff changeset
29 """+name+u""" Copyright (C) 2009, 2010, 2011, 2012 Jérôme Poisson (aka Goffi)
0
goffi@necton2
parents:
diff changeset
30 This program comes with ABSOLUTELY NO WARRANTY;
goffi@necton2
parents:
diff changeset
31 This is free software, and you are welcome to redistribute it
goffi@necton2
parents:
diff changeset
32 under certain conditions.
goffi@necton2
parents:
diff changeset
33 ---
goffi@necton2
parents:
diff changeset
34
goffi@necton2
parents:
diff changeset
35 This software is a command line tool for jabber
goffi@necton2
parents:
diff changeset
36 Get the latest version at http://www.goffi.org
goffi@necton2
parents:
diff changeset
37 """
goffi@necton2
parents:
diff changeset
38
goffi@necton2
parents:
diff changeset
39 global pbar_available
goffi@necton2
parents:
diff changeset
40 pbar_available = True #checked before using ProgressBar
goffi@necton2
parents:
diff changeset
41
goffi@necton2
parents:
diff changeset
42 ### logging ###
goffi@necton2
parents:
diff changeset
43 import logging
goffi@necton2
parents:
diff changeset
44 from logging import debug, info, error, warning
goffi@necton2
parents:
diff changeset
45 logging.basicConfig(level=logging.DEBUG,
goffi@necton2
parents:
diff changeset
46 format='%(message)s')
goffi@necton2
parents:
diff changeset
47 ###
goffi@necton2
parents:
diff changeset
48
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
49 import gettext
Goffi <goffi@goffi.org>
parents: 57
diff changeset
50 gettext.install('jp', "i18n", unicode=True)
Goffi <goffi@goffi.org>
parents: 57
diff changeset
51
0
goffi@necton2
parents:
diff changeset
52 import sys
goffi@necton2
parents:
diff changeset
53 import os
goffi@necton2
parents:
diff changeset
54 from os.path import abspath, basename, dirname
goffi@necton2
parents:
diff changeset
55 from optparse import OptionParser
236
7cf093e138b6 jp: fixed bad sat.tools.jid import
Goffi <goffi@goffi.org>
parents: 228
diff changeset
56 from sat.tools.jid import JID
0
goffi@necton2
parents:
diff changeset
57 import gobject
225
fd9b7834d98a distutils installation script, draft
Goffi <goffi@goffi.org>
parents: 223
diff changeset
58 from sat_frontends.bridge.DBus import DBusBridgeFrontend,BridgeExceptionNoService
0
goffi@necton2
parents:
diff changeset
59 import tarfile
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
60 import tempfile
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
61 import shutil
493
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
62 import unicodedata
0
goffi@necton2
parents:
diff changeset
63 try:
goffi@necton2
parents:
diff changeset
64 from progressbar import ProgressBar, Percentage, Bar, ETA, FileTransferSpeed
goffi@necton2
parents:
diff changeset
65 except ImportError, e:
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
66 info (_('ProgressBar not available, please download it at http://pypi.python.org/pypi/progressbar'))
Goffi <goffi@goffi.org>
parents: 57
diff changeset
67 info (_('Progress bar deactivated\n--\n'))
0
goffi@necton2
parents:
diff changeset
68 pbar_available=False
goffi@necton2
parents:
diff changeset
69
goffi@necton2
parents:
diff changeset
70
goffi@necton2
parents:
diff changeset
71
goffi@necton2
parents:
diff changeset
72
goffi@necton2
parents:
diff changeset
73 class JP():
goffi@necton2
parents:
diff changeset
74 def __init__(self):
165
8a2053de6f8c Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents: 156
diff changeset
75 try:
8a2053de6f8c Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents: 156
diff changeset
76 self.bridge=DBusBridgeFrontend()
8a2053de6f8c Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents: 156
diff changeset
77 except BridgeExceptionNoService:
8a2053de6f8c Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents: 156
diff changeset
78 print(_(u"Can't connect to SàT backend, are you sure it's launched ?"))
8a2053de6f8c Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents: 156
diff changeset
79 import sys
8a2053de6f8c Frontends: management of unlaunched SàT Backend (information message and exit)
Goffi <goffi@goffi.org>
parents: 156
diff changeset
80 sys.exit(1)
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
81 self.transfer_data = None
0
goffi@necton2
parents:
diff changeset
82
goffi@necton2
parents:
diff changeset
83 def check_options(self):
goffi@necton2
parents:
diff changeset
84 """Check command line options"""
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
85 usage=_("""
0
goffi@necton2
parents:
diff changeset
86 %prog [options] [FILE1 FILE2 ...] JID
goffi@necton2
parents:
diff changeset
87 %prog -w [options] [JID1 JID2 ...]
goffi@necton2
parents:
diff changeset
88
goffi@necton2
parents:
diff changeset
89 %prog --help for options list
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
90 """)
191
1438a1337732 About added/updated for Wix & Jp
Goffi <goffi@goffi.org>
parents: 165
diff changeset
91 version = unicode(self.bridge.getVersion())
1438a1337732 About added/updated for Wix & Jp
Goffi <goffi@goffi.org>
parents: 165
diff changeset
92 parser = OptionParser(usage=usage,version=about % version)
0
goffi@necton2
parents:
diff changeset
93
110
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
94 parser.add_option("-p", "--profile", action="store", type="string", default='@DEFAULT@',
156
a216dfbb0d50 jp: added default value in --profile option's help
Goffi <goffi@goffi.org>
parents: 110
diff changeset
95 help=_("Use PROFILE profile key (default: %default)"))
0
goffi@necton2
parents:
diff changeset
96 parser.add_option("-b", "--bz2", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
97 help=_("Make a bzip2 tarball"))
0
goffi@necton2
parents:
diff changeset
98 parser.add_option("-w", "--wait-file", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
99 help=_("Wait for a file to be sent by a contact"))
0
goffi@necton2
parents:
diff changeset
100 parser.add_option("-m", "--multiple", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
101 help=_("Accept multiple files (you'll have to stop manually)"))
0
goffi@necton2
parents:
diff changeset
102 parser.add_option("-f", "--force", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
103 help=_("Force overwritting of existing files"))
110
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
104 parser.add_option("-g", "--progress", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
105 help=_("Show progress bar"))
0
goffi@necton2
parents:
diff changeset
106 parser.add_option("-s", "--separate", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
107 help=_("Separate xmpp messages: send one message per line instead of one message alone."))
0
goffi@necton2
parents:
diff changeset
108 parser.add_option("-n", "--new-line", action="store_true", default=False,
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
109 help=_("Add a new line at the beginning of the input (usefull for ascii art ;))"))
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
110 parser.add_option("--connect", action="store_true", default=False,
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
111 help=_("Connect the profile before doing anything else"))
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
112 parser.add_option("--pipe-in", action="store_true", default=False,
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
113 help=_("Wait for the reception of a pipe stream"))
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
114 parser.add_option("--pipe-out", action="store_true", default=False,
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
115 help=_("Pipe a stream out "))
0
goffi@necton2
parents:
diff changeset
116
goffi@necton2
parents:
diff changeset
117 (self.options, args) = parser.parse_args()
goffi@necton2
parents:
diff changeset
118
goffi@necton2
parents:
diff changeset
119 if len(args) < 1 and not self.options.wait_file:
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
120 parser.error(_("You must specify the destination JID (Jabber ID)").encode('utf-8'))
0
goffi@necton2
parents:
diff changeset
121
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
122 if self.options.wait_file or self.options.pipe_in:
0
goffi@necton2
parents:
diff changeset
123 #several jid
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
124 self.dest_jids = [arg.decode('utf-8') for arg in args]
0
goffi@necton2
parents:
diff changeset
125 else:
goffi@necton2
parents:
diff changeset
126 #one dest_jid, other args are files
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
127 self.dest_jid = JID(args[-1].decode('utf-8'))
0
goffi@necton2
parents:
diff changeset
128 self.files = args[:-1]
goffi@necton2
parents:
diff changeset
129
goffi@necton2
parents:
diff changeset
130 if not pbar_available and self.options.progress:
goffi@necton2
parents:
diff changeset
131 self.options.progress = False
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
132 error (_("Option progress is not available, deactivated."))
0
goffi@necton2
parents:
diff changeset
133
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
134 if self.options.progress or self.options.wait_file or self.options.connect or self.options.pipe_in:
0
goffi@necton2
parents:
diff changeset
135 self.start_loop = True #We have to use loop for these options
goffi@necton2
parents:
diff changeset
136 else:
goffi@necton2
parents:
diff changeset
137 self.start_loop = False
goffi@necton2
parents:
diff changeset
138
goffi@necton2
parents:
diff changeset
139
goffi@necton2
parents:
diff changeset
140 return args
goffi@necton2
parents:
diff changeset
141
goffi@necton2
parents:
diff changeset
142 def check_jabber_status(self):
goffi@necton2
parents:
diff changeset
143 """Check that jabber status is allright"""
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
144 def cantConnect():
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
145 error(_(u"Can't connect profile"))
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
146 exit(1)
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
147
110
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
148
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
149 self.profile = self.bridge.getProfileName(self.options.profile)
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
150 if not self.profile:
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
151 error(_("The profile asked doesn't exist"))
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
152 exit(1)
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
153
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
154 if self.options.connect: #if connection is asked, we connect the profile
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
155 self.bridge.asyncConnect(self.profile, self.connected, cantConnect)
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
156 return
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
157 elif not self.bridge.isConnected(self.profile):
493
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
158 error(_(u"Profile [%(profile)s] is not connected, please connect it before using jp, or use --connect option") % { "profile": self.profile })
0
goffi@necton2
parents:
diff changeset
159 exit(1)
goffi@necton2
parents:
diff changeset
160
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
161 self.connected()
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
162
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
163 def check_jids(self):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
164 """Check jids validity, transform roster name to corresponding jids"""
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
165 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
166 nodes2jid = {}
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
167
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
168 for contact in self.bridge.getContacts(self.options.profile):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
169 _jid, attr, groups = contact
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
170 if attr.has_key("name"):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
171 names2jid[attr["name"].lower()] = _jid
493
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
172 nodes2jid[JID(_jid).node.lower()] = _jid
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
173
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
174 def expandJid(jid):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
175 _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
176 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
177 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
178 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
179 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
180 else:
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
181 expanded = jid
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
182 return unicode(expanded)
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
183
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
184 def check(jid):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
185 if not jid.is_valid:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
186 error (_("%s is not a valid JID !"), self.dest_jid)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
187 exit(1)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
188
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
189 try:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
190 self.dest_jid = expandJid(self.dest_jid)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
191 check(self.dest_jid)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
192 except AttributeError:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
193 pass
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
194 try:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
195 for i in range(len(self.dest_jids)):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
196 self.dest_jids[i] = expandJid(self.dest_jids[i])
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
197 check(self.dest_jids[i])
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
198 except AttributeError:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
199 pass
0
goffi@necton2
parents:
diff changeset
200
493
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
201 def clean_ustr(self, ustr):
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
202 """Clean unicode string
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
203 remove special characters from unicode string"""
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
204 def valid_chars(unicode_source):
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
205 for char in unicode_source:
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
206 if unicodedata.category(char) == 'Cc' and char!='\n':
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
207 continue
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
208 yield char
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
209 return ''.join(valid_chars(ustr))
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
210
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
211
0
goffi@necton2
parents:
diff changeset
212 def send_stdin(self):
goffi@necton2
parents:
diff changeset
213 """Send incomming data on stdin to jabber contact"""
goffi@necton2
parents:
diff changeset
214 header = "\n" if self.options.new_line else ""
goffi@necton2
parents:
diff changeset
215
goffi@necton2
parents:
diff changeset
216 if self.options.separate: #we send stdin in several messages
goffi@necton2
parents:
diff changeset
217 if header:
110
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
218 self.bridge.sendMessage(self.dest_jid, header, profile_key=self.profile)
0
goffi@necton2
parents:
diff changeset
219 while (True):
493
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
220 line = self.clean_ustr(sys.stdin.readline().decode('utf-8','ignore'))
0
goffi@necton2
parents:
diff changeset
221 if not line:
goffi@necton2
parents:
diff changeset
222 break
110
cb904fa7de3c jp: profile management (new option: --profile)
Goffi <goffi@goffi.org>
parents: 70
diff changeset
223 self.bridge.sendMessage(self.dest_jid, line.replace("\n",""), profile_key=self.profile)
0
goffi@necton2
parents:
diff changeset
224 else:
493
b7c4bb2c0668 jp: - better expandJid: roster's jids' nodes are used after names to expand jid
Goffi <goffi@goffi.org>
parents: 480
diff changeset
225 self.bridge.sendMessage(self.dest_jid, header + self.clean_ustr(u"".join([stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()])), profile_key=self.profile)
0
goffi@necton2
parents:
diff changeset
226
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
227
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
228 def pipe_out(self):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
229 """Create named pipe, and send stdin to it"""
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
230 tmp_dir = tempfile.mkdtemp()
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
231 fifopath = os.path.join(tmp_dir,"pipe_out")
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
232 os.mkfifo(fifopath)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
233 self.bridge.pipeOut(self._getFullJid(self.dest_jid), fifopath, {}, profile_key=self.profile)
402
f03688bdb858 jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents: 401
diff changeset
234 with open(fifopath, 'w') as f:
f03688bdb858 jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents: 401
diff changeset
235 shutil.copyfileobj(sys.stdin, f)
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
236 shutil.rmtree(tmp_dir)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
237
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
238
0
goffi@necton2
parents:
diff changeset
239 def send_files(self):
goffi@necton2
parents:
diff changeset
240 """Send files to jabber contact"""
goffi@necton2
parents:
diff changeset
241
goffi@necton2
parents:
diff changeset
242 for file in self.files:
goffi@necton2
parents:
diff changeset
243 if not os.path.exists(file):
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
244 error (_(u"File [%s] doesn't exist !") % file)
0
goffi@necton2
parents:
diff changeset
245 exit(1)
goffi@necton2
parents:
diff changeset
246 if not self.options.bz2 and os.path.isdir(file):
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
247 error (_("[%s] is a dir ! Please send files inside or use compression") % file)
0
goffi@necton2
parents:
diff changeset
248 exit(1)
goffi@necton2
parents:
diff changeset
249
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
250 full_dest_jid = self._getFullJid(self.dest_jid)
0
goffi@necton2
parents:
diff changeset
251 if self.options.bz2:
goffi@necton2
parents:
diff changeset
252 tmpfile = (basename(self.files[0]) or basename(dirname(self.files[0])) ) + '.tar.bz2' #FIXME: tmp, need an algorithm to find a good name/path
goffi@necton2
parents:
diff changeset
253 if os.path.exists(tmpfile):
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
254 error (_("tmp file (%s) already exists ! Please remove it"), tmpfile)
0
goffi@necton2
parents:
diff changeset
255 exit(1)
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
256 warning(_("bz2 is an experimental option at an early dev stage, use with caution"))
0
goffi@necton2
parents:
diff changeset
257 #FIXME: check free space, writting perm, tmp dir, filename (watch for OS used)
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
258 info(_("Starting compression, please wait..."))
0
goffi@necton2
parents:
diff changeset
259 sys.stdout.flush()
goffi@necton2
parents:
diff changeset
260 bz2=tarfile.open(tmpfile, "w:bz2")
goffi@necton2
parents:
diff changeset
261 for file in self.files:
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
262 info(_("Adding %s"), file)
0
goffi@necton2
parents:
diff changeset
263 bz2.add(file)
goffi@necton2
parents:
diff changeset
264 bz2.close()
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
265 info(_("OK !"))
0
goffi@necton2
parents:
diff changeset
266 path = abspath(tmpfile)
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
267 self.transfer_data = self.bridge.sendFile(full_dest_jid, path, {}, profile_key=self.profile)
0
goffi@necton2
parents:
diff changeset
268 else:
goffi@necton2
parents:
diff changeset
269 for file in self.files:
goffi@necton2
parents:
diff changeset
270 path = abspath(file)
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
271 self.transfer_data = self.bridge.sendFile(full_dest_jid, path, {}, profile_key=self.profile) #FIXME: show progress only for last transfer_id
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
272
0
goffi@necton2
parents:
diff changeset
273
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
274 def _getFullJid(self, param_jid):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
275 """Return the full jid if possible (add last resource when find a bare jid"""
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
276 _jid = JID(param_jid)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
277 if not _jid.resource:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
278 #if the resource is not given, we try to add the last known resource
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
279 last_resource = self.bridge.getLastResource(param_jid, self.options.profile)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
280 if last_resource:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
281 return "%s/%s" % (_jid.short, last_resource)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
282 return param_jid
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
283
0
goffi@necton2
parents:
diff changeset
284
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
285 def askConfirmation(self, type, confirm_id, data, profile):
391
c34fd9d6242e spelling
Goffi <goffi@goffi.org>
parents: 390
diff changeset
286 """CB 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
287 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
288 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
289 return
0
goffi@necton2
parents:
diff changeset
290 answer_data={}
391
c34fd9d6242e spelling
Goffi <goffi@goffi.org>
parents: 390
diff changeset
291 if type == "FILE_TRANSFER":
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
292 if not self.options.wait_file:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
293 return
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
294 if self.dest_jids and not JID(data['from']).short in [JID(_jid).short for _jid in self.dest_jids]:
0
goffi@necton2
parents:
diff changeset
295 return #file is not sent by a filtered jid
goffi@necton2
parents:
diff changeset
296
goffi@necton2
parents:
diff changeset
297 answer_data["dest_path"] = os.getcwd()+'/'+data['filename']
goffi@necton2
parents:
diff changeset
298
goffi@necton2
parents:
diff changeset
299 if self.options.force or not os.path.exists(answer_data["dest_path"]):
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
300 self.bridge.confirmationAnswer(confirm_id, True, answer_data, profile)
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
301 info(_("Accepted file [%(filename)s] from %(sender)s") % {'filename':data['filename'], 'sender':data['from']})
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
302 self.transfer_data = confirm_id
0
goffi@necton2
parents:
diff changeset
303 else:
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
304 self.bridge.confirmationAnswer(confirm_id, False, answer_data, profile)
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
305 warning(_("Refused file [%(filename)s] from %(sender)s: a file with the same name already exist") % {'filename':data['filename'], 'sender':data['from']})
0
goffi@necton2
parents:
diff changeset
306
goffi@necton2
parents:
diff changeset
307
goffi@necton2
parents:
diff changeset
308 if not self.options.multiple and not self.options.progress:
goffi@necton2
parents:
diff changeset
309 #we just accept one file
goffi@necton2
parents:
diff changeset
310 self.loop.quit()
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
311 elif type == "PIPE_TRANSFER":
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
312 if not self.options.pipe_in:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
313 return
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
314 if self.dest_jids and not JID(data['from']).short in [JID(_jid).short for _jid in self.dest_jids]:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
315 return #pipe stream is not sent by a filtered jid
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
316
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
317 tmp_dir = tempfile.mkdtemp()
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
318 fifopath = os.path.join(tmp_dir,"pipe_in")
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
319 answer_data["dest_path"] = fifopath
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
320 os.mkfifo(fifopath)
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
321 self.bridge.confirmationAnswer(confirm_id, True, answer_data, profile)
402
f03688bdb858 jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents: 401
diff changeset
322 with open(fifopath, 'r') as f:
f03688bdb858 jp: use with statement to open fifo
Goffi <goffi@goffi.org>
parents: 401
diff changeset
323 shutil.copyfileobj(f, sys.stdout)
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
324 shutil.rmtree(tmp_dir)
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
325 self.loop.quit()
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
326
0
goffi@necton2
parents:
diff changeset
327
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
328 def actionResult(self, action_type, action_id, data, profile):
22
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button.
Goffi <goffi@goffi.org>
parents: 0
diff changeset
329 #FIXME
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
330 info (_("FIXME: actionResult not implemented"))
0
goffi@necton2
parents:
diff changeset
331
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
332 def confirmation_reply(self):
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
333 """Auto reply to confirmations requests"""
390
8e87af2e2d1f jp: fixed file reception
Goffi <goffi@goffi.org>
parents: 387
diff changeset
334 self.bridge.register("askConfirmation", self.askConfirmation)
0
goffi@necton2
parents:
diff changeset
335
goffi@necton2
parents:
diff changeset
336 def progressCB(self):
538
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
337 if self.transfer_data:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
338 transfer_id = self.transfer_data
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles
Goffi <goffi@goffi.org>
parents: 493
diff changeset
339 data = self.bridge.getProgress(transfer_id, self.profile)
0
goffi@necton2
parents:
diff changeset
340 if data:
goffi@necton2
parents:
diff changeset
341 if not data['position']:
goffi@necton2
parents:
diff changeset
342 data['position'] = '0'
goffi@necton2
parents:
diff changeset
343 if not self.pbar:
goffi@necton2
parents:
diff changeset
344 #first answer, we must construct the bar
70
Goffi <goffi@goffi.org>
parents: 57
diff changeset
345 self.pbar = ProgressBar(int(data['size']),[_("Progress: "),Percentage()," ",Bar()," ",FileTransferSpeed()," ",ETA()])
0
goffi@necton2
parents:
diff changeset
346 self.pbar.start()
goffi@necton2
parents:
diff changeset
347
goffi@necton2
parents:
diff changeset
348 self.pbar.update(int(data['position']))
goffi@necton2
parents:
diff changeset
349 elif self.pbar:
goffi@necton2
parents:
diff changeset
350 self.pbar.finish()
goffi@necton2
parents:
diff changeset
351 if not self.options.multiple:
goffi@necton2
parents:
diff changeset
352 self.loop.quit()
goffi@necton2
parents:
diff changeset
353 return False
goffi@necton2
parents:
diff changeset
354
goffi@necton2
parents:
diff changeset
355 return True
goffi@necton2
parents:
diff changeset
356
goffi@necton2
parents:
diff changeset
357 def go(self):
goffi@necton2
parents:
diff changeset
358 self.check_options()
goffi@necton2
parents:
diff changeset
359 self.check_jabber_status()
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
360 if self.start_loop:
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
361 self.loop = gobject.MainLoop()
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
362 try:
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
363 self.loop.run()
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
364 except KeyboardInterrupt:
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
365 info(_("User interruption: good bye"))
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
366
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
367 def connected(self):
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
368 """This is called when the profile is connected"""
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
369 self.check_jids()
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
370 if self.options.wait_file or self.options.pipe_in:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
371 self.confirmation_reply()
0
goffi@necton2
parents:
diff changeset
372 else:
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
373 if self.files:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
374 self.send_files()
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
375 elif self.options.pipe_out:
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
376 self.pipe_out()
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
377 else:
0
goffi@necton2
parents:
diff changeset
378 self.send_stdin()
goffi@necton2
parents:
diff changeset
379
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
380 if self.options.progress:
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
381 self.pbar = None
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
382 gobject.timeout_add(10, self.progressCB)
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
383
401
b2caa2615c4c jp roster name manegement + Pipe transfer
Goffi <goffi@goffi.org>
parents: 393
diff changeset
384 if self.start_loop and not self.options.progress and not self.options.wait_file and not self.options.pipe_in:
393
393b35aa86d2 jp: added --connect option
Goffi <goffi@goffi.org>
parents: 391
diff changeset
385 self.loop.quit()
0
goffi@necton2
parents:
diff changeset
386
goffi@necton2
parents:
diff changeset
387
goffi@necton2
parents:
diff changeset
388 if __name__ == "__main__":
goffi@necton2
parents:
diff changeset
389 jp = JP()
goffi@necton2
parents:
diff changeset
390 jp.go()