The branch, eden has been updated
via 3ba54520b1cddb0bdeb21a6c871f5e065fca9dcf (commit)
from 1d6d4be2f6eca98728a5344f31c4c379df8a3336 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3ba54520b1cddb0bdeb21a6c871f5e065fca9dcf
commit 3ba54520b1cddb0bdeb21a6c871f5e065fca9dcf
Author: sphere <[email protected]>
Date: Wed Apr 9 08:20:13 2014 +0200
[plugin.video.tvkaista] updated to version 3.0.6
diff --git a/plugin.video.tvkaista/addon.xml b/plugin.video.tvkaista/addon.xml
index 755d644..545bdee 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="3.0.5"
provider-name="Viljo Viitanen">
+<addon id="plugin.video.tvkaista" name="TVKaista" version="3.0.6"
provider-name="Viljo Viitanen">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
@@ -9,15 +9,15 @@
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<language>fi</language>
- <summary lang="en">Watch TVKaista.fi with XBMC</summary>
- <summary lang="fi">Katso TVKaista.fi:tä XBMC:llä</summary>
- <description lang="en">Watch Finnish commercial TVKaista streaming
services with XBMC. Requires a TVKaista user account. See
http://www.tvkaista.fi for more details.</description>
- <description lang="fi">Katso kaupallista TVKaista.fi -tv-tallenninta
XBMC:llä. Tarvitsee TVKaista-käyttäjätunnuksen. Lisätietoja:
http://www.tvkaista.fi</description>
+ <summary lang="en">Watch TVKaista with XBMC</summary>
+ <summary lang="fi">Katso TVKaistaa XBMC:llä</summary>
+ <description lang="en">Watch Finnish commercial TVKaista streaming
services with XBMC. Requires a TVKaista user account. See
http://www.tvkaista.com for more details.</description>
+ <description lang="fi">Katso kaupallista TVKaista -tv-tallenninta
XBMC:llä. Tarvitsee TVKaista-käyttäjätunnuksen. Lisätietoja:
http://www.tvkaista.com</description>
<disclaimer lang="en">Updated for XBMC Dharma beta 1 by
stilester</disclaimer>
<disclaimer lang="fi">Päivittänyt XBMC Dharma beta 1:lle
stilester</disclaimer>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+
<source>https://code.google.com/p/tvkaistaforxbmcv2/source/checkout</source>
+ <website>https://code.google.com/p/tvkaistaforxbmcv2/</website>
+ <email>[email protected]</email>
</extension>
- <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
-
<source>https://code.google.com/p/tvkaistaforxbmcv2/source/checkout</source>
- <website>https://code.google.com/p/tvkaistaforxbmcv2/</website>
- <email>[email protected]</email>
</addon>
diff --git a/plugin.video.tvkaista/changelog.txt
b/plugin.video.tvkaista/changelog.txt
index 788ffee..2a91113 100644
--- a/plugin.video.tvkaista/changelog.txt
+++ b/plugin.video.tvkaista/changelog.txt
@@ -1,3 +1,5 @@
+[B]3.0.6[/B]
+- Change from tvkaista.fi to tvkaista.com
[B]3.0.5[/B]
- Add context menu item for searching similar named programs, add support for
new 1M MPEG4 stream
[B]3.0.4[/B]
diff --git a/plugin.video.tvkaista/default.py b/plugin.video.tvkaista/default.py
index e1d3306..f432208 100644
--- a/plugin.video.tvkaista/default.py
+++ b/plugin.video.tvkaista/default.py
@@ -1,7 +1,7 @@
-#xbmc tvkaista.fi plugin
+#xbmc tvkaista.com plugin
# This Python file uses the following encoding: utf-8
#
-#Copyright (C) 2009-2013 Viljo Viitanen <[email protected]>
+#Copyright (C) 2009-2014 Viljo Viitanen <[email protected]>
#Copyright (C) 2010 stilester
#Copyright (C) 2008-2009 J. Luukko
#
@@ -37,6 +37,7 @@
#7.4.2013 Version 3.0.5. Add "search similar named" to context menu.
# Add proper umlauts. Change code documentation to English.
#8.4.2013 Add support for new tvkaista 1M mpeg4 stream
+#4.4.2014 3.0.6. Change from .fi to tvkaista.com
#tvkaista api documentation is at https://code.google.com/p/tvkaista-api/
@@ -82,22 +83,22 @@ def settings():
# paavalikko
def menu():
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/channels/')+"&mode=1"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/channels/')+"&mode=1"
listfolder = xbmcgui.ListItem('Kanavat - tänään')
listfolder.setInfo('video', {'Title': "Kanavat"})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/seasonpasses/')+"&mode=1"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/seasonpasses/')+"&mode=1"
listfolder = xbmcgui.ListItem('Sarjat')
listfolder.setInfo('video', {'Title': "Sarjat"})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/playlist')+"&mode=2"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/playlist')+"&mode=2"
listfolder = xbmcgui.ListItem('Lista')
listfolder.setInfo('video', {'Title': 'Lista'})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/search/title/elokuva')+"&mode=2"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/search/title/elokuva')+"&mode=2"
listfolder = xbmcgui.ListItem('Elokuvat')
listfolder.setInfo('video', {'Title': 'Elokuvat'})
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
@@ -176,7 +177,7 @@ def isdst(tt):
#list the programs in a feed
def listprograms(url):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
- passman.add_password(None, "http://www.tvkaista.fi";,
tvkaista_addon.getSetting("username"), \
+ passman.add_password(None, "http://www.tvkaista.com";,
tvkaista_addon.getSetting("username"), \
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
#print "listprograms avataan: "+url+'/'+bitrate()+'.rss'
@@ -241,7 +242,7 @@ def listprograms(url):
try:
if pat[0] != "":
pid=re.compile(r"/([0-9]+)[.].+$", re.IGNORECASE).findall(pat[0])
-
listitem.setThumbnailImage('http://%s:%[email protected]/feed/thumbnails/%s.jpg'
% (\
+
listitem.setThumbnailImage('http://%s:%[email protected]/feed/thumbnails/%s.jpg'
% (\
myusername, mypassword, pid[0]))
if url.find('/feed/playlist') > 0:
label='Poista Listalta'
@@ -267,7 +268,7 @@ def listprograms(url):
search=ptit.split(':')[0].encode('utf-8')
#double encoding cos it gets decoded twice.
menuitems.append(('Etsi
samannimisiä','XBMC.Container.Update(%s?mode=%d&url=%s)'%
-
(sys.argv[0],2,'http://www.tvkaista.fi/feed/search/title/'+urllib.quote_plus(urllib.quote_plus(search))
),))
+
(sys.argv[0],2,'http://www.tvkaista.com/feed/search/title/'+urllib.quote_plus(urllib.quote_plus(search))
),))
listitem.addContextMenuItems(menuitems, True )
except:
pass
@@ -287,12 +288,12 @@ def listprograms(url):
#note: the date parameter really is called url when specifying the plugin url
parameters. See mode 5 in main.
def listdates(date):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
- passman.add_password(None, "http://www.tvkaista.fi";,
tvkaista_addon.getSetting("username"), \
+ passman.add_password(None, "http://www.tvkaista.com";,
tvkaista_addon.getSetting("username"), \
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
#print "listdates avataan: "+date
try:
- request = urllib2.Request('http://www.tvkaista.fi/feed/channels/',
headers=MYHEADERS)
+ request = urllib2.Request('http://www.tvkaista.com/feed/channels/',
headers=MYHEADERS)
content = opener.open(request).read()
except urllib2.HTTPError,e:
if e.code == 401:
@@ -329,7 +330,7 @@ def listdates(date):
# list feeds contained in a feed
def listfeeds(url):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
- passman.add_password(None, "http://www.tvkaista.fi";,
tvkaista_addon.getSetting("username"), \
+ passman.add_password(None, "http://www.tvkaista.com";,
tvkaista_addon.getSetting("username"), \
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
#print "listfeeds avataan: "+url
@@ -381,7 +382,7 @@ def search():
if len(list)>20: list.pop()
list.insert(0,keyboard.getText())
tvkaista_addon.setSetting("searches","\n".join(list))
- url = 'http://www.tvkaista.fi/feed/search/title/%s' %
(urllib.quote_plus(keyboard.getText()))
+ url = 'http://www.tvkaista.com/feed/search/title/%s' %
(urllib.quote_plus(keyboard.getText()))
listprograms(url)
#list searches that are stored in plugin settings
@@ -391,7 +392,7 @@ def listsearches():
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
for i in tvkaista_addon.getSetting("searches").splitlines():
-
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.fi/feed/search/title/'+urllib.quote_plus(i))+"&mode=2"
+
u=sys.argv[0]+"?url="+urllib.quote_plus('http://www.tvkaista.com/feed/search/title/'+urllib.quote_plus(i))+"&mode=2"
listfolder = xbmcgui.ListItem('Haku: '+i)
xbmcplugin.addDirectoryItem(int(sys.argv[1]), u, listfolder, isFolder=1)
@@ -416,24 +417,24 @@ def addremove(action,id):
'password': tvkaista_addon.getSetting("password"), 'rememberme':'on'}
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
- request = urllib2.Request('http://www.tvkaista.fi/login/', headers=MYHEADERS)
+ request = urllib2.Request('http://www.tvkaista.com/login/',
headers=MYHEADERS)
r = opener.open(request, urllib.urlencode(opts))
dialog = xbmcgui.Dialog()
try:
if action==1:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=addtoplaylist&id=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=addtoplaylist&id=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma lisätty listalle.')
elif action==2:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=removefromplaylist&id=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=removefromplaylist&id=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma poistettu listalta.')
elif action==3:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=addseasonpass&id=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=addseasonpass&id=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma lisätty sarjoihin')
elif action==4:
- request =
urllib2.Request("http://www.tvkaista.fi/recordings/?action=removeseasonpass&spid=%s"%id,
headers=MYHEADERS)
+ request =
urllib2.Request("http://www.tvkaista.com/recordings/?action=removeseasonpass&spid=%s"%id,
headers=MYHEADERS)
r = opener.open(request)
dialog.ok('Tvkaista', 'Ohjelma poistettu sarjoista.')
else:
-----------------------------------------------------------------------
Summary of changes:
plugin.video.tvkaista/addon.xml | 18 ++++++++--------
plugin.video.tvkaista/changelog.txt | 2 +
plugin.video.tvkaista/default.py | 39 ++++++++++++++++++-----------------
3 files changed, 31 insertions(+), 28 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://%s:%[email protected]/feed/thumbnails/%s.jpg](http://%s:%s...@www.tvkaista.fi/feed/thumbnails/%s.jpg){kind=link}
![http://%s:%[email protected]/feed/thumbnails/%s.jpg](http://%s:%s...@www.tvkaista.com/feed/thumbnails/%s.jpg){kind=link}