Merge branch 'release/0.11.0'

Author: Anders Jensen

.gitignore

@@ -24,12 +24,12 @@ _trial_temp
 *.komodoproject
 docs/_build*
 .env*
-
+EGG-INFO
 
 # for bundling
 thomas
 six.py
 rarfile.py
 rfc6266.py
 lepl
-pytz
+pytz

README.md

@@ -1,7 +1,7 @@
 # Streaming Plugin
 https://github.com/JohnDoee/deluge-streaming
 
-(c)2016 by Anders Jensen <johndoee@tidalstream.org>
+(c)2019 by Anders Jensen <johndoee@tidalstream.org>
 
 ## Description
 
@@ -48,6 +48,13 @@ The _allow remote_ option is to allow remote add and stream of torrents.
 * [ ] Better feedback when using API
 * [ ] Fix problems when removing torrent from Deluge (sea of errors)
 
+# Important Deluge 2 information
+
+While developing the Deluge 2 version of this plugin I hit a few problems that might be visible for you too.
+
+* When shutting down Deluge an exception / error happens every time, this bug is reported.
+* Sometimes the Web UI does not load plugins correctly, try restarting Deluge and refresh your browser if this happens.
+
 # HTTP API Usage
 
 ## Prerequisite
@@ -100,6 +107,11 @@ List of URL GET Arguments
 
 # Version Info
 
+## Version 0.11.0
+* Initial support for Deluge 2 / Python 3
+* Added support for aggressive piece prioritization when it should not be necessary.
+* Fixed bug related to paused torrent with no data downloaded.
+
 ## Version 0.10.5
 * Added support for serving files inline
 

create-egg.sh

@@ -0,0 +1,9 @@
+virtualenv .env-egg2
+.env-egg2/bin/pip install -U thomas
+ln -s .env-egg2/lib/python*/site-packages/thomas .
+ln -s .env-egg2/lib/python*/site-packages/rarfile.py .
+ln -s .env-egg2/lib/python*/site-packages/six.py .
+ln -s .env-egg2/lib/python*/site-packages/rfc6266.py .
+ln -s .env-egg2/lib/python*/site-packages/lepl .
+ln -s .env-egg2/lib/python*/site-packages/pytz .
+.env-egg2/bin/python setup.py bdist_egg

create-egg2.sh

@@ -0,0 +1,9 @@
+python3 -m venv .env-egg3
+.env-egg3/bin/pip install -U thomas
+ln -s .env-egg3/lib/python*/site-packages/thomas .
+ln -s .env-egg3/lib/python*/site-packages/rarfile.py .
+ln -s .env-egg3/lib/python*/site-packages/six.py .
+ln -s .env-egg3/lib/python*/site-packages/rfc6266.py .
+ln -s .env-egg3/lib/python*/site-packages/lepl .
+ln -s .env-egg3/lib/python*/site-packages/pytz .
+.env-egg3/bin/python setup.py bdist_egg

create-egg3.sh

@@ -1,3 +1,5 @@
+import argparse
+
 import requests
 
 class FailedToStreamException(Exception):
@@ -44,6 +46,8 @@ def stream_torrent(remote_control_url, infohash=None, path=None, wait_for_end_pi
         data = r.json()
         if data['status'] == 'success':
             return data['url']
+        else:
+            raise FailedToStreamException('Request failed: %r' % (data, ))
 
     if torrent_body:
         r = requests.post(url, auth=(username, password), params=params, data=torrent_body)
@@ -53,5 +57,40 @@ def stream_torrent(remote_control_url, infohash=None, path=None, wait_for_end_pi
         data = r.json()
         if data['status'] == 'success':
             return data['url']
+        else:
+            raise FailedToStreamException('Request failed: %r' % (data, ))
 
     raise FailedToStreamException('Streaming was never successful')
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Stream some torrents")
+    parser.add_argument('url', help="Full API Url including auth info")
+    parser.add_argument('--infohash', nargs='?', help="Infohash of torrent to stream")
+    parser.add_argument('--path', nargs='?', help="Path to file within the torrent to stream")
+    parser.add_argument('--label', nargs='?', help="Label to add the torrent with")
+    parser.add_argument('--torrent', nargs='?', help="Path to the torrent to stream", type=argparse.FileType(mode='rb'))
+    parser.add_argument('--skip_wait_for_end_pieces', help="Wait until client downloaded the first and last piece of the torrent", action='store_false')
+
+
+    args = parser.parse_args()
+
+    kwargs = {
+        'remote_control_url': args.url,
+        'wait_for_end_pieces': args.skip_wait_for_end_pieces
+    }
+
+    if args.infohash:
+        kwargs['infohash'] = args.infohash
+
+    if args.path:
+        kwargs['path'] = args.path
+
+    if args.label:
+        kwargs['label'] = args.label
+
+    if args.torrent:
+        kwargs['torrent_body'] = args.torrent.read()
+
+    result = stream_torrent(**kwargs)
+    print('URL %s' % (result, ))

examples/http-api/streamtorrent.py

@@ -42,7 +42,7 @@
 __plugin_name__ = "Streaming"
 __author__ = "Anders Jensen"
 __author_email__ = "johndoee@tidalstream.org"
-__version__ = "0.10.5"
+__version__ = "0.11.0"
 __url__ = "https://github.com/JohnDoee/deluge-streaming"
 __license__ = "GPLv3"
 __description__ = "Enables streaming of files while downloading them."
@@ -71,7 +71,6 @@
 ]
 
 REQUIREMENTS_MODULES = [
-    'six',
     'rarfile',
     'rfc6266',
 ]
@@ -96,7 +95,9 @@
     %s = %s:CorePlugin
     [deluge.plugin.gtkui]
     %s = %s:GtkUIPlugin
+    [deluge.plugin.gtk3ui]
+    %s = %s:Gtk3UIPlugin
     [deluge.plugin.web]
     %s = %s:WebUIPlugin
-    """ % ((__plugin_name__, __plugin_name__.lower())*3)
+    """ % ((__plugin_name__, __plugin_name__.lower())*4)
 )

setup.py

@@ -42,20 +42,27 @@
 
 class CorePlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from core import Core as _plugin_cls
+        from .core import Core as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(CorePlugin, self).__init__(plugin_name)
 
 
 class GtkUIPlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from gtkui import GtkUI as _plugin_cls
+        from .gtkui import GtkUI as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(GtkUIPlugin, self).__init__(plugin_name)
 
 
+class Gtk3UIPlugin(PluginInitBase):
+    def __init__(self, plugin_name):
+        from .gtk3ui import Gtk3UI as PluginClass
+        self._plugin_cls = PluginClass
+        super(Gtk3UIPlugin, self).__init__(plugin_name)
+
+
 class WebUIPlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from webui import WebUI as _plugin_cls
+        from .webui import WebUI as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(WebUIPlugin, self).__init__(plugin_name)