initial move towards 1.0.0

.gitignore

@@ -23,8 +23,13 @@ dropin.cache
 _trial_temp
 *.komodoproject
 docs/_build*
-apiserver/metadata/imdbhandler.py
-apiserver/metadata/malhandler.py
-apiserver/services/search.py
-apiserver/services/control.py
-apiserver/services/files.py
+.env*
+
+
+# for bundling
+thomas
+six.py
+rarfile.py
+rfc6266.py
+lepl
+pytz

README.md

@@ -42,8 +42,20 @@ make Deluge an abstraction layer for the [TidalStream](http://www.tidalstream.or
 
 The _allow remote_ option is to allow remote add and stream of torrents.
 
+## Todo
+
+* [x] Add RAR streaming support
+* [ ] Better feedback in interface about streams
+* [ ] Better feedback when using API
+* [ ] Reverse proxy improvement (e.g. port different than bind port)
+
 # Version Info
 
+## Version 0.10.0
+* Rewrote large parts of the code
+* Now using [thomas](https://github.com/JohnDoee/thomas) as file-reading core - this adds support for multi-rar streaming.
+* Faster streaming by reading directly from disk
+
 ## Version 0.9.0
 * Few bugfixes
 * Added support for Deluge 2

create-egg.sh

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

setup.py

@@ -37,12 +37,12 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "Streaming"
 __author__ = "Anders Jensen"
 __author_email__ = "johndoee@tidalstream.org"
-__version__ = "0.9.0"
+__version__ = "0.10.0"
 __url__ = "https://github.com/JohnDoee/deluge-streaming"
 __license__ = "GPLv3"
 __description__ = "Enables streaming of files while downloading them."
@@ -64,6 +64,18 @@
 If you want to stream from a non-local computer, e.g. your seedbox, you will need to change the IP in option to the external server ip."""
 __pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
 
+REQUIREMENTS_PACKAGES = [
+    'thomas',
+    'lepl',
+    'pytz',
+]
+
+REQUIREMENTS_MODULES = [
+    'six',
+    'rarfile',
+    'rfc6266',
+]
+
 setup(
     name=__plugin_name__,
     version=__version__,
@@ -73,8 +85,10 @@
     url=__url__,
     license=__license__,
     long_description=__long_description__ if __long_description__ else __description__,
+    # install_requires=REQUIREMENTS_PACKAGES,
 
-    packages=[__plugin_name__.lower()],
+    packages=[__plugin_name__.lower()] + ['%s.%s' % (x, y) for x in REQUIREMENTS_PACKAGES for y in find_packages(x)] + REQUIREMENTS_PACKAGES,
+    py_modules=REQUIREMENTS_MODULES,
     package_data = __pkg_data__,
 
     entry_points="""