From da05a6de1b762b1cf715058802d4f94f10da801b Mon Sep 17 00:00:00 2001 From: Anders Jensen Date: Sun, 3 Nov 2019 09:33:01 +0100 Subject: [PATCH] added 2/3 egg create script and updated readme --- README.md | 14 +++++++++++++- create-egg.sh | 9 --------- create-egg2.sh | 9 +++++++++ create-egg3.sh | 9 +++++++++ streaming/gtk3ui.py | 4 ++-- 5 files changed, 33 insertions(+), 12 deletions(-) delete mode 100755 create-egg.sh create mode 100755 create-egg2.sh create mode 100755 create-egg3.sh diff --git a/README.md b/README.md index 297b139..d55878d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Streaming Plugin https://github.com/JohnDoee/deluge-streaming -(c)2016 by Anders Jensen +(c)2019 by Anders Jensen ## 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 diff --git a/create-egg.sh b/create-egg.sh deleted file mode 100755 index 9f4ffc0..0000000 --- a/create-egg.sh +++ /dev/null @@ -1,9 +0,0 @@ -python3 -m venv .env-egg -.env-egg/bin/pip install -U thomas -ln -s .env-egg/lib/python*/site-packages/thomas . -ln -s .env-egg/lib/python*/site-packages/rarfile.py . -ln -s .env-egg/lib/python*/site-packages/six.py . -ln -s .env-egg/lib/python*/site-packages/rfc6266.py . -ln -s .env-egg/lib/python*/site-packages/lepl . -ln -s .env-egg/lib/python*/site-packages/pytz . -.env-egg/bin/python setup.py bdist_egg diff --git a/create-egg2.sh b/create-egg2.sh new file mode 100755 index 0000000..49622bb --- /dev/null +++ b/create-egg2.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 diff --git a/create-egg3.sh b/create-egg3.sh new file mode 100755 index 0000000..92097ab --- /dev/null +++ b/create-egg3.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 diff --git a/streaming/gtk3ui.py b/streaming/gtk3ui.py index 4cfa283..2ce3d74 100644 --- a/streaming/gtk3ui.py +++ b/streaming/gtk3ui.py @@ -43,7 +43,7 @@ import sys import subprocess from gi.repository import Gtk -from gi.repository.Gtk import Menu, MenuItem, SeparatorMenuItem +from gi.repository.Gtk import MenuItem, SeparatorMenuItem import deluge.component as component from deluge.plugins.pluginbase import Gtk3PluginBase @@ -224,7 +224,7 @@ class Gtk3UI(Gtk3PluginBase): threads.deferToThread(execute_url, url) else: def on_dialog_callback(response): - if response == gtk.RESPONSE_YES: + if response == Gtk.ResponseType.YES: threads.deferToThread(execute_url, url) dialogs.YesNoDialog('Stream ready', 'Do you want to play the video?').run().addCallback(on_dialog_callback)