ft: add invite() argument to specify preview data.

2 files changed, 12 insertions, 8 deletions

diff --git a/papyon/msnp2p/filetransfer.py b/papyon/msnp2p/filetransfer.py
index a89614b..f070786 100644
--- a/papyon/msnp2p/filetransfer.py
+++ b/papyon/msnp2p/filetransfer.py
@@ -55,10 +55,12 @@ class FileTransferSession(P2PSession):
     def preview(self):
         return self._preview
 
-    def invite(self, filename, size, data):
+    def invite(self, filename, size, data, preview):
         self._filename = filename
         self._size = size
         self._data = data
+        self._has_preview = preview is not None
+        self._preview = preview
         context = self._build_context()
         self._invite(context)
 
@@ -85,7 +87,7 @@ class FileTransferSession(P2PSession):
             self._has_preview = not bool(info[4])
             self._filename = unicode(context[20:570], "utf-16-le").rstrip("\x00")
 
-            if(self._has_preview):
+            if self._has_preview:
                 self._preview = context[574:]
 
         except:
@@ -96,8 +98,8 @@ class FileTransferSession(P2PSession):
         context = struct.pack("<5I", 574, 2, self._size, 0, int(self._has_preview))
         context += struct.pack("550s", filename)
         context += "\xFF" * 4
-        if(self._data != None):
-            context += self._data
+        if self._has_preview:
+            context += self._preview
         return context
 
     def _on_session_accepted(self):
diff --git a/papyon/p2p.py b/papyon/p2p.py
index 83ddfa2..e6a6a14 100644
--- a/papyon/p2p.py
+++ b/papyon/p2p.py
@@ -438,7 +438,7 @@ class FileTransferManager(P2PSessionHandler):
 
     ### Public API -----------------------------------------------------------
 
-    def send(self, peer, filename, size, data=None):
+    def send(self, peer, filename, size, data=None, preview=None):
         """Send a request to start sending a file.
 
            The request is sent to each peer endpoint and we keep only the
@@ -453,12 +453,14 @@ class FileTransferManager(P2PSessionHandler):
            @type size: int
            @param data: Data to send once session is accepted
            @type data: str or file-like object
+           @param preview: Preview data to send with the invitation
+           @type data: string
            
            @returns the meta session created to handle the invite."""
 
         session = FileTransferMetaSession(self._client, peer)
         self._add_session(session)
-        session.invite(filename, size, data)
+        session.invite(filename, size, data, preview)
         return session
 
     ### ----------------------------------------------------------------------
@@ -658,9 +660,9 @@ class FileTransferMetaSession(P2PMetaSession):
     def _on_session_canceled(self, canceled_session):
         self.emit("canceled")
 
-    def invite(self, filename, size, data):
+    def invite(self, filename, size, data, preview):
         for session in self._sessions:
-            session.invite(filename, size, data)
+            session.invite(filename, size, data, preview)
 
     def cancel(self):
         for session in self._sessions: