Ticket #3367: deluge-2.0.3+add_torrents_instream.patch

ui/web/json_api.py

@@ -724 +724 @@
         Add torrents by file
 
         :param torrents: A list of dictionaries containing the torrent \
-            path and torrent options to add with.
+            path, torrent data and torrent options to add with. Torrent data \
+            is optional and must be encoded with base64.
         :type torrents: list
 
         ::
@@ -748 +749 @@
                 deferreds.append(d)
             else:
                 filename = os.path.basename(torrent['path'])
-                with open(torrent['path'], 'rb') as _file:
-                    fdump = b64encode(_file.read())
+                fdump = torrent.pop("data", None)
+                if fdump == None:
+                    with open(torrent['path'], 'rb') as _file:
+                        fdump = b64encode(_file.read())
                 log.info(
                     'Adding torrent from file `%s` with options `%r`',
                     filename,