The branch, dharma has been updated
via 892adb7049f30e40dab306b5ace50b25dbaaabd3 (commit)
from 022e6df891ab16d0f7a0c46b82d28a173f4fe631 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=892adb7049f30e40dab306b5ace50b25dbaaabd3
commit 892adb7049f30e40dab306b5ace50b25dbaaabd3
Author: spiff <[email protected]>
Date: Fri Jan 7 23:04:25 2011 +0100
[plugin.video.tvkaista] updated to version 2.2.0
diff --git a/plugin.video.tvkaista/addon.xml b/plugin.video.tvkaista/addon.xml
index 82b9f50..7e440ec 100644
--- a/plugin.video.tvkaista/addon.xml
+++ b/plugin.video.tvkaista/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.tvkaista" name="TVKaista.fi" version="2.1.0"
provider-name="Viljo Viitanen">
+<addon id="plugin.video.tvkaista" name="TVKaista.fi" version="2.2.0"
provider-name="Viljo Viitanen">
<requires>
<import addon="xbmc.python" version="1.0"/>
</requires>
diff --git a/plugin.video.tvkaista/changelog.txt
b/plugin.video.tvkaista/changelog.txt
index e589f8a..262615b 100644
--- a/plugin.video.tvkaista/changelog.txt
+++ b/plugin.video.tvkaista/changelog.txt
@@ -1,3 +1,5 @@
+[B]2.2.0[/B]
+- Add tvkaista proxy support for better performance around the world.
[B]2.1.0[/B]
- Add/remove playlist and seasonpasses from context menu. Thanks Markku
Lamminluoto!
[B]2.0.2[/B]
diff --git a/plugin.video.tvkaista/default.py b/plugin.video.tvkaista/default.py
index 267c69b..c5fbb47 100644
--- a/plugin.video.tvkaista/default.py
+++ b/plugin.video.tvkaista/default.py
@@ -1,6 +1,6 @@
#xbmc tvkaista.fi plugin
#
-#Copyright (C) 2009-2010 Viljo Viitanen <[email protected]>
+#Copyright (C) 2009-2011 Viljo Viitanen <[email protected]>
#Copyright (C) 2010 stilester
#Copyright (C) 2008-2009 J. Luukko
#
@@ -28,6 +28,7 @@
#7.9.2010 fiksauksia xbmc:n official repoa varten, linux-locale-ongelma
fiksattu
#5.12.2010 varasto pois, elokuva-haku etusivulle, alpha->www, tekstitys pois
#5.12.2010 lisays ja poisto katselulistalta ja sarjoista - kiitos Markku
Lamminluoto!
+#7.1.2011 tuki tvkaistan proxyille
import locale
locale.setlocale(locale.LC_ALL, 'C')
@@ -51,6 +52,19 @@ def bitrate():
else:
return "flv"
+#tvkaista webikayttoliittymasta asetukset-sivulta.
+def proxycookie():
+ if tvkaista_addon.getSetting("proxy") == "1":
+ return "721600"
+ elif tvkaista_addon.getSetting("proxy") == "2":
+ return "7064662+909967"
+ elif tvkaista_addon.getSetting("proxy") == "3":
+ return "7134762+5332710"
+ elif tvkaista_addon.getSetting("proxy") == "4":
+ return "8031916+6913675"
+ else:
+ return "-1"
+
#varmistetaan asetukset
def settings():
if tvkaista_addon.getSetting("username") != '' and
tvkaista_addon.getSetting("password") != '':
@@ -133,7 +147,7 @@ def listprograms(url):
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
urllib2.install_opener(opener)
- print "listprograms avataan: "+url+'/'+bitrate()+'.rss'
+ #print "listprograms avataan: "+url+'/'+bitrate()+'.rss'
try:
content = urllib2.urlopen(url+'/'+bitrate()+'.rss').read()
except urllib2.HTTPError,e:
@@ -154,6 +168,9 @@ def listprograms(url):
# try:
items = dom.getElementsByTagName('item')
ret = []
+ mycookie=urllib.quote_plus(proxycookie())
+ myusername=urllib.quote(tvkaista_addon.getSetting("username"))
+ mypassword=urllib.quote(tvkaista_addon.getSetting("password"))
for i in items:
ptit=i.getElementsByTagName('title')[0].childNodes[0].nodeValue
# print "in "+ptit.encode("utf-8")
@@ -175,9 +192,8 @@ def listprograms(url):
else:
shortdes=pdes
t=time.localtime(timediff+time.mktime(time.strptime(pdat,"%a, %d %b %Y
%H:%M:%S +0000")))
- urlii = 'http://%s:%...@%s' % (\
- urllib.quote(tvkaista_addon.getSetting("username")), \
- urllib.quote(tvkaista_addon.getSetting("password")), pat[0])
+ urlii = 'http://%s:%...@%s|Cookie=preferred_servers%%3D%s' % (\
+ myusername, mypassword, pat[0],mycookie)
nimike = '%s | %s >>> %s (%s)' %
(time.strftime("%H:%M",t),ptit,shortdes,pcha)
listitem = xbmcgui.ListItem(label=nimike, iconImage="DefaultVideo.png")
@@ -185,8 +201,7 @@ def listprograms(url):
if pat[0] != "":
pid=re.compile(r"/([0-9]+)[.].+$", re.IGNORECASE).findall(pat[0])
listitem.setThumbnailImage('http://%s:%[email protected]/feed/thumbnails/%s.jpg'
% (\
- urllib.quote(tvkaista_addon.getSetting("username")), \
- urllib.quote(tvkaista_addon.getSetting("password")), pid[0]))
+ myusername, mypassword, pid[0]))
if url.find('/feed/playlist') > 0:
label='Poista Listalta'
mode=9
diff --git a/plugin.video.tvkaista/resources/language/English/strings.xml
b/plugin.video.tvkaista/resources/language/English/strings.xml
index ab4ab50..a6ad3b6 100644
--- a/plugin.video.tvkaista/resources/language/English/strings.xml
+++ b/plugin.video.tvkaista/resources/language/English/strings.xml
@@ -4,4 +4,6 @@
<string id="30003">Video format</string>
<string id="30004">Search</string>
<string id="30005">Favourites</string>
+ <string id="30006">Proxy Server</string>
+ <string id="30007">see www.tvkaista.fi/speedtest.html</string>
</strings>
diff --git a/plugin.video.tvkaista/resources/language/Finnish/strings.xml
b/plugin.video.tvkaista/resources/language/Finnish/strings.xml
index f061432..8a14d2d 100644
--- a/plugin.video.tvkaista/resources/language/Finnish/strings.xml
+++ b/plugin.video.tvkaista/resources/language/Finnish/strings.xml
@@ -4,4 +4,6 @@
<string id="30003">Videomuoto</string>
<string id="30004">Haku</string>
<string id="30005">Suosikit</string>
+ <string id="30006">Valimuistipalvelin</string>
+ <string id="30007">katso www.tvkaista.fi/speedtest.html</string>
</strings>
diff --git a/plugin.video.tvkaista/resources/settings.xml
b/plugin.video.tvkaista/resources/settings.xml
index 073ea69..546aebf 100644
--- a/plugin.video.tvkaista/resources/settings.xml
+++ b/plugin.video.tvkaista/resources/settings.xml
@@ -2,5 +2,7 @@
<setting id="username" type="text" label="30000" default=""/>
<setting id="password" type="text" option="hidden" label="30001"
default=""/>
<setting type="sep" />
- <setting id="bitrate" type="enum" label="30003" values="300 kbps iTunes|1
Mbps Tvkaista|2 Mbps MPEG4|8 Mbps Pro" default="1 Mbps Tvkaista"/>
+ <setting id="bitrate" type="enum" label="30003" values="300 kbps iTunes|1
Mbps Flash|2 Mbps MPEG4|8 Mbps Pro" default="1 Mbps Flash"/>
+ <setting id="proxy" type="enum" label="30006" values="Vakioasetus|Ranska 1
Mbps|Yhdysvallat 300k,1M,2M,8M|Espanja 300k,1M,2M,8M|Saksa 300k,1M,2M,8M"
default="Vakioasetus"/>
+ <setting type="lsep" label="30007" />
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.tvkaista/addon.xml | 2 +-
plugin.video.tvkaista/changelog.txt | 2 +
plugin.video.tvkaista/default.py | 29 +++++++++++++++-----
.../resources/language/English/strings.xml | 2 +
.../resources/language/Finnish/strings.xml | 2 +
plugin.video.tvkaista/resources/settings.xml | 4 ++-
6 files changed, 32 insertions(+), 9 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://%s:%[email protected]/feed/thumbnails/%s.jpg](http://%s:%...@www.tvkaista.fi/feed/thumbnails/%s.jpg){kind=link}