summaryrefslogtreecommitdiff
path: root/examples/ibb_transfer
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-04-10 22:29:44 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-04-19 20:48:02 +0200
commit474405ab90ca9a484277bd4f3af9fae6934c4c44 (patch)
treec0aa88f63ae1240f25f59e74393d868dc4d3bff2 /examples/ibb_transfer
parent4415d3be1ab10717e1bd3c3fde68b4c04932adda (diff)
downloadslixmpp-474405ab90ca9a484277bd4f3af9fae6934c4c44.tar.gz
slixmpp-474405ab90ca9a484277bd4f3af9fae6934c4c44.tar.bz2
slixmpp-474405ab90ca9a484277bd4f3af9fae6934c4c44.tar.xz
slixmpp-474405ab90ca9a484277bd4f3af9fae6934c4c44.zip
XEP-0047: fix examples.
Diffstat (limited to 'examples/ibb_transfer')
-rwxr-xr-xexamples/ibb_transfer/ibb_receiver.py50
-rwxr-xr-xexamples/ibb_transfer/ibb_sender.py47
2 files changed, 52 insertions, 45 deletions
diff --git a/examples/ibb_transfer/ibb_receiver.py b/examples/ibb_transfer/ibb_receiver.py
index 46dec047..e934f295 100755
--- a/examples/ibb_transfer/ibb_receiver.py
+++ b/examples/ibb_transfer/ibb_receiver.py
@@ -22,13 +22,10 @@ class IBBReceiver(slixmpp.ClientXMPP):
A basic example of creating and using an in-band bytestream.
"""
- def __init__(self, jid, password):
+ def __init__(self, jid, password, filename):
slixmpp.ClientXMPP.__init__(self, jid, password)
- self.register_plugin('xep_0030') # Service Discovery
- self.register_plugin('xep_0047', {
- 'auto_accept': True
- }) # In-band Bytestreams
+ self.file = open(filename, 'wb')
# The session_start event will be triggered when
# the bot establishes its connection with the server
@@ -39,6 +36,7 @@ class IBBReceiver(slixmpp.ClientXMPP):
self.add_event_handler("ibb_stream_start", self.stream_opened)
self.add_event_handler("ibb_stream_data", self.stream_data)
+ self.add_event_handler("ibb_stream_end", self.stream_closed)
def start(self, event):
"""
@@ -56,29 +54,16 @@ class IBBReceiver(slixmpp.ClientXMPP):
self.send_presence()
self.get_roster()
- def accept_stream(self, iq):
- """
- Check that it is ok to accept a stream request.
-
- Controlling stream acceptance can be done via either:
- - setting 'auto_accept' to False in the plugin
- configuration. The default is True.
- - setting 'accept_stream' to a function which accepts
- an Iq stanza as its argument, like this one.
-
- The accept_stream function will be used if it exists, and the
- auto_accept value will be used otherwise.
- """
- return True
-
def stream_opened(self, stream):
print('Stream opened: %s from %s' % (stream.sid, stream.peer_jid))
- # You could run a loop reading from the stream using stream.recv(),
- # or use the ibb_stream_data event.
+ def stream_data(self, stream):
+ self.file.write(stream.read())
- def stream_data(self, event):
- print(event['data'])
+ def stream_closed(self, stream):
+ print('Stream closed: %s from %s' % (stream.sid, stream.peer_jid))
+ self.file.close()
+ self.disconnect()
if __name__ == '__main__':
# Setup the command line arguments.
@@ -97,6 +82,8 @@ if __name__ == '__main__':
help="JID to use")
parser.add_argument("-p", "--password", dest="password",
help="password to use")
+ parser.add_argument("-o", "--out", dest="filename",
+ help="file to save to")
args = parser.parse_args()
@@ -108,9 +95,18 @@ if __name__ == '__main__':
args.jid = input("Username: ")
if args.password is None:
args.password = getpass("Password: ")
-
- xmpp = IBBReceiver(args.jid, args.password)
+ if args.filename is None:
+ args.filename = input("File path: ")
+
+ # Setup the IBBReceiver and register plugins. Note that while plugins may
+ # have interdependencies, the order in which you register them does
+ # not matter.
+ xmpp = IBBReceiver(args.jid, args.password, args.filename)
+ xmpp.register_plugin('xep_0030') # Service Discovery
+ xmpp.register_plugin('xep_0047', {
+ 'auto_accept': True
+ }) # In-band Bytestreams
# Connect to the XMPP server and start processing XMPP stanzas.
xmpp.connect()
- xmpp.process()
+ xmpp.process(forever=False)
diff --git a/examples/ibb_transfer/ibb_sender.py b/examples/ibb_transfer/ibb_sender.py
index c7e87bb4..f1c0cab2 100755
--- a/examples/ibb_transfer/ibb_sender.py
+++ b/examples/ibb_transfer/ibb_sender.py
@@ -9,11 +9,13 @@
See the file LICENSE for copying permission.
"""
+import asyncio
import logging
from getpass import getpass
from argparse import ArgumentParser
import slixmpp
+from slixmpp.exceptions import IqError, IqTimeout
class IBBSender(slixmpp.ClientXMPP):
@@ -22,11 +24,13 @@ class IBBSender(slixmpp.ClientXMPP):
A basic example of creating and using an in-band bytestream.
"""
- def __init__(self, jid, password, receiver, filename):
+ def __init__(self, jid, password, receiver, filename, use_messages=False):
slixmpp.ClientXMPP.__init__(self, jid, password)
self.receiver = receiver
- self.filename = filename
+
+ self.file = open(filename, 'rb')
+ self.use_messages = use_messages
# The session_start event will be triggered when
# the bot establishes its connection with the server
@@ -35,6 +39,7 @@ class IBBSender(slixmpp.ClientXMPP):
# our roster.
self.add_event_handler("session_start", self.start)
+ @asyncio.coroutine
def start(self, event):
"""
Process the session_start event.
@@ -51,15 +56,22 @@ class IBBSender(slixmpp.ClientXMPP):
self.send_presence()
self.get_roster()
- # For the purpose of demonstration, we'll set a very small block
- # size. The default block size is 4096. We'll also use a window
- # allowing sending multiple blocks at a time; in this case, three
- # block transfers may be in progress at any time.
- stream = self['xep_0047'].open_stream(self.receiver)
+ try:
+ # Open the IBB stream in which to write to.
+ stream = yield from self['xep_0047'].open_stream(self.receiver, use_messages=self.use_messages)
+
+ # If you want to send in-memory bytes, use stream.sendall() instead.
+ yield from stream.sendfile(self.file, timeout=10)
- with open(self.filename) as f:
- data = f.read()
- stream.sendall(data)
+ # And finally close the stream.
+ yield from stream.close(timeout=10)
+ except (IqError, IqTimeout):
+ print('File transfer errored')
+ else:
+ print('File transfer finished')
+ finally:
+ self.file.close()
+ self.disconnect()
if __name__ == '__main__':
@@ -80,9 +92,11 @@ if __name__ == '__main__':
parser.add_argument("-p", "--password", dest="password",
help="password to use")
parser.add_argument("-r", "--receiver", dest="receiver",
- help="JID to use")
+ help="JID of the receiver")
parser.add_argument("-f", "--file", dest="filename",
- help="JID to use")
+ help="file to send")
+ parser.add_argument("-m", "--use-messages", action="store_true",
+ help="use messages instead of iqs for file transfer")
args = parser.parse_args()
@@ -99,16 +113,13 @@ if __name__ == '__main__':
if args.filename is None:
args.filename = input("File path: ")
- # Setup the EchoBot and register plugins. Note that while plugins may
+ # Setup the IBBSender and register plugins. Note that while plugins may
# have interdependencies, the order in which you register them does
# not matter.
- xmpp = IBBSender(args.jid, args.password, args.receiver, args.filename)
+ xmpp = IBBSender(args.jid, args.password, args.receiver, args.filename, args.use_messages)
xmpp.register_plugin('xep_0030') # Service Discovery
- xmpp.register_plugin('xep_0004') # Data Forms
xmpp.register_plugin('xep_0047') # In-band Bytestreams
- xmpp.register_plugin('xep_0060') # PubSub
- xmpp.register_plugin('xep_0199') # XMPP Ping
# Connect to the XMPP server and start processing XMPP stanzas.
xmpp.connect()
- xmpp.process()
+ xmpp.process(forever=False)