Version 1.4.4 Release

Notable changes included user-defined metadata languages, SOCKS5 support, a better library integration installer, repo integration, and support for XBMC 13 "Gotham"
brysonreece · Jun 3, 2014 · 6c90d73 · 6c90d73 · f1vefour · Jun 4, 2014
1 parent 951bac1
commit 6c90d73
Show file tree

Hide file tree

Showing 9 changed files with 709 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Thumbs.db b/Thumbs.db
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.stream" name="Stream" version="1.0.0" provider-name="Bryson Reece">
+<addon id="plugin.video.stream" name="Stream" version="1.4.4" provider-name="brysonreece">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
     </requires>
@@ -8,10 +8,9 @@
     </extension>
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
-        <website><![CDATA[http://www.brysonreece.com/]]></website>
+        <website><![CDATA[http://stream.brysonreece.com/]]></website>
         <language></language>
         <license><![CDATA[GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007]]></license>
-        <disclaimer>A fork of 'XBMCTorrent' by steeve</disclaimer>
         <summary><![CDATA[Seamlessly watch content from across the internet.]]></summary>
         <description><![CDATA[Enjoy a variety of content, from TV shows to the latest movies!]]></description>
     </extension>

diff --git a/addon.xml.tpl b/addon.xml.tpl
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.xbmctorrent" name="XBMCtorrent" version="$VERSION" provider-name="steeve">
+<addon id="plugin.video.stream" name="Stream" version="$VERSION" provider-name="brysonreece">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>video</provides>
     </extension>
-    <extension point="xbmc.addon.repository" name="XBMCtorrent Autoupdate Repository">
-        <info compressed="false">http://xbmctorrent.herokuapp.com/addons.xml</info>
-        <checksum>http://xbmctorrent.herokuapp.com/addons.xml.md5</checksum>
-        <datadir zip="true">http://xbmctorrent.herokuapp.com/</datadir>
+    <extension point="xbmc.addon.repository" name="brysonreece XBMC Repository">
+        <info compressed="false">http://xbmc-repo.brysonreece.com/addons.xml</info>
+        <checksum>http://xbmc-repo.brysonreece.com/addons.xml.md5</checksum>
+        <datadir zip="true">http://xbmc-repo.brysonreece.com/stream/</datadir>
     </extension>
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
-        <website><![CDATA[http://j.mp/xbmctorrent]]></website>
-        <forum><![CDATA[http://j.mp/xbmctorrent]]></forum>
-        <source><![CDATA[https://github.com/steeve/xbmctorrent]]></source>
+        <website><![CDATA[http://stream.brysonreece.com/]]></website>
         <language></language>
         <license><![CDATA[GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007]]></license>
-        <summary><![CDATA[XBMCtorrent: Torrent streaming for XBMC.]]></summary>
-        <description><![CDATA[Watch torrents directly from XBMC, without waiting.
-
-To get the latest updates:
-Twitter: twitter.com/xbmctorrent
-Facebook: facebook.com/xbmctorrent
-XBMC HUB: j.mp/xbmctorrent]]></description>
+        <disclaimer>A fork of 'XBMCTorrent' by steeve</disclaimer>
+        <summary><![CDATA[Seamlessly watch content from across the internet.]]></summary>
+        <description><![CDATA[Enjoy a variety of content, from your TV shows to the latest movies!]]></description>
     </extension>
 </addon>
diff --git a/resources/images/Thumbs.db b/resources/images/Thumbs.db
diff --git a/resources/settings.xml b/resources/settings.xml
@@ -4,7 +4,6 @@
         <setting label="General" type="lsep" />
         <setting id="dlpath" type="folder" label="Download Path" source="auto" option="writeable" />
         <setting id="keep_files" type="bool" label="Keep files after playback/download stops" default="false" />
-        <setting id="pref_language" type="labelenum" label="Preferred Metadata Language" values="system|aa|ab|af|am|ar|as|ay|az|ba|be|bg|bh|bi|bn|bo|br|ca|co|cs|cy|da|de|dz|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|fy|ga|gd|gl|gn|gu|ha|hi|hr|hu|hy|ia|ie|ik|in|is|it|iw|ja|ji|jw|ka|kk|kl|km|kn|ko|ks|ku|ky|la|ln|lo|lt|lv|mg|mi|mk|ml|mn|mo|mr|ms|mt|my|na|ne|nl|no|oc|om|or|pa|pl|ps|pt|qu|rm|rn|ro|ru|rw|sa|sd|sg|sh|si|sk|sl|sm|sn|so|sq|sr|ss|st|su|sv|sw|ta|te|tg|th|ti|tk|tl|tn|to|tr|ts|tt|tw|uk|ur|uz|vi|vo|wo|xh|yo|zh|zu" default="system" />
 
         <setting label="Content" type="lsep"/>
         <setting id="immunicity" type="bool" label="Auto-unblocking via Immunicity" default="false" />
@@ -16,6 +15,7 @@
         <setting id="encryption" label="Encryption" type="enum" values="Forced|Enabled|Disabled" default="1" />
     </category>
     <category label="Advanced">
+        <setting label="Language" type="lsep"/>
         <setting id="pref_language" type="labelenum" label="Preferred Metadata Language" values="system|aa|ab|af|am|ar|as|ay|az|ba|be|bg|bh|bi|bn|bo|br|ca|co|cs|cy|da|de|dz|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|fy|ga|gd|gl|gn|gu|ha|hi|hr|hu|hy|ia|ie|ik|in|is|it|iw|ja|ji|jw|ka|kk|kl|km|kn|ko|ks|ku|ky|la|ln|lo|lt|lv|mg|mi|mk|ml|mn|mo|mr|ms|mt|my|na|ne|nl|no|oc|om|or|pa|pl|ps|pt|qu|rm|rn|ro|ru|rw|sa|sd|sg|sh|si|sk|sl|sm|sn|so|sq|sr|ss|st|su|sv|sw|ta|te|tg|th|ti|tk|tl|tn|to|tr|ts|tt|tw|uk|ur|uz|vi|vo|wo|xh|yo|zh|zu" default="system" />
 
         <setting label="XBMC Library Integration" type="lsep"/>
@@ -25,6 +25,11 @@
         <setting label="Maintenance" type="lsep"/>
         <setting type="action" label="Clear cache" action="RunPlugin(plugin://plugin.video.stream/cmd/clear_cache)" />
 
+        <setting label="SOCKS5 Proxy" type="lsep"/>
+        <setting id="use_socks" label="Use SOCKS5 proxy?" type="bool" default="false" />
+        <setting id="proxy_url" type="text" label="URL" default="localhost" />
+        <setting id="proxy_port" type="text" label="Port" default="9050" />
+
         <setting label="Custom domains" type="lsep"/>
         <setting id="base_eztv" type="text" label="EZTV - (TV Shows)" default="http://eztv.it" />
         <setting id="base_yify" type="text" label="YIFY Torrents - (Movies)" default="http://yts.re" />

diff --git a/resources/site-packages/stream/index.py b/resources/site-packages/stream/index.py
@@ -1,4 +1,6 @@
-from stream import plugin, magnet, scrapers
+import socket
+from stream import plugin, magnet, scrapers, socks
+from socks import wrapmodule
 from stream.ga import tracked
 from stream.utils import ensure_fanart
 from stream.platform import PLATFORM
@@ -8,6 +10,9 @@
     yify, \
     tpb
 
+if plugin.get_setting("use_socks", bool):
+    socks.set_default_proxy(socks.SOCKS5, plugin.get_setting("proxy_url"), int(plugin.get_setting("proxy_port")))
+    socket.socket = socks.socksocket
 
 @plugin.route("/")
 @tracked(force=True)

diff --git a/resources/site-packages/stream/magnet.py b/resources/site-packages/stream/magnet.py
@@ -1,6 +1,5 @@
 from stream.plugin import plugin
 
-
 PUBLIC_TRACKERS = [
     "udp://tracker.publicbt.com:80/announce",
     "udp://tracker.openbittorrent.com:80/announce",