The branch, dharma has been updated
via ac3d21a83aac7ff4a5bb7922ea3d3c17a3245a05 (commit)
from c1f5b2aae34253029ca237b38df46721c07af2b7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ac3d21a83aac7ff4a5bb7922ea3d3c17a3245a05
commit ac3d21a83aac7ff4a5bb7922ea3d3c17a3245a05
Author: spiff <[email protected]>
Date: Mon Nov 14 10:12:52 2011 +0100
[plugin.video.tvkaista] updated to version 2.2.1
diff --git a/plugin.video.tvkaista/addon.xml b/plugin.video.tvkaista/addon.xml
index 7e440ec..0fda370 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.2.0"
provider-name="Viljo Viitanen">
+<addon id="plugin.video.tvkaista" name="TVKaista.fi" version="2.2.1"
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 262615b..06d3479 100644
--- a/plugin.video.tvkaista/changelog.txt
+++ b/plugin.video.tvkaista/changelog.txt
@@ -1,3 +1,5 @@
+[B]2.2.1[/B]
+- Always show times in Finnish time, sort the series view, remove obsolete
proxy setting. Set the proxy server from tvkaista website. Thanks again Markki
Lamminluoto for helping with the proxies!
[B]2.2.0[/B]
- Add tvkaista proxy support for better performance around the world.
[B]2.1.0[/B]
diff --git a/plugin.video.tvkaista/default.py b/plugin.video.tvkaista/default.py
index c5fbb47..09009e5 100644
--- a/plugin.video.tvkaista/default.py
+++ b/plugin.video.tvkaista/default.py
@@ -29,11 +29,13 @@
#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
+#11.8.2011 naytetaan aika aina Suomen ajassa
+#13.11.2011 proxytuki pois tarpeettomana, sarjojen sorttaus
import locale
locale.setlocale(locale.LC_ALL, 'C')
-import xbmcgui, urllib, urllib2, cookielib , re, os, xbmcplugin,
htmlentitydefs, time, xbmcaddon
+import xbmcgui, urllib, urllib2, cookielib , re, os, xbmcplugin,
htmlentitydefs, time, xbmcaddon, calendar
tvkaista_addon = xbmcaddon.Addon("plugin.video.tvkaista");
BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join(
tvkaista_addon.getAddonInfo('path'), "resources" ) )
@@ -52,19 +54,6 @@ 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") != '':
@@ -140,6 +129,39 @@ def get_params():
param[splitparams[0]]=splitparams[1]
return param
+#onko gmt-aikaleima kesaajassa
+def isdst(tt):
+ dates = {
+ 2011 : [27,30],
+ 2012 : [25,28],
+ 2013 : [31,27],
+ 2014 : [30,26],
+ 2015 : [29,25],
+ 2016 : [27,30],
+ 2017 : [26,29],
+ 2018 : [25,28],
+ 2019 : [31,27],
+ }
+ t=time.gmtime(tt)
+ if t[1] > 3 and t[1]<10:
+ return True
+ if t[1] < 3 or t[1]>10:
+ return False
+ if t[1] == 3:
+ if t[2] < dates[t[0]][0]:
+ return False
+ if t[2] == dates[t[0]][0]:
+ if t[3] == 0:
+ return False
+ return True
+ if t[1] == 10:
+ if t[2] < dates[t[0]][1]:
+ return True
+ if t[2] == dates[t[0]][1]:
+ if t[3] == 0:
+ return True
+ return False
+
#Listaa feedin sisaltamat ohjelmat
def listprograms(url):
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
@@ -158,17 +180,10 @@ def listprograms(url):
xbmcplugin.endOfDirectory(int(sys.argv[1]))
return
dom = minidom.parseString(content)
- try:
- #haetaan aikaero GMT->lokaaliaika. Oletetaan, etta xbmc:n/pythonin aika on
oikea lokaaliaika...
-
otherdate=dom.getElementsByTagName('channel')[0].getElementsByTagName('lastBuildDate')[0].childNodes[0].nodeValue
- timediff=time.time()-time.mktime(time.strptime(otherdate,"%a, %d %b %Y
%H:%M:%S +0000"))
- except:
- timediff=0
# 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:
@@ -191,9 +206,15 @@ def listprograms(url):
shortdes=pdes[:80]+'...'
else:
shortdes=pdes
- t=time.localtime(timediff+time.mktime(time.strptime(pdat,"%a, %d %b %Y
%H:%M:%S +0000")))
- urlii = 'http://%s:%s@%s|Cookie=preferred_servers%%3D%s' % (\
- myusername, mypassword, pat[0],mycookie)
+ tt=calendar.timegm(time.strptime(pdat,"%a, %d %b %Y %H:%M:%S +0000"))
+ if (isdst(tt)):
+ timediff=10800
+ else:
+ timediff=7200
+ t=time.gmtime(tt+timediff)
+
+ urlii = 'http://%s:%s@%s' % (\
+ myusername, mypassword, pat[0])
nimike = '%s | %s >>> %s (%s)' %
(time.strftime("%H:%M",t),ptit,shortdes,pcha)
listitem = xbmcgui.ListItem(label=nimike, iconImage="DefaultVideo.png")
@@ -243,7 +264,7 @@ def listdates(url):
tvkaista_addon.getSetting("password"))
opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(passman))
urllib2.install_opener(opener)
- #print "listfeeds avataan: "+url
+ #print "listdates avataan: "+url
try:
content = urllib2.urlopen('http://www.tvkaista.fi/feed/channels/').read()
except urllib2.HTTPError,e:
@@ -292,6 +313,8 @@ def listfeeds(url):
# try:
dom = minidom.parseString(content)
items = dom.getElementsByTagName('item')
+ if "/feed/seasonpasses" in url:
+ items.sort(key=lambda i:
i.getElementsByTagName('title')[0].childNodes[0].nodeValue)
ret = []
for i in items:
ptit=i.getElementsByTagName('title')[0].childNodes[0].nodeValue
diff --git a/plugin.video.tvkaista/resources/language/English/strings.xml
b/plugin.video.tvkaista/resources/language/English/strings.xml
index a6ad3b6..1bb80ed 100644
--- a/plugin.video.tvkaista/resources/language/English/strings.xml
+++ b/plugin.video.tvkaista/resources/language/English/strings.xml
@@ -4,6 +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="30006">set proxy server from website</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 8a14d2d..f0c418a 100644
--- a/plugin.video.tvkaista/resources/language/Finnish/strings.xml
+++ b/plugin.video.tvkaista/resources/language/Finnish/strings.xml
@@ -4,6 +4,6 @@
<string id="30003">Videomuoto</string>
<string id="30004">Haku</string>
<string id="30005">Suosikit</string>
- <string id="30006">Valimuistipalvelin</string>
+ <string id="30006">Aseta valimuistipalvelin www-sivustolta</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 546aebf..3d65761 100644
--- a/plugin.video.tvkaista/resources/settings.xml
+++ b/plugin.video.tvkaista/resources/settings.xml
@@ -3,6 +3,6 @@
<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 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="30006" />
<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 | 73 +++++++++++++-------
.../resources/language/English/strings.xml | 2 +-
.../resources/language/Finnish/strings.xml | 2 +-
plugin.video.tvkaista/resources/settings.xml | 2 +-
6 files changed, 54 insertions(+), 29 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
