2009-10-13, 14:19
enjoy:
Code:
media@htpc ~/.xbmc/plugins/video $ colordiff -wu -r -x .svn -x *.pyc -x *.pyo CBS-svn CBS |less
Only in CBS/resources/cache: hd.js
diff -wu -r -x .svn -x '*.pyc' -x '*.pyo' CBS-svn/resources/language/English/strings.xml CBS/resources/language/English/strings.xml
--- CBS-svn/resources/language/English/strings.xml 2009-10-13 14:58:23.000000000 +0300
+++ CBS/resources/language/English/strings.xml 2009-10-13 15:15:36.000000000 +0300
@@ -19,11 +19,13 @@
<string id="30013">List 'Latest' Category</string>^M
<string id="30014">List 'Popular' Category</string>^M
<string id="30015">Shows and Home</string>^M
- <string id="30016">Shows Only</string>^M
+ <string id="30015">Shows Only</string>^M
<string id="30017">Home Only</string>^M
<string id="30018">Disabled</string>^M
<string id="30019">List 'Editor's Picks' Category (Shows Only)</string>^M
<string id="30020">List 'Clips' Category (Shows Only)</string>^M
<string id="30021">List 'All Videos' Category (Shows Only)</string>^M
^M
+ <string id="30040">U.S. Proxy IP</string>^M
+ <string id="30041">U.S. Proxy port</string>^M
</strings>^M
diff -wu -r -x .svn -x '*.pyc' -x '*.pyo' CBS-svn/resources/lib/common.py CBS/resources/lib/common.py
--- CBS-svn/resources/lib/common.py 2009-10-13 14:58:25.000000000 +0300
+++ CBS/resources/lib/common.py 2009-10-13 15:14:19.000000000 +0300
@@ -71,6 +71,14 @@
^M
def getHTML( url ):^M
try:^M
+ us_proxy = 'http://' + xbmcplugin.getSetting('us_proxy') + ':' + xbmcplugin.getSetting('us_proxy_port')^M
+^M
+ if (xbmcplugin.getSetting('us_proxy')):^M
+ print 'Using proxy: ' + us_proxy^M
+ proxy_handler = urllib2.ProxyHandler({'http':us_proxy})^M
+ opener = urllib2.build_opener(proxy_handler)^M
+ urllib2.install_opener(opener)^M
+^M
print 'CBS --> common :: getHTML :: url = '+url^M
req = urllib2.Request(url)^M
req.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3')^M
diff -wu -r -x .svn -x '*.pyc' -x '*.pyo' CBS-svn/resources/settings.xml CBS/resources/settings.xml
--- CBS-svn/resources/settings.xml 2009-10-13 14:58:25.000000000 +0300
+++ CBS/resources/settings.xml 2009-08-08 12:54:10.000000000 +0300
@@ -14,4 +14,6 @@
<!-- 0.Ask 1.Play 2. Download 3. Download and Play -->^M
<setting id="download" type="enum" lvalues="30005|30006|30007|30008" label="30009" default="1"/>^M
<setting id="download_path" type="folder" source="video" label="30010" option="writeable" default="E:\"/>^M
+ <setting id="us_proxy" type="text" label="30040" default="208.100.40.34"/>^M
+ <setting id="us_proxy_port" type="text" label="30041" default="80"/> ^M
</settings>^M
lines 1-47/47 (END)